702 files changed, 35376 insertions, 71714 deletions

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000000..416fa8c63b14
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.doc binary
+*.sdw binary
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..575eb3c0e997
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,286 @@
+# backup and temporary files
+*~
+.*.sw[op]
+
+# where the 'subrepos' and downloads are located
+/clone
+/src
+
+# the build directories
+/*/unxlng??
+/*/unxlng??.pro
+/*/unxlng???
+/*/unxlng???.pro
+/*/wntmsc???
+/*/wntmsc???.pro
+/*/wntgcc?
+/*/wntgcc?.pro
+/*/unxmac??
+/*/unxmac??.pro
+/*/unx?bsd??
+/*/unx?bsd??.pro
+/*/unxdfly??
+/*/unxdfly??.pro
+/*/unxso???
+/*/unxso???.pro
+/*/unxaig??
+/*/unxaig??.pro
+/*/unxios?
+/*/unxios?.pro
+/*/unxand?
+/*/unxand?.pro
+/solver/*
+/instsetoo_native/util/LibreOffice
+/instsetoo_native/util/LibreOffice_SDK
+
+# autoconf generated stuff
+/aclocal.m4
+/autom4te.cache
+/autogen.lastrun
+/bootstrap
+/ChangeLog
+/config.guess
+/config.log
+/config.parms
+/config.status
+/configure
+/Makefile
+/makefile.mk
+/set_soenv
+/visibility.cxx
+/post_download
+/bin/repo-list
+/src.downloaded
+/ooo.lst
+
+# misc
+/set_soenv.last
+/set_soenv.stamp
+/warn
+/build.log
+/post_download.log
+/install
+/downloaded
+/*.Set.sh
+/Env.Build.sh
+/ID
+/tags
+/docs
+/autogen.save
+
+/*/*.exe
+
+# links to the other repositories
+/MathMLDTD
+/Mesa
+/UnoControls
+/agg
+/accessibility
+/afms
+/animations
+/apache-commons
+/apple_remote
+/autodoc
+/automation
+/avmedia
+/basctl
+/basebmp
+/basegfx
+/basic
+/bean
+/beanshell
+/berkeleydb
+/binaryurp
+/binfilter
+/boost
+/bridges
+/cairo
+/canvas
+/chart2
+/cli_ure
+/codemaker
+/comphelper
+/configmgr
+/connectivity
+/cosv
+/cppcanvas
+/cppu
+/cppuhelper
+/cppunit
+/cpputools
+/crashrep
+/ct2n
+/cui
+/curl
+/dbaccess
+/default_images
+/desktop
+/dictionaries
+/drawinglayer
+/dtrans
+/editeng
+/embeddedobj
+/embedserv
+/epm
+/eventattacher
+/expat
+/extensions
+/external
+/external_images
+/extras
+/fileaccess
+/filter
+/forms
+/formula
+/fpicker
+/framework
+/gdk-pixbuf
+/gettext
+/glib
+/graphite
+/helpcontent2
+/hsqldb
+/hunspell
+/hwpfilter
+/hyphen
+/i18npool
+/i18nutil
+/icc
+/icu
+/idl
+/idlc
+/io
+/javainstaller2
+/javaunohelper
+/jfreereport
+/jpeg
+/jurt
+/jvmaccess
+/jvmfwk
+/l10n
+/l10ntools
+/languagetool
+/libcroco
+/libegg
+/libgsf
+/libpng
+/librsvg
+/libtextcat
+/libvisio
+/libwpd
+/libwpg
+/libwps
+/libxml2
+/libxmlsec
+/libxslt
+/lingucomponent
+/linguistic
+/lotuswordpro
+/lpsolve
+/lucene
+/mdds
+/migrationanalysis
+/more_fonts
+/moz
+/mysqlc
+/mysqlcppconn
+/mythes
+/neon
+/nlpsolver
+/np_sdk
+/nss
+/o3tl
+/odk
+/offapi
+/officecfg
+/offuh
+/ooo_custom_images
+/oovbaapi
+/oox
+/openssl
+/package
+/packimages
+/padmin
+/pango
+/postprocess
+/psprint_config
+/python
+/pyuno
+/qadevOOo
+/rdbmaker
+/readlicense_oo
+/redland
+/regexp
+/registry
+/remotebridges
+/reportbuilder
+/reportdesign
+/rhino
+/ridljar
+/rsc
+/sal
+/salhelper
+/sane
+/sax
+/saxon
+/sc
+/scaddins
+/sccomp
+/scripting
+/sd
+/sdext
+/setup_native
+/sfx2
+/shell
+/slideshow
+/smoketestdoc
+/smoketestoo_native
+/sot
+/starmath
+/stax
+/stoc
+/store
+/svl
+/svtools
+/svx
+/sw
+/swext
+/sysui
+/test
+/testautomation
+/testgraphical
+/testtools
+/tomcat
+/toolkit
+/tools
+/translate_toolkit
+/translations
+/twain
+/ucb
+/ucbhelper
+/udkapi
+/udm
+/unixODBC
+/unodevtools
+/unoil
+/unotools
+/unoxml
+/ure
+/uui
+/vbahelper
+/vcl
+/vigra
+/wizards
+/writerfilter
+/writerperfect
+/x11_extensions
+/xmerge
+/xml2cmp
+/xmlhelp
+/xmloff
+/xmlreader
+/xmlscript
+/xmlsecurity
+/xpdf
+/xsltml
+/zlib
diff --git a/COPYING b/COPYING
new file mode 100644
index 000000000000..94a9ed024d38
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 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, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/COPYING.LGPL b/COPYING.LGPL
new file mode 100644
index 000000000000..fc8a5de7edf4
--- /dev/null
+++ b/COPYING.LGPL
@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/COPYING.MPL b/COPYING.MPL
new file mode 100644
index 000000000000..7714141d1542
--- /dev/null
+++ b/COPYING.MPL
@@ -0,0 +1,470 @@
+                          MOZILLA PUBLIC LICENSE
+                                Version 1.1
+
+                              ---------------
+
+1. Definitions.
+
+     1.0.1. "Commercial Use" means distribution or otherwise making the
+     Covered Code available to a third party.
+
+     1.1. "Contributor" means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. "Covered Code" means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. "Executable" means Covered Code in any form other than Source
+     Code.
+
+     1.6. "Initial Developer" means the individual or entity identified
+     as the Initial Developer in the Source Code notice required by Exhibit
+     A.
+
+     1.7. "Larger Work" means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. "License" means this document.
+
+     1.8.1. "Licensable" means having the right to grant, to the maximum
+     extent possible, whether at the time of the initial grant or
+     subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. "Original Code" means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this
+     License is not already Covered Code governed by this License.
+
+     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+     hereafter acquired, including without limitation,  method, process,
+     and apparatus claims, in any patent Licensable by grantor.
+
+     1.11. "Source Code" means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus
+     any associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. "You" (or "Your")  means an individual or a legal entity
+     exercising rights under, and complying with all of the terms of, this
+     License or a future version of this License issued under Section 6.1.
+     For legal entities, "You" includes any entity which controls, is
+     controlled by, or is under common control with You. For purposes of
+     this definition, "control" means (a) the power, direct or indirect,
+     to cause the direction or management of such entity, whether by
+     contract or otherwise, or (b) ownership of more than fifty percent
+     (50%) of the outstanding shares or beneficial ownership of such
+     entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Initial Developer to use, reproduce,
+          modify, display, perform, sublicense and distribute the Original
+          Code (or portions thereof) with or without Modifications, and/or
+          as part of a Larger Work; and
+
+          (b) under Patents Claims infringed by the making, using or
+          selling of Original Code, to make, have made, use, practice,
+          sell, and offer for sale, and/or otherwise dispose of the
+          Original Code (or portions thereof).
+
+          (c) the licenses granted in this Section 2.1(a) and (b) are
+          effective on the date Initial Developer first distributes
+          Original Code under the terms of this License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: 1) for code that You delete from the Original Code; 2)
+          separate from the Original Code;  or 3) for infringements caused
+          by: i) the modification of the Original Code or ii) the
+          combination of the Original Code with other software or devices.
+
+     2.2. Contributor Grant.
+     Subject to third party intellectual property claims, each Contributor
+     hereby grants You a world-wide, royalty-free, non-exclusive license
+
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor, to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications
+          created by such Contributor (or portions thereof) either on an
+          unmodified basis, with other Modifications, as Covered Code
+          and/or as part of a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or
+          selling of  Modifications made by that Contributor either alone
+          and/or in combination with its Contributor Version (or portions
+          of such combination), to make, use, sell, offer for sale, have
+          made, and/or otherwise dispose of: 1) Modifications made by that
+          Contributor (or portions thereof); and 2) the combination of
+          Modifications made by that Contributor with its Contributor
+          Version (or portions of such combination).
+
+          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+          effective on the date Contributor first makes Commercial Use of
+          the Covered Code.
+
+          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+          granted: 1) for any code that Contributor has deleted from the
+          Contributor Version; 2)  separate from the Contributor Version;
+          3)  for infringements caused by: i) third party modifications of
+          Contributor Version or ii)  the combination of Modifications made
+          by that Contributor with other software  (except as part of the
+          Contributor Version) or other devices; or 4) under Patent Claims
+          infringed by Covered Code in the absence of Modifications made by
+          that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be
+     distributed only under the terms of this License or a future version
+     of this License released under Section 6.1, and You must include a
+     copy of this License with every copy of the Source Code You
+     distribute. You may not offer or impose any terms on any Source Code
+     version that alters or restricts the applicable version of this
+     License or the recipients' rights hereunder. However, You may include
+     an additional document offering the additional rights described in
+     Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which You contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that
+     the Modification is derived, directly or indirectly, from Original
+     Code provided by the Initial Developer and including the name of the
+     Initial Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
+          If Contributor has knowledge that a license under a third party's
+          intellectual property rights is required to exercise the rights
+          granted by such Contributor under Sections 2.1 or 2.2,
+          Contributor must include a text file with the Source Code
+          distribution titled "LEGAL" which describes the claim and the
+          party making the claim in sufficient detail that a recipient will
+          know whom to contact. If Contributor obtains such knowledge after
+          the Modification is made available as described in Section 3.2,
+          Contributor shall promptly modify the LEGAL file in all copies
+          Contributor makes available thereafter and shall take other steps
+          (such as notifying appropriate mailing lists or newsgroups)
+          reasonably calculated to inform those who received the Covered
+          Code that new knowledge has been obtained.
+
+          (b) Contributor APIs.
+          If Contributor's Modifications include an application programming
+          interface and Contributor has knowledge of patent licenses which
+          are reasonably necessary to implement that API, Contributor must
+          also include this information in the LEGAL file.
+
+               (c)    Representations.
+          Contributor represents that, except as disclosed pursuant to
+          Section 3.4(a) above, Contributor believes that Contributor's
+          Modifications are Contributor's original creation(s) and/or
+          Contributor has sufficient rights to grant the rights conveyed by
+          this License.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code.  If it is not possible to put such notice in a particular Source
+     Code file due to its structure, then You must include such notice in a
+     location (such as a relevant directory) where a user would be likely
+     to look for such a notice.  If You created one or more Modification(s)
+     You may add your name as a Contributor to the notice described in
+     Exhibit A.  You must also duplicate this License in any documentation
+     for the Source Code where You describe recipients' rights or ownership
+     rights relating to Covered Code.  You may choose to offer, and to
+     charge a fee for, warranty, support, indemnity or liability
+     obligations to one or more recipients of Covered Code. However, You
+     may do so only on Your own behalf, and not on behalf of the Initial
+     Developer or any Contributor. You must make it absolutely clear than
+     any such warranty, support, indemnity or liability obligation is
+     offered by You alone, and You hereby agree to indemnify the Initial
+     Developer and every Contributor for any liability incurred by the
+     Initial Developer or such Contributor as a result of warranty,
+     support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of
+     the Covered Code is available under the terms of this License,
+     including a description of how and where You have fulfilled the
+     obligations of Section 3.2. The notice must be conspicuously included
+     in any notice in an Executable version, related documentation or
+     collateral in which You describe recipients' rights relating to the
+     Covered Code. You may distribute the Executable version of Covered
+     Code or ownership rights under a license of Your choice, which may
+     contain terms different from this License, provided that You are in
+     compliance with the terms of this License and that the license for the
+     Executable version does not attempt to limit or alter the recipient's
+     rights in the Source Code version from the rights set forth in this
+     License. If You distribute the Executable version under a different
+     license You must make it absolutely clear that any terms which differ
+     from this License are offered by You alone, not by the Initial
+     Developer or any Contributor. You hereby agree to indemnify the
+     Initial Developer and every Contributor for any liability incurred by
+     the Initial Developer or such Contributor as a result of any such
+     terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to
+     statute, judicial order, or regulation then You must: (a) comply with
+     the terms of this License to the maximum extent possible; and (b)
+     describe the limitations and the code they affect. Such description
+     must be included in the LEGAL file described in Section 3.4 and must
+     be included with all distributions of the Source Code. Except to the
+     extent prohibited by statute or regulation, such description must be
+     sufficiently detailed for a recipient of ordinary skill to be able to
+     understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation ("Netscape") may publish revised
+     and/or new versions of the License from time to time. Each version
+     will be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If You create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), You must (a) rename Your license so that
+     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+     license (except to note that your license differs from this License)
+     and (b) otherwise make it clear that Your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial
+     Developer, Original Code or Contributor in the notice described in
+     Exhibit A shall not of themselves be deemed to be modifications of
+     this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     8.1.  This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+     8.2.  If You initiate litigation by asserting a patent infringement
+     claim (excluding declatory judgment actions) against Initial Developer
+     or a Contributor (the Initial Developer or Contributor against whom
+     You file such action is referred to as "Participant")  alleging that:
+
+     (a)  such Participant's Contributor Version directly or indirectly
+     infringes any patent, then any and all rights granted by such
+     Participant to You under Sections 2.1 and/or 2.2 of this License
+     shall, upon 60 days notice from Participant terminate prospectively,
+     unless if within 60 days after receipt of notice You either: (i)
+     agree in writing to pay Participant a mutually agreeable reasonable
+     royalty for Your past and future use of Modifications made by such
+     Participant, or (ii) withdraw Your litigation claim with respect to
+     the Contributor Version against such Participant.  If within 60 days
+     of notice, a reasonable royalty and payment arrangement are not
+     mutually agreed upon in writing by the parties or the litigation claim
+     is not withdrawn, the rights granted by Participant to You under
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+     the 60 day notice period specified above.
+
+     (b)  any software, hardware, or device, other than such Participant's
+     Contributor Version, directly or indirectly infringes any patent, then
+     any rights granted to You by such Participant under Sections 2.1(b)
+     and 2.2(b) are revoked effective as of the date You first made, used,
+     sold, distributed, or had made, Modifications made by that
+     Participant.
+
+     8.3.  If You assert a patent infringement claim against Participant
+     alleging that such Participant's Contributor Version directly or
+     indirectly infringes any patent where such claim is resolved (such as
+     by license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+     all end user license agreements (excluding distributors and resellers)
+     which have been validly granted by You or any distributor hereunder
+     prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a "commercial item," as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+     software" and "commercial computer software documentation," as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if
+     any, provides otherwise), excluding its conflict-of-law provisions.
+     With respect to disputes in which at least one party is a citizen of,
+     or an entity chartered or registered to do business in the United
+     States of America, any litigation relating to this License shall be
+     subject to the jurisdiction of the Federal Courts of the Northern
+     District of California, with venue lying in Santa Clara County,
+     California, with the losing party responsible for costs, including
+     without limitation, court costs and reasonable attorneys' fees and
+     expenses. The application of the United Nations Convention on
+     Contracts for the International Sale of Goods is expressly excluded.
+     Any law or regulation which provides that the language of a contract
+     shall be construed against the drafter shall not apply to this
+     License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly,
+     out of its utilization of rights under this License and You agree to
+     work with Initial Developer and Contributors to distribute such
+     responsibility on an equitable basis. Nothing herein is intended or
+     shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+     Initial Developer may designate portions of the Covered Code as
+     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+     Developer permits you to utilize portions of the Covered Code under
+     Your choice of the NPL or the alternative licenses, if any, specified
+     by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+     ``The contents of this file are subject to the Mozilla Public License
+     Version 1.1 (the "License"); you may not use this file except in
+     compliance with the License. You may obtain a copy of the License at
+     http://www.mozilla.org/MPL/
+
+     Software distributed under the License is distributed on an "AS IS"
+     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+     License for the specific language governing rights and limitations
+     under the License.
+
+     The Original Code is ______________________________________.
+
+     The Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the _____ license (the  "[___] License"), in which case the
+     provisions of [______] License are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the [____] License and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the [___] License.  If you do not delete
+     the provisions above, a recipient may use your version of this file
+     under either the MPL or the [___] License."
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. You should
+     use the text of this Exhibit A rather than the text found in the
+     Original Code Source Code for Your Modifications.]
+
diff --git a/GNUmakefile.mk b/GNUmakefile.mk
new file mode 100644
index 000000000000..8299e786a6c2
--- /dev/null
+++ b/GNUmakefile.mk
@@ -0,0 +1,37 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(foreach repo,$(gb_REPOS),$(eval $(call gb_Module_make_global_targets,$(wildcard $(repo)/RepositoryModule_*.mk))))
+
+# vim: set noet sw=4 ts=4:
diff --git a/Makefile.in b/Makefile.in
index be50d1d4034d..cfbea5e11755 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,17 +1,166 @@
-# just dumb wrapper; make install comes later
+# @configure_input@
 
-SHELL=/bin/sh
+SHELL=/usr/bin/env bash
 
-all:
-	. ./*Env.Set.sh && \
-	./bootstrap && \
-		cd instsetoo_native && ../solenv/bin/build.pl --all
+ifeq ($(USE_GMAKE),)
+GBUILD_OPT:=
+else
+GBUILD_OPT:=--gmake
+endif
+
+ifeq (@CROSS_COMPILING@,YES)
+all: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded cross-build-toolset
+else
+all: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded
+endif
+	@. ./*Env.Set.sh && \
+        cd instsetoo_native && \
+        build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
+
+ifeq (@CROSS_COMPILING@,YES)
+cross-build-toolset:
+# Build necessary modules for the *build* platform, i.e. those needed
+# by tools run at build time. Sure, in many of these modules only a
+# part of the produced binaries are actually used then in the build.
+# Once everything is handled by gbuild, this can hopefully be streamlined.
+	. ./Env.Build.sh && \
+	for D in \
+	  solenv \
+	  soltools \
+	  boost \
+	  external \
+	  cppunit \
+	  xml2cmp \
+	  sal \
+	  cosv \
+	  udm \
+	  autodoc \
+	  store \
+	  salhelper \
+	  registry \
+	  idlc \
+	  icu \
+	  udkapi \
+	  expat \
+	  libxml2 \
+	  xml2cmp \
+	  libxslt \
+	  offapi \
+	  oovbaapi \
+	  codemaker \
+	  offuh \
+	  cppu \
+	  cppuhelper \
+	  rdbmaker \
+	  cpputools \
+	  xmlreader \
+	  i18nutil \
+	  ridljar \
+	  jurt \
+	  jvmaccess \
+	  bridges \
+	  ucbhelper \
+	  GBUILD:comphelper \
+	  jvmfwk \
+	  regexp \
+	  sax \
+	  stoc \
+	  i18npool \
+	  unodevtools \
+	  gettext \
+	  dictionaries \
+	  o3tl \
+	  basegfx \
+	  GBUILD:tools \
+	  rsc \
+	  setup_native; do \
+	    case $$D in \
+	    GBUILD:*) \
+	      (cd $${D#*:} && make -r -j@BUILD_MAX_JOBS@) \
+	      ;; \
+	    *) \
+	      (cd $$D && build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ -- -P@BUILD_MAX_JOBS@ && deliver.pl) \
+	      ;; \
+	    esac; \
+	done
+endif
+
+install:
+	@. ./*Env.Set.sh && \
+	echo "Installing in $${prefix:-@prefix@}..." && \
+	ooinstall "$${prefix:-@prefix@}" && \
+	echo "" && \
+	echo "Installation finished, you can now execute:" && \
+	echo "$${prefix:-@prefix@}/program/soffice"
+
+dev-install:
+	@. ./*Env.Set.sh && \
+        cd smoketestoo_native && \
+		export SAL_USE_VCLPLUGIN="svp" && \
+		build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ && \
+		cd @abs_builddir@ && ln -s $$SOLARVER/$$INPATH/installation/opt/ install && \
+		echo "" && \
+        echo "Developer installation finished, you can now execute:"
+	@if test `uname -s` = Darwin; then \
+		echo open install/LibreOffice.app; \
+	else \
+		echo "cd @abs_builddir@/install/program" && \
+		echo ". ooenv" && \
+		echo "./soffice.bin"; \
+	fi
 
 distclean:
-	. ./*Env.Set.sh && \
-	dmake distclean
+	-rm config.cache
+	-rm config.log
+ifeq (@BUILD_DMAKE@,YES)
+	-$(GNUMAKE) -C dmake distclean
+endif
 
 clean:
 	. ./*Env.Set.sh && \
-	dmake clean
-	
+	rm -rf */$$INPATH && \
+	rm -rf solver/*/$$INPATH && \
+	rm -rf install && \
+	$$GNUMAKE -C dmake clean && \
+	rm -f solenv/*/bin/dmake* && \
+	$$GNUMAKE -f GNUmakefile.mk -sr clean
+ifeq (@CROSS_COMPILING@,YES)
+	. ./*Env.Set.sh && \
+	rm -rf */$$INPATH_FOR_BUILD && \
+	rm -rf solver/*/$$INPATH_FOR_BUILD
+endif
+
+dmake/dmake@EXEEXT_FOR_BUILD@:
+	./bootstrap
+
+src.downloaded: ooo.lst download
+ifeq (@DO_FETCH_TARBALLS@,YES)
+	@. ./*Env.Set.sh && \
+	$$SRC_ROOT/download $$SRC_ROOT/ooo.lst && touch $@
+else
+        @echo "Automatic fetching of external tarballs is disabled."
+endif
+
+fetch: src.downloaded
+
+Makefile: configure.in set_soenv.in Makefile.in
+	./autogen.sh
+
+check: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ fetch
+	@. ./*Env.Set.sh && \
+	cd smoketestoo_native && \
+	export SAL_USE_VCLPLUGIN="svp" && \
+        build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
+	@. ./*Env.Set.sh && $$SOLARENV/bin/subsequenttests
+
+id:
+	@. ./*Env.Set.sh && \
+		create-ids
+
+tags:
+	@. ./*Env.Set.sh && \
+		create-tags
+
+docs:
+	@. ./*Env.Set.sh && \
+		mkdocs.sh $$SRC_ROOT/docs $$SOLARENV/inc/doxygen.cfg
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
new file mode 100644
index 000000000000..1086afd63304
--- /dev/null
+++ b/Module_tail_build.mk
@@ -0,0 +1,45 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Norbert Thiebaud <nthiebaud@gmail.com> (C) 2011, All Rights Reserved.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+
+$(eval $(call gb_Module_Module,tail_end))
+
+$(eval $(call gb_Module_add_moduledirs,tail_end,\
+    chart2 \
+    cui \
+    dbaccess \
+    fileaccess \
+    formula \
+    hwpfilter \
+    lotuswordpro \
+    padmin \
+    reportdesign \
+    sc \
+    sd \
+    slideshow \
+    starmath \
+    sw \
+    unoxml \
+    writerfilter \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/README.cross b/README.cross
new file mode 100644
index 000000000000..0f21f9144d04
--- /dev/null
+++ b/README.cross
@@ -0,0 +1,237 @@
+Cross-compiling LibreOffice
+===========================
+
+Notes on cross-compiling LibreOffice, written by Tor Lillqvist
+<tlillqvist@novell.com> <tml@iki.fi> in May, 2011.
+
+Cross-compilation of LibreOffice is not possible yet. Some initial
+work is done, "baby steps", but a lot remains. This work is highly
+experimental and done mostly in my own spare time just for the hacking
+pleasure. No promise, explicit or implied, is given that it will ever
+be finished.
+
+Searching for information about cross-compilation of OpenOffice.org
+(the predecessor of LibreOffice) you will find information about what
+actually was not cross-compilation, but using QEMU.
+
+My cross-compilation experimentation is going on for four platforms:
+Windows, iOS, Android and PowerPC Mac OS X. I work on the master
+branch of LibreOffice. Some other people have talked about setting up
+a separate branch for Android work, or even separate clones at
+github. I am not interested in that.
+
+
+General
+-------
+
+In GNU Autoconf terminology, "build" is the platform on which you are
+running a build on some software and "host" is the platform on which
+the software you are building will run. Only in the specific case of
+building compilers and other programming tools is the term "target"
+used to indicate the platform for which the tools your are building
+will produce code. As LibreOffice is not a compiler, the "target" term
+should not be used in the context of cross-compilation.
+
+(For a case where all three of "build", "host" and "target" are
+different: consider a gcc cross-compiler running on Windows, producing
+code for Android, where the cross-compiler itself was built on
+Linux. (This is a real case.) An interesting tidbit is that such
+configurations are called "Canadian Cross".)
+
+Even though the LibreOffice build mechanism is highly unorthodox, the
+configure script takes the normal --build and --host options like any
+GNU Autoconf -based configure script. To cross-compile, you basically
+need just to specify a suitable --host option and things should work
+out nicely. In practise, some more details might be needed. See
+examples below.
+
+
+What is so hard, then?
+----------------------
+
+Despite the fact that the configure script takes normal --build and
+--host options, that is just the beginning. In practise a lot of work
+was necessary to separate tests for "host" and "build" platforms in
+the configure script. See the git log for details. And the reasonably
+"standard" configure.in is just the top level; when we get down to the
+actual makefilery used to build the bits of LibreOffice, it gets much
+worse.
+
+
+Windows
+-------
+
+There is some support in LibreOffice already (from OpenOffice.org) for
+building it locally on Windows but with the GNU tool-chain, i.e. what
+is commonly known as MinGW. But as far as I know, that work has never
+attempted cross-compilation.
+
+This OOo-originated MinGW support attempts to support both running
+Cygwin gcc in its -mno-cygwin mode, and a native MinGW compiler.  The
+-mno-cygwin mechanism in the Cygwin gcc is rapidly being obsoleted, if
+it isn't already, and I have not attempted to check that it keeps
+working. Ditto for native MinGW; if one compiles natively on Windows,
+why not use Microsoft's compiler, as OOo/LO has been build for Windows
+all the time using that and it works fine. In my opinion, it makes
+sense to use MinGW only for cross-compilation. (Because of obvious
+benefits like speed improvement, easier automation in systems like the
+openSUSE Build Servce, etc.)
+
+MinGW is available as cross-build toolchains pre-packaged in more or
+less official packages for many Linux distros including Debian, Fedora
+and openSUSE. Personally I use the mingw32 packages in the openSUSE
+Build Service, running on openSUSE.
+
+It is somewhat unclear how well thought-out the conditionals and code
+for MinGW inside the LibreOffice code actually is. The little I have
+seen of it seems a bit randomish, with copy-pasting haveing been
+preferred to factoring out differences.
+
+The autogen.lastrun I use for my MinGW cross-compilation experimentation is:
+
+CC=ccache i686-w64-mingw32-gcc
+CXX=ccache i686-w64-mingw32-g++
+CC_FOR_BUILD=ccache gcc
+CXX_FOR_BUILD=ccache g++
+--build=x86_64-unknown-linux-gnu
+--host=i686-w64-mingw32
+--with-distro=LibreOfficeWin32
+--disable-build-mozilla
+--disable-ext-nlpsolver
+--disable-ext-pdfimport
+--disable-ext-presenter-console
+--disable-ext-presenter-minimizer
+--disable-ext-report-builder
+--disable-ext-scripting-beanshell
+--disable-ext-scripting-javascript
+--disable-ext-wiki-publisher
+--disable-ext-wiki-publisher
+--disable-mozilla
+--disable-zenity
+--enable-python=system
+--with-external-tar=/mnt/hemulen/ooo/git/master/src
+--with-num-cpus=1
+--with-max-jobs=1
+--with-system-altlinuxhyph
+--with-system-boost
+--with-system-curl
+--with-system-db
+--with-system-expat
+--with-system-gettext
+--with-system-hunspell
+--with-system-icu
+--with-system-libwpd
+--with-system-libwpg
+--with-system-libwps
+--with-system-libxml
+--with-system-libxslt
+--with-system-lpsolve
+--with-system-mythes
+--with-system-neon
+--with-system-openssl
+--with-system-redland
+--with-system-zlib
+--with-vendor=no
+
+
+iOS
+---
+
+iOS is the operating system of Apple's mobile devices. Clearly for a
+device like the iPad it would be totally unacceptable to run a normal
+LibreOffice application with a overlapping windows and mouse-oriented
+GUI widgets. No work has been done (at least publicly) to design a
+touch GUI for LibreOffice, so the work on cross-compiling LibreOffice
+for iOS is extremely experimental, and of course partly pointless;)
+But it is interesting and fun nonetheless.
+
+Obviously it will make sense to build only a part of LibreOffice's
+code for iOS. Most likely all GUI-oriented code should be left out,
+and some iOS app that eventually wants to use the remaining bits will
+handle all its GUI in a platform-dependent manner. How well it will be
+possible to do such a split remains to be seen. As I said, this is
+highly experimental and just in its baby steps phase.
+
+Technically, one important special aspect of iOS is that apps are not
+allowed to load own dynamic libraries. (System libraries are used in
+the form of dynamic libraries, just like on MacOSX, of which iOS is a
+variant.) So all the libraries in LibreOffice that normally are shared
+libraries (DLLs on Windows, shared objects (.so) on Linux, dynamic
+libraries on MacOSX (.dylib)) need to be built as static archives
+instead. Obviously this will have some interesting consequences for
+how UNO is implemented and used. None of that has been spared much
+thought yet.
+
+The Apple tool-chain for iOS cross-building is available only for
+MacOSX, so that is where I have been doing it.
+
+Here is my autogen.lastrun for iOS:
+CXX=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
+CC=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
+CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0
+CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0
+--with-distro=LibreOfficeiOS
+--with-external-tar=/Volumes/ooo/git/master/src
+--with-num-cpus=1
+--with-max-jobs=1
+
+
+Android
+-------
+
+I don't know much about Android, but from a technical point of view it
+is a kind of Linux, of course. As far as I know it is allowed for an
+Android app to use shared objects, but if it isn't, then just the same
+approach as used on iOS will need to be used.
+
+As for the GUI, the same holds as said above for iOS.
+
+I have done my Android cross-compilation work on Linux (openSUSE in
+particular), but it could as well be done on MacOSX. The Android
+cross-buld tool-chain (the "Native Development Kit", or NDK) is
+available for Linux, MacOSX and Windows. (Trying to cross-compile from
+Windows will probably drive you insane.)
+
+Here is my autogen.lastrun for Android:
+SYSBASE=/home/tml/android-ndk-r5b/platforms/android-9/arch-arm
+CC=ccache /home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot /home/tml/android-ndk-r5b/platforms/android-9/arch-arm
+CXX=ccache /home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ --sysroot /home/tml/android-ndk-r5b/platforms/android-9/arch-arm -I /home/tml/android-ndk-r5b/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r5b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r5b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti
+AR=/home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar
+NM=/home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm
+OBJDUMP=/home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump
+RANLIB=/home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ranlib
+STRIP=/home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-strip
+CC_FOR_BUILD=ccache gcc
+CXX_FOR_BUILD=ccache g++
+--build=x86_64-unknown-linux-gnu
+--disable-zenity
+--with-distro=LibreOfficeAndroid
+--with-external-tar=/mnt/hemulen/ooo/git/master/src
+
+
+PowerPC Mac OS X
+----------------
+
+Cross-compiling for PowerPC Mac OS X from Intel Mac OS X will probably
+be easy. The APIs available should after all be closely identical to
+those on Intel Mac OS X, and LibreOffice builds fine natively on
+PowerPC Mac already. I have just started experimenting with it. My
+autogen.lastrun looks like this:
+
+CC=ccache /Xcode3/usr/bin/gcc-4.0 -arch ppc
+CXX=ccache /Xcode3/usr/bin/g++-4.0 -arch ppc
+CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0
+CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0
+--build=i386-apple-darwin10.7.0
+--host=powerpc-apple-darwin10
+--disable-mozilla
+--disable-build-mozilla
+--with-external-tar=/Volumes/ooo/git/master/src
+
+
+
+That's all, thank you, and have a nice day. People with commit access,
+feel free to edit this document, and add yourself below. Sorry for
+writing now initially from such a personal point of view.
+
+--Tor Lillqvist <tlillqvist@novell.com>, <tml@iki.fi>
diff --git a/Repository.mk b/Repository.mk
index c60677f27bbe..d3f99281be1a 100755..100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
     mkunroll \
     rscdep \
     so_checksum \
-    sspretty \
 ))
 
 $(eval $(call gb_Helper_register_executables,OOO, \
@@ -43,6 +42,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+    adabasui \
     AppleRemote \
 	adabas \
 	adabasui \
@@ -53,41 +53,59 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     basebmp \
 	canvastools \
 	cppcanvas \
+    chartcontroller \
+    chartmodel \
+    charttools \
+    chartview \
+    cppcanvas \
     cui \
-	dba \
-	dbaxml \
-	dbmm \
-	dbui \
-	dbpool \
-	dbtools \
+    dba \
+    dbaxml \
+    dbmm \
+    dbtools \
+    dbu \
+
     desktop_detector \
+    doctok \
     drawinglayer \
     editeng \
-    eggtray \
-	file \
-	for \
+    for \
 	forui \
+    frm \
     fwe \
     fwi \
     fwk \
     fwl \
     fwm \
+    hwp \
     i18npaper \
     i18nregexp \
     lng \
+    lwpft \
     msfilter \
     msword \
 	odbc \
 	odbcbase \
 	oox \
+	ooxml \
     qstart_gtk \
-	rpt \
-	rptui \
-	rptxml \
+    resourcemodel \
+    rpt \
+    rptui \
+    rptxml \
     sax \
     sb \
+    sc \
+    scd \
 	sdbc \
 	sdbt \
+    scfilt \
+    scui \
+    sd \
+    sdbt \
+    sdd \
+    sdfilt \
+    sdui \
     sfx \
     sm \
     smd \
@@ -103,17 +121,19 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     textconversiondlgs \
     tk \
     tl \
-    utl \
     unordf \
     unoxml \
+    utl \
     vbahelper \
 	writerfilter \
     vcl \
     vclplug_gen \
     vclplug_gtk \
+    vclplug_gtk3 \
     vclplug_kde \
     vclplug_kde4 \
     vclplug_svp \
+    writerfilter \
     xcr \
     xo \
     xof \
@@ -124,7 +144,14 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	test \
     cppunit \
+    crypto \
+    fileacc \
+    icui18n \
+    icule \
+    graphite2_off \
+    ssl \
 ))
 
 
@@ -134,7 +161,6 @@ $(eval $(call gb_Helper_register_libraries,RTLIBS, \
     i18nutil \
     jvmaccess \
     ucbhelper \
-    vos3 \
 ))
 
 $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
@@ -142,10 +168,6 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
     salhelper \
 ))
 
-$(eval $(call gb_Helper_register_libraries,STLLIBS, \
-    stl \
-))
-
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 	cairocanvas \
 	canvasfactory \
@@ -156,13 +178,18 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
     fsstorage \
 	gdipluscanvas \
     hatchwindowfactory \
-    msforms \
+    lomenubar \
+        msforms \
 	nullcanvas \
+    OGLTrans \
     passwordcontainer \
     productregistration \
 	simplecanvas \
+    slideshow \
+    vbaobj \
     vbaswobj \
 	vclcanvas \
+    writerfilter_uno \
 	writerfilter_debug \
 ))
 
@@ -175,8 +202,14 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 	basegfx_s \
+    crypto \
+    graphite2_off \
+    libeay32 \
+    ssleay32 \
     ooopathutils \
     salcpprt \
+    ssl \
+    toolshelpers \
 	vclmain \
 ))
 
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 695c55e02ebd..2b33705f1613 100755..100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -28,21 +28,15 @@
 # fixes for all the libraries that are named with too much creativity and do
 # not follow any of the established nameschemes
 
-ifeq ($(OS),LINUX)
-
+# Make has no support for 'or' clauses in conditionals,
+# we use a filter expression instead.
+ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD IOS ANDROID, $(OS)))
 gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
 
-ifeq ($(USE_SYSTEM_STL),YES)
-gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
-gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
 
 endif # ifeq ($(OS),LINUX)
 
@@ -65,11 +59,6 @@ gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
 
-ifeq ($(USE_SYSTEM_STL),YES)
-gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.dylib,$(gb_Library_FILENAMES))
-gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
-
 endif # ifeq ($(OS),MACOSX)
 
 ifeq ($(OS),WNT)
@@ -80,13 +69,11 @@ gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%
 gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:libcppunit.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
@@ -95,11 +82,6 @@ gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT)
 gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
 gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
 
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
-else
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
-endif
 
 # handle libraries in msvc format that don't use an "i" prefix for their import library
 # these are libraries built by OOo, but only a few of them
@@ -120,32 +102,30 @@ gb_Library_ILIBFILENAMES:=\
 	winmm \
 
 gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PSDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
+gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(WINDOWS_SDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
 
 gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst cppunit:cppunit%,cppunit:cygcppunit-1-12-1%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst crypto:crypto%,crypto:libeay32%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst ssl:ssl%,ssl:ssleay32%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 
-ifeq ($(USE_SYSTEM_STL),YES)
-gb_Library_FILENAMES := $(patsubst stl:%,stl:$(gb_Library_IARCSYSPRE)stdc++_s$(gb_Library_IARCSYSPRE),$(gb_Library_FILENAMES))
-gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
 
 else #ifneq ($(USE_MINGW),)
 
 gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst crypto:libcrypto%,crypto:libcrypto_static%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ssl:libssl%,ssl:libssl_static%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:libeay32%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssleay32%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
@@ -153,15 +133,14 @@ gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENA
 gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
 gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
 
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
-else
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
-endif
 
 # change the names of all import libraries that don't have an "i" prefix as in our standard naming schema
 gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE)
-gb_Library_NOILIBFILENAMES += icule icuuc
+gb_Library_NOILIBFILENAMES += icule icuuc \
+    graphite2_off \
+    msvcprt \
+    shlwapi \
+    version \
 
 gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
@@ -180,10 +159,24 @@ endif # ifneq ($(USE_MINGW),)
 
 endif # ifeq ($(OS),WNT)
 
+gb_Library_FILENAMES := $(patsubst writerfilter_uno:writerfilter_uno%,writerfilter_uno:writerfilter%,$(gb_Library_FILENAMES))
+
 # we do not require a known rule for these, when using system libs
+ifeq ($(SYSTEM_OPENSSL),YES)
+gb_Library_TARGETS := $(filter-out crypto,$(gb_Library_TARGETS))
+gb_Library_TARGETS := $(filter-out ssl,$(gb_Library_TARGETS))
+endif
+
+gb_Library_TARGETS := $(filter-out icudata,$(gb_Library_TARGETS))
+gb_Library_TARGETS := $(filter-out icui18n,$(gb_Library_TARGETS))
+gb_Library_TARGETS := $(filter-out icuio,$(gb_Library_TARGETS))
+gb_Library_TARGETS := $(filter-out icule,$(gb_Library_TARGETS))
+gb_Library_TARGETS := $(filter-out iculx,$(gb_Library_TARGETS))
+gb_Library_TARGETS := $(filter-out icutu,$(gb_Library_TARGETS))
+endif
 
-ifeq ($(USE_SYSTEM_STL),YES)
-gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
+ifeq ($(SYSTEM_CPPUNIT),YES)
+gb_Library_TARGETS := $(filter-out cppunit,$(gb_Library_TARGETS))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
new file mode 100644
index 000000000000..19426173c9ea
--- /dev/null
+++ b/RepositoryModule_ooo.mk
@@ -0,0 +1,72 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,ooo))
+
+$(eval $(call gb_Module_add_moduledirs,ooo,\
+    chart2 \
+    comphelper \
+    cui \
+    dbaccess \
+    drawinglayer \
+    editeng \
+    fileaccess \
+    forms \
+    formula \
+    framework \
+    hwpfilter \
+    lotuswordpro \
+    oox \
+    padmin \
+    sc \
+    sd \
+    sfx2 \
+    slideshow \
+    sot \
+    svl \
+    svtools \
+    svx \
+    sw \
+    toolkit \
+    tools \
+    unotools \
+    unoxml \
+    xmloff \
+    vbahelper \
+    writerfilter \
+))
+
+# these have only migrated subsequentcheck for now
+$(eval $(call gb_Module_add_moduledirs,ooo,\
+    configmgr \
+    linguistic \
+    qadevOOo \
+    sal \
+    ucb \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/TEMPLATE.SOURCECODE.HEADER b/TEMPLATE.SOURCECODE.HEADER
new file mode 100644
index 000000000000..974b3219b7f0
--- /dev/null
+++ b/TEMPLATE.SOURCECODE.HEADER
@@ -0,0 +1,30 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       [ insert your name / company etc. here eg. Jim Bob <jim@bob.org> ]
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Major Contributor(s): 
+ * Ted <ted@bear.com>
+ * Portions created by the Ted are Copyright (C) 2010 Ted. All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
diff --git a/acinclude.m4 b/acinclude.m4
index 71f01544d11b..a42a0f1ce830 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -118,21 +118,3 @@ esac
 AC_LANG_POP(C)
 
 ]) dnl end AC_DEFUN
-
-dnl PKG_CHECK_MODULES_MACHACK is like PKG_CHECK_MODULES but sneaks in an extra
-dnl argument between the first and second, denoting a program to call instead of
-dnl pkg-config on Mac OS X (aka Darwin):
-AC_DEFUN([PKG_CHECK_MODULES_MACHACK],
-[if test "$_os" = "Darwin"; then
-   AC_MSG_CHECKING($1_CFLAGS)
-   $1_CFLAGS=`$2 --cflags`
-   AC_MSG_RESULT($$1_CFLAGS)
-   AC_MSG_CHECKING($1_LIBS)
-   $1_LIBS=`$2 --libs`
-   AC_MSG_RESULT($$1_LIBS)
-   AC_SUBST($1_CFLAGS)
-   AC_SUBST($1_LIBS)
- else
-   PKG_CHECK_MODULES($1, $3, $4, $5, $6)
- fi
-])
diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644
index 680f52ac3929..000000000000
--- a/aclocal.m4
+++ /dev/null
@@ -1,278 +0,0 @@
-# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN(PKG_CHECK_MODULES, [
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        AC_MSG_CHECKING(for $2)
-
-        if $PKG_CONFIG --exists "$2" ; then
-            AC_MSG_RESULT(yes)
-            succeeded=yes
-
-            AC_MSG_CHECKING($1_CFLAGS)
-            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-            AC_MSG_RESULT($$1_CFLAGS)
-
-            AC_MSG_CHECKING($1_LIBS)
-            $1_LIBS=`$PKG_CONFIG --libs "$2"`
-            AC_MSG_RESULT($$1_LIBS)
-        else
-            $1_CFLAGS=""
-            $1_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but 
-            ## do set a variable so people can do so.
-            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-            ifelse([$4], ,echo $$1_PKG_ERRORS,)
-        fi
-
-        AC_SUBST($1_CFLAGS)
-        AC_SUBST($1_LIBS)
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     ifelse([$3], , :, [$3])
-  else
-     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-  fi
-])
-
-
-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# 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.
-
-# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-
-# Adds support for distributing Python modules and packages.  To
-# install modules, copy them to $(pythondir), using the python_PYTHON
-# automake variable.  To install a package with the same name as the
-# automake package, install to $(pkgpythondir), or use the
-# pkgpython_PYTHON automake variable.
-
-# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
-# locations to install python extension modules (shared libraries).
-# Another macro is required to find the appropriate flags to compile
-# extension modules.
-
-# If your package is configured with a different prefix to python,
-# users will have to add the install directory to the PYTHONPATH
-# environment variable, or create a .pth file (see the python
-# documentation for details).
-
-# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
-# cause an error if the version of python installed on the system
-# doesn't meet the requirement.  MINIMUM-VERSION should consist of
-# numbers and dots only.
-
-AC_DEFUN([AM_PATH_PYTHON],
- [
-  dnl Find a Python interpreter.  Python versions prior to 1.5 are not
-  dnl supported because the default installation locations changed from
-  dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
-  dnl in 1.5.
-  m4_define([_AM_PYTHON_INTERPRETER_LIST],
-            [python python2 python2.6 python2.5 python2.4 python2.3 python2.2 dnl
-python2.1 python2.0 python1.6 python1.5])
-
-  m4_if([$1],[],[
-    dnl No version check is needed.
-    # Find any Python interpreter.
-    if test -z "$PYTHON"; then
-      PYTHON=:
-      AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST)
-    fi
-    am_display_PYTHON=python
-  ], [
-    dnl A version check is needed.
-    if test -n "$PYTHON"; then
-      # If the user set $PYTHON, use it and don't search something else.
-      AC_MSG_CHECKING([whether $PYTHON version >= $1])
-      AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
-			      [AC_MSG_RESULT(yes)],
-			      [AC_MSG_ERROR(too old)])
-      am_display_PYTHON=$PYTHON
-    else
-      # Otherwise, try each interpreter until we find one that satisfies
-      # VERSION.
-      AC_CACHE_CHECK([for a Python interpreter with version >= $1],
-	[am_cv_pathless_PYTHON],[
-	for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do
-	  test "$am_cv_pathless_PYTHON" = none && break
-	  AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break])
-	done])
-      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
-      if test "$am_cv_pathless_PYTHON" = none; then
-	PYTHON=:
-      else
-        AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
-      fi
-      am_display_PYTHON=$am_cv_pathless_PYTHON
-    fi
-  ])
-
-  if test "$PYTHON" = :; then
-  dnl Run any user-specified action, or abort.
-    m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
-  else
-
-  dnl Query Python for its version number.  Getting [:3] seems to be
-  dnl the best way to do this; it's what "site.py" does in the standard
-  dnl library.
-
-  AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
-    [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`])
-  AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
-
-  dnl Use the values of $prefix and $exec_prefix for the corresponding
-  dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX.  These are made
-  dnl distinct variables so they can be overridden if need be.  However,
-  dnl general consensus is that you shouldn't need this ability.
-
-  AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
-  AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
-
-  dnl At times (like when building shared libraries) you may want
-  dnl to know which OS platform Python thinks this is.
-
-  AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
-    [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`])
-  AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
-
-
-  dnl Set up 4 directories:
-
-  dnl pythondir -- where to install python scripts.  This is the
-  dnl   site-packages directory, not the python standard library
-  dnl   directory like in previous automake betas.  This behavior
-  dnl   is more consistent with lispdir.m4 for example.
-  dnl Query distutils for this directory.  distutils does not exist in
-  dnl Python 1.5, so we fall back to the hardcoded directory if it
-  dnl doesn't work.
-  AC_CACHE_CHECK([for $am_display_PYTHON script directory],
-    [am_cv_python_pythondir],
-    [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
-     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
-  AC_SUBST([pythondir], [$am_cv_python_pythondir])
-
-  dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
-  dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is
-  dnl   more consistent with the rest of automake.
-
-  AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
-
-  dnl pyexecdir -- directory for installing python extension modules
-  dnl   (shared libraries)
-  dnl Query distutils for this directory.  distutils does not exist in
-  dnl Python 1.5, so we fall back to the hardcoded directory if it
-  dnl doesn't work.
-  AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
-    [am_cv_python_pyexecdir],
-    [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
-     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
-  AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
-
-  dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
-
-  AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
-
-  dnl Run any user-specified action.
-  $2
-  fi
-
-])
-
-
-# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-# ---------------------------------------------------------------------------
-# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
-# Run ACTION-IF-FALSE otherwise.
-# This test uses sys.hexversion instead of the string equivalent (first
-# word of sys.version), in order to cope with versions such as 2.2c1.
-# hexversion has been introduced in Python 1.5.2; it's probably not
-# worth to support older versions (1.5.1 was released on October 31, 1998).
-AC_DEFUN([AM_PYTHON_CHECK_VERSION],
- [prog="import sys, string
-# split strings by '.' and convert to numeric.  Append some zeros
-# because we need at least 4 digits for the hex conversion.
-minver = map(int, string.split('$2', '.')) + [[0, 0, 0]]
-minverhex = 0
-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[[i]]
-sys.exit(sys.hexversion < minverhex)"
-  AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.     -*- Autoconf -*-
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# AM_RUN_LOG(COMMAND)
-# -------------------
-# Run COMMAND, save the exit status in ac_status, and log it.
-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-AC_DEFUN([AM_RUN_LOG],
-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   (exit $ac_status); }])
-
-m4_include([acinclude.m4])
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 000000000000..4d5037062c36
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,153 @@
+:
+    eval 'exec perl -S $0 ${1+"$@"}'
+        if 0;
+
+use strict;
+
+sub clean()
+{
+    system ("rm -Rf autom4te.cache");
+    system ("rm -f missing install-sh mkinstalldirs libtool ltmain.sh");
+    print "cleaned the build tree\n";
+}
+
+# check we have various vital tools
+sub sanity_checks($)
+{
+    my $system = shift;
+    my @path = split (':', $ENV{'PATH'});
+    my %required =
+      (
+       'pkg-config' => "pkg-config is required to be installed",
+       'autoconf'   => "autoconf is required",
+       'aclocal'    => "aclocal is required",
+      );
+
+    for my $elem (@path) {
+        for my $app (keys %required) {
+            if (-f "$elem/$app") {
+                delete $required{$app};
+            }
+        }
+    }
+    if ((keys %required) > 0) {
+        print ("Various low-level dependencies are missing, please install them:\n");
+        for my $app (keys %required) {
+            print "\t $app: " . $required{$app} . "\n";
+        }
+        exit (1);
+    }
+}
+
+# one argument per line
+sub read_args($)
+{
+    my $file = shift;
+    my $fh;
+    my @lst;
+    open ($fh, $file) || die "can't open file: $file";
+    while (<$fh>) {
+        chomp();
+        # migrate from the old system
+        if ( substr($_, 0, 1) eq "'" ) {
+            print "Migrating options from the old autogen.lastrun format, using:\n";
+            my @opts;
+            @opts = split(/'/);
+            foreach my $opt (@opts) {
+                if ( substr($opt, 0, 1) eq "-" ) {
+                    push @lst, $opt;
+                    print "  $opt\n";
+                }
+            }
+        } else {
+            push @lst, $_;
+        }
+    }
+    close ($fh);
+    # print "read args from file '$file': @lst\n";
+    return @lst;
+}
+
+sub invalid_distro($$)
+{
+    my ($config, $distro) = @_;
+    print STDERR "Can't find distro option set: $config\nThis is not necessarily a problem.\n";
+    print STDERR "Distros with distro option sets are:\n";
+    my $dirh;
+    opendir ($dirh, "distro-configs");
+    while (($_ = readdir ($dirh))) {
+        /(.*)\.conf$/ || next;
+        print STDERR "\t$1\n";
+    }
+    closedir ($dirh);
+}
+
+my @cmdline_args = ();
+if (!@ARGV) {
+    my $lastrun = "autogen.lastrun";
+    @cmdline_args = read_args ($lastrun) if (-f $lastrun);
+} else {
+    @cmdline_args = @ARGV;
+}
+
+my @args;
+for my $arg (@cmdline_args) {
+    if ($arg eq '--clean') {
+        clean();
+    } elsif ($arg =~ m/--with-distro=(.*)$/) {
+        my $config = "distro-configs/$1.conf";
+        if (! -f $config) {
+            invalid_distro ($config, $1);
+            } else {
+                push @args, read_args ($config);
+            }
+        } else {
+        push @args, $arg;
+    }
+}
+
+system ("touch ChangeLog");
+
+my $system = `uname -s`;
+chomp $system;
+
+sanity_checks ($system) unless($system eq 'Darwin');
+
+my $aclocal_flags = $ENV{ACLOCAL_FLAGS};
+
+$aclocal_flags = "-I ./m4/mac" if (($aclocal_flags eq "") && ($system eq 'Darwin'));
+
+$ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!($system eq 'Darwin'));
+
+system ("aclocal $aclocal_flags") && die "Failed to run aclocal";
+unlink ("configure");
+system ("autoconf") && die "Failed to run autoconf";
+die "failed to generate configure" if (! -x "configure");
+
+if (defined $ENV{NOCONFIGURE}) {
+    print "Skipping configure process.";
+} else {
+    # Save autogen.lastrun only if we did get some arguments on the command-line
+    if (@ARGV) {
+        if ($#cmdline_args > 0) {
+            # print "writing args to autogen.lastrun\n";
+            my $fh;
+            open ($fh, ">autogen.lastrun") || die "can't open autogen.lastrun: $!";
+            for my $arg (@cmdline_args) {
+                print $fh "$arg\n";
+            }
+            close ($fh);
+        }
+    }
+    print "running ./configure with '" . join ("' '", @args), "'\n";
+    system ("./configure", @args);
+}
+
+# Local Variables:
+# mode: perl
+# cperl-indent-level: 4
+# tab-width: 4
+# indent-tabs-mode: nil
+# End:
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab: #
diff --git a/bin/create_bootstrap_links b/bin/create_bootstrap_links
new file mode 100755
index 000000000000..a42f7b803847
--- /dev/null
+++ b/bin/create_bootstrap_links
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+BIN_DIR=$(dirname $0)
+REPOS=$(cat ${BIN_DIR?}/repo-list)
+cd ${BIN_DIR?}/..
+BOOTSTRAP_DIR=$(pwd)
+
+for repo in $REPOS ; do
+    for link in $(ls clone/${repo}) ; do
+        if [ ! -e "$link" ] ; then
+            echo "Creating missing link $link"
+            ln -s "clone/${repo}/$link" "$link"
+        fi
+    done
+done
diff --git a/bin/doubleNewlines.pl b/bin/doubleNewlines.pl
new file mode 100755
index 000000000000..c1f66e57ea17
--- /dev/null
+++ b/bin/doubleNewlines.pl
@@ -0,0 +1,63 @@
+#!/usr/bin/perl
+################################################################################
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Michael Koch <miko@gmx.ch>
+#
+# Major Contributor(s):
+#       <name>
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+################################################################################
+# Usage: "Usage: doubleNewlines.pl <directory>"
+#        It is possible to enter more than one directory separated by spaces.
+#        Instead of a directory you can also use one or more files as arguments.
+################################################################################
+
+use strict;
+use warnings;
+
+use File::Find;
+use Cwd 'abs_path';
+
+my $total = 0;
+
+die "Usage: doubleNewlines.pl <directory>\n" unless (@ARGV);
+
+# if path is relative, make it absolute
+foreach (@ARGV){
+    $_ = abs_path($_);
+}
+
+print "Following code files (.hxx and .cxx) are suspicious:\n";
+find(\&processFile, @ARGV);     # processes all files in dir and subdirs
+print "Found $total suspicious files.\n";
+
+sub processFile {
+    my $file = $File::Find::name;
+    return unless $file =~ /(.cxx$)|(.hxx$)/;
+    open FILE, $file or die "Can't open '$file': $!";
+    my $lines = join '', <FILE>;
+    if ($lines =~ /(\n{2,}.+){10}/) {    # ten consecutive occurrences of [empty line(s) - code line)]
+        my $relPath = substr($file, index($file, "clone")+6);   # relative path beginning with repo name
+        print "$relPath\n";
+        $total++;
+    }
+}
diff --git a/bin/find-german-comments b/bin/find-german-comments
new file mode 100755
index 000000000000..1538c6d57c72
--- /dev/null
+++ b/bin/find-german-comments
@@ -0,0 +1,162 @@
+#!/usr/bin/env python
+########################################################################
+#
+#  Copyright (c) 2010 Jonas Jensen, Miklos Vajna
+#
+#  Permission is hereby granted, free of charge, to any person
+#  obtaining a copy of this software and associated documentation
+#  files (the "Software"), to deal in the Software without
+#  restriction, including without limitation the rights to use,
+#  copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the
+#  Software is furnished to do so, subject to the following
+#  conditions:
+#
+#  The above copyright notice and this permission notice shall be
+#  included in all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+#  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+#  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+#  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+#  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+#  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+#  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+#  OTHER DEALINGS IN THE SOFTWARE.
+#
+########################################################################
+
+
+import sys, re, subprocess, os, optparse, string
+
+class Parser:
+    """
+    This parser extracts comments from source files, tries to guess
+    their language and then prints out the german ones.
+    """
+    def __init__(self):
+        self.strip = string.punctuation + " \n"
+        op = optparse.OptionParser()
+        op.set_usage("%prog [options] <rootdir>\n\n" +
+            "Searches for german comments in cxx/hxx source files inside a given root\n" +
+            "directory recursively.")
+        op.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False,
+            help="Turn on verbose mode (print progress to stderr)")
+        self.options, args = op.parse_args()
+        try:
+            dir = args[0]
+        except IndexError:
+            dir = "."
+        self.check_source_files(dir)
+
+    def get_comments(self, filename):
+        """
+        Extracts the source code comments.
+        """
+        linenum = 0
+        if self.options.verbose:
+            sys.stderr.write("processing file '%s'...\n" % filename)
+        sock = open(filename)
+        # add an empty line to trigger the output of collected oneliner
+        # comment group
+        lines = sock.readlines() + ["\n"]
+        sock.close()
+
+        in_comment = False
+        buf = []
+        count = 1
+        for i in lines:
+            if "//" in i and not in_comment:
+                # if we find a new //-style comment, then we
+                # just append it to a previous one if: there is
+                # only whitespace before the // mark that is
+                # necessary to make comments longer, giving
+                # more reliable output
+                if not len(re.sub("(.*)//.*", r"\1", i).strip(self.strip)):
+                    s = re.sub(".*// ?", "", i).strip(self.strip)
+                    if len(s):
+                        buf.append(s)
+                else:
+                    # otherwise it's an independent //-style comment in the next line
+                    yield (count, "\n    ".join(buf))
+                    buf = [re.sub(".*// ?", "", i.strip(self.strip))]
+            elif "//" not in i and not in_comment and len(buf) > 0:
+                # first normal line after a // block
+                yield (count, "\n    ".join(buf))
+                buf = []
+            elif "/*" in i and "*/" not in i and not in_comment:
+                # start of a real multiline comment
+                in_comment = True
+                linenum = count
+                s = re.sub(".*/\*+", "", i.strip(self.strip))
+                if len(s):
+                    buf.append(s.strip(self.strip))
+            elif in_comment and not "*/" in i:
+                # in multiline comment
+                s = re.sub("^( |\|)*\*?", "", i)
+                if len(s.strip(self.strip)):
+                    buf.append(s.strip(self.strip))
+            elif "*/" in i and in_comment:
+                # end of multiline comment
+                in_comment = False
+                s = re.sub(r"\*+/.*", "", i.strip(self.strip))
+                if len(s):
+                    buf.append(s)
+                yield (count, "\n    ".join(buf))
+                buf = []
+            elif "/*" in i and "*/" in i:
+                # c-style oneliner comment
+                yield (count, re.sub(".*/\*(.*)\*/.*", r"\1", i).strip(self.strip))
+            count += 1
+
+    def get_lang(self, s):
+        """ the output is 'german' or 'english' or 'german or english'. when
+        unsure, just don't warn, there are strings where you just can't
+        teremine the results reliably, like '#110680#' """
+        cwd = os.getcwd()
+        # change to our directory
+        os.chdir(os.path.split(os.path.abspath(sys.argv[0]))[0])
+        sock = subprocess.Popen(["text_cat/text_cat", "-d", "text_cat/LM"], stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+        sock.stdin.write(s)
+        sock.stdin.close()
+        lang = sock.stdout.read().strip()
+        sock.stdout.close()
+        os.chdir(cwd)
+        return lang
+
+    def is_german(self, s):
+        """
+        determines if a string is german or not
+        """
+        # for short strings we can't do reliable recognition, so skip
+        # short strings and less than 4 words
+        s = s.replace('\n', ' ')
+        if len(s) < 32 or len(s.split()) < 4:
+            return False
+        return "german" == self.get_lang(s)
+
+    def check_file(self, path):
+        """
+        checks each comment in a file
+        """
+        for linenum, s in self.get_comments(path):
+            if self.is_german(s):
+                print "%s:%s: %s" % (path, linenum, s)
+
+    def check_source_files(self, dir):
+        """
+        checks each _tracked_ file in a directory recursively
+        """
+        sock = os.popen(r"git ls-files '%s' |egrep '\.(c|h)xx$'" % dir)
+        lines = sock.readlines()
+        sock.close()
+        for path in lines:
+            self.check_file(path.strip())
+
+try:
+    Parser()
+except KeyboardInterrupt:
+    print "Interrupted!"
+    sys.exit(0)
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/bin/find-undocumented-classes b/bin/find-undocumented-classes
new file mode 100755
index 000000000000..8bab72bc977c
--- /dev/null
+++ b/bin/find-undocumented-classes
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# finds undocumented classes in the current directory (recursive)
+
+type -p doxygen >/dev/null || exit
+
+filter=
+quiet=n
+if [ "$1" = "-q" ]; then
+    filter=">/dev/null"
+    quiet=y
+    shift
+fi
+
+doxygen=$(mktemp -d)
+eval doxygen -g $doxygen/doxygen.cfg $filter
+sed -i "/HTML_OUTPUT/s|html|$doxygen/html|" $doxygen/doxygen.cfg
+sed -i '/GENERATE_LATEX/s/= YES/= NO/' $doxygen/doxygen.cfg
+sed -i '/RECURSIVE/s/= NO/= YES/' $doxygen/doxygen.cfg
+# do we have any arguments?
+if [ -n "$*" ]; then
+    sed -i "/^INPUT[^_]/s|=.*|= $*|" $doxygen/doxygen.cfg
+fi
+eval doxygen $doxygen/doxygen.cfg $filter 2> $doxygen/errors.txt
+if [ "$quiet" == "n" ]; then
+    echo
+    echo "The following classes are undocumented:"
+    echo
+fi
+cat $doxygen/errors.txt|grep -i 'Warning: Compound.*is not documented'
+rm -rf $doxygen
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/bin/git-new-workdir b/bin/git-new-workdir
new file mode 100755
index 000000000000..3ad2c0cea563
--- /dev/null
+++ b/bin/git-new-workdir
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+usage () {
+	echo "usage:" $@
+	exit 127
+}
+
+die () {
+	echo $@
+	exit 128
+}
+
+if test $# -lt 2 || test $# -gt 3
+then
+	usage "$0 <repository> <new_workdir> [<branch>]"
+fi
+
+orig_git=$1
+new_workdir=$2
+branch=$3
+
+# want to make sure that what is pointed to has a .git directory ...
+git_dir=$(cd "$orig_git" 2>/dev/null &&
+  git rev-parse --git-dir 2>/dev/null) ||
+  die "Not a git repository: \"$orig_git\""
+
+case "$git_dir" in
+.git)
+	git_dir="$orig_git/.git"
+	;;
+.)
+	git_dir=$orig_git
+	;;
+esac
+
+# don't link to a configured bare repository
+isbare=$(git --git-dir="$git_dir" config --bool --get core.bare)
+if test ztrue = z$isbare
+then
+	die "\"$git_dir\" has core.bare set to true," \
+		" remove from \"$git_dir/config\" to use $0"
+fi
+
+# don't link to a workdir
+if test -L "$git_dir/config"
+then
+	die "\"$orig_git\" is a working directory only, please specify" \
+		"a complete repository."
+fi
+
+# don't recreate a workdir over an existing repository
+if test -e "$new_workdir"
+then
+	die "destination directory '$new_workdir' already exists."
+fi
+
+# make sure the links use full paths
+git_dir=$(cd "$git_dir"; pwd)
+
+# create the workdir
+mkdir -p "$new_workdir/.git" || die "unable to create \"$new_workdir\"!"
+
+# create the links to the original repo.  explicitly exclude index, HEAD and
+# logs/HEAD from the list since they are purely related to the current working
+# directory, and should not be shared.
+for x in config refs logs/refs objects info hooks packed-refs remotes rr-cache svn
+do
+	case $x in
+	*/*)
+		mkdir -p "$(dirname "$new_workdir/.git/$x")"
+		;;
+	esac
+	ln -s "$git_dir/$x" "$new_workdir/.git/$x"
+done
+
+# now setup the workdir
+cd "$new_workdir"
+# copy the HEAD from the original repository as a default branch
+cp "$git_dir/HEAD" .git/HEAD
+# checkout the branch (either the same as HEAD from the original repository, or
+# the one that was asked for)
+git checkout -f $branch
diff --git a/bin/git-ps1 b/bin/git-ps1
new file mode 100755
index 000000000000..8a0980091163
--- /dev/null
+++ b/bin/git-ps1
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+r=
+b=
+g="$(git rev-parse --git-dir 2>/dev/null)"
+
+if [ -n "$g" ]; then
+    if [ -d "$g/../.dotest" ]
+        then
+        if test -f "$g/../.dotest/rebasing"
+            then
+            r="|REBASE"
+        elif test -f "$g/../.dotest/applying"
+            then
+            r="|AM"
+        else
+            r="|AM/REBASE"
+        fi
+        b="$(git symbolic-ref HEAD 2>/dev/null)"
+    elif [ -f "$g/.dotest-merge/interactive" ]
+        then
+        r="|REBASE-i"
+        b="$(cat "$g/.dotest-merge/head-name")"
+    elif [ -d "$g/.dotest-merge" ]
+        then
+        r="|REBASE-m"
+        b="$(cat "$g/.dotest-merge/head-name")"
+    elif [ -f "$g/MERGE_HEAD" ]
+        then
+        r="|MERGING"
+        b="$(git symbolic-ref HEAD 2>/dev/null)"
+    else
+        if [ -f "$g/BISECT_LOG" ]
+            then
+            r="|BISECTING"
+        fi
+        if ! b="$(git symbolic-ref HEAD 2>/dev/null)"
+            then
+            if ! b="$(git describe --exact-match HEAD 2>/dev/null)"
+                then
+                b="$(cut -c1-7 "$g/HEAD")..."
+            fi
+        fi
+    fi
+
+    if [ -n "$1" ]; then
+        printf "$1" "${b##refs/heads/}$r"
+    else
+        printf "%s" "${b##refs/heads/}$r"
+    fi
+else
+    printf "not-in-git"
+fi
diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
new file mode 100755
index 000000000000..24bcb891bc22
--- /dev/null
+++ b/bin/lo-commit-stat
@@ -0,0 +1,403 @@
+#!/usr/bin/perl
+    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
+        if $running_under_some_shell;
+#!/usr/bin/perl
+
+use strict;
+
+my $main_repo="bootstrap";
+my @pieces=("artwork", "base", "calc", "components",
+            "extensions", "extras", "filters", "help", "impress",
+            "libs-core", "libs-extern", "libs-extern-sys", "libs-gui",
+            "translations", "postprocess", "sdk", "testing", "ure", "writer");
+
+sub search_bugs($$$$)
+{
+    my ($pdata, $piece, $commit_id, $line) = @_;
+
+    my $bug = "";
+    my $bug_orig;
+    while (defined $bug) {
+
+        # match fdo#123, rhz#123, i#123
+        if ( $line =~ m/(\w*\#+\d+)/ ) {
+            $bug_orig = $1;
+            $bug = $1;
+        # match #i123#
+        } elsif ( $line =~ m/(\#i)(\d+)(\#)/ ) {
+            $bug_orig = $1 . $2 . $3;
+            $bug = "i#$2";
+        } else {
+            $bug = undef;
+            next;
+        }
+
+#        print "   found $bug\n";
+        # remove bug number from the comment; it will be added later a standardized way
+        $bug_orig =~ s/\#/\\#/;
+        $line =~ s/[Rr]esolves:\s*$bug_orig\s*//;
+        $line =~ s/\s*-\s*$bug_orig\s*//;
+        $line =~ s/\(?$bug_orig\)?[:,]?\s*//;
+
+        # bnc# is preferred over n# for novell bugs
+        $bug =~ s/^n\#/bnc#/;
+        # save the bug number
+        %{$pdata->{$piece}{$commit_id}{'bugs'}} = () if (! defined %{$pdata->{$piece}{$commit_id}{'bugs'}});
+        $pdata->{$piece}{$commit_id}{'bugs'}{$bug} = 1;
+        $pdata->{$piece}{$commit_id}{'flags'}{'bug'} = 1;
+    }
+
+    return $line;
+}
+
+sub standardize_summary($)
+{
+    my $line = shift;
+
+    $line =~ s/^\s*//;
+    $line =~ s/\s*$//;
+
+    # lower first letter
+    $line =~ m/(^.)/;
+    my $first_char = lc($1);
+    $line =~ s/^./$first_char/;
+
+    # FIXME: remove do at the end of line
+    #        remove bug numbers
+    return $line;
+}
+
+sub load_git_log($$$$$) 
+{
+    my ($pdata, $repo_dir, $piece, $branch_name, $git_command) = @_;
+
+    my $cmd = "cd $repo_dir; $git_command";
+    my $commit_id;
+    my $summary;
+
+    print STDERR "Analyzing log from the git repo: $piece...\n";
+
+    my $repo_branch_name = get_branch_name($repo_dir);
+    if ( $branch_name ne $repo_branch_name ) {
+        die "Error: mismatch of branches:\n" .
+            "       main repo is on the branch: $branch_name\n" .
+            "       $piece repo is on the branch: $repo_branch_name\n";
+    }
+
+    open (GIT, "$cmd 2>&1|") || die "Can't run $cmd: $!";
+    %{$pdata->{$piece}} = ();
+
+    while (my $line = <GIT>) {
+        chomp $line;
+
+        if ( $line =~ m/^commit ([0-9a-z]{20})/ ) {
+            $commit_id = "$1";
+            $summary=undef;
+            %{$pdata->{$piece}{"$commit_id"}} = ();
+            %{$pdata->{$piece}{"$commit_id"}{'flags'}} = ();
+            next;
+        }
+
+        if ( $line =~ /^Author:\s*([^\<]*)\<([^\>]*)>/ ) {
+            # get rid of extra empty spaces;
+            my $name = "$1";
+            $name =~ s/\s+$//;
+            die "Error: Author already defined for the commit {$commit_id}\n" if defined ($pdata->{$piece}{$commit_id}{'author'});
+            %{$pdata->{$piece}{$commit_id}{'author'}} = ();
+            $pdata->{$piece}{$commit_id}{'author'}{'name'} = "$name";
+            $pdata->{$piece}{$commit_id}{'author'}{'email'} = "$2";
+            next;
+        }
+
+        if ( $line =~ /^Date:\s+/ ) {
+            # ignore date line
+            next;
+        }
+
+        if ( $line =~ /^\s*$/ ) {
+            # ignore empty line
+            next;
+        }
+
+        $line = search_bugs($pdata, $piece, $commit_id, $line);
+        # FIXME: need to be implemented
+#        search_keywords($pdata, $line);
+
+        unless (defined $pdata->{$piece}{$commit_id}{'summary'}) {
+            $summary = standardize_summary($line);
+            $pdata->{$piece}{$commit_id}{'summary'} = $summary;
+        }
+    }
+
+    close GIT;
+}
+
+sub get_repo_name($)
+{
+    my $repo_dir = shift;
+    
+    open (GIT_CONFIG, "$repo_dir/.git/config") ||
+        die "can't open \"$$repo_dir/.git/config\" for reading: $!\n";
+
+    while (my $line = <GIT_CONFIG>) {
+        chomp $line;
+
+        if ( $line =~ /^\s*url\s*=\s*(\S+)$/ ) {
+            my $repo_name = "$1";
+            $repo_name = s/.*\///g;
+            return "$repo_name";
+        }
+    }
+    die "Error: can't find repo name in \"$$repo_dir/.git/config\"\n";
+}
+
+sub load_data($$$$$)
+{
+    my ($pdata, $top_dir, $piece, $branch_name, $git_command) = @_;
+
+    if (defined $piece) {
+        my $piece_dir;
+        if ("$piece" eq "$main_repo") {
+            $piece_dir = "$top_dir";
+        } else {
+            $piece_dir = "$top_dir/clone/$piece";
+        }
+        load_git_log($pdata, $piece_dir, $piece, $branch_name, $git_command);
+    } else {
+        load_git_log($pdata, $top_dir, $main_repo, $branch_name, $git_command);
+        foreach my $piece (@pieces) {
+            load_git_log($pdata, "$top_dir/clone/$piece", $piece, $branch_name, $git_command);
+        }
+    }
+}
+
+sub get_branch_name($)
+{
+    my ($top_dir) = @_;
+
+    my $branch;
+    my $cmd = "cd $top_dir && git branch";
+
+    open (GIT, "$cmd 2>&1|") || die "Can't run $cmd: $!";
+
+    while (my $line = <GIT>) {
+        chomp $line;
+
+        if ( $line =~ m/^\*\s*(\S+)/ ) {
+            $branch = "$1";
+        }
+    }
+
+    close GIT;
+    
+    die "Error: did not detect git branch name in $top_dir\n" unless defined ($branch);
+
+    return $branch;
+}
+
+sub open_log_file($$$$$)
+{
+    my ($log_dir, $log_prefix, $log_suffix, $top_dir, $branch_name) = @_;
+
+    my $logfilename = "$log_prefix-$branch_name-$log_suffix.log";
+    $logfilename = "$log_dir/$logfilename" if (defined $log_dir);
+
+    if (-f $logfilename) {
+        print "WARNING: The log file already exists: $logfilename\n";
+        print "Do you want to overwrite it? (Y/n)?\n";
+        my $answer = <STDIN>;
+        chomp $answer;
+        $answer = "y" unless ($answer);
+        die "Please, rename the file or choose another log suffix\n" if ( lc($answer) ne "y" );
+    }
+    
+    my $log;
+    open($log, '>', $logfilename) || die "Can't open \"$logfilename\" for writing: $!\n";
+    
+    return $log;
+}
+
+sub print_summary_in_stat($$$$$$$$$)
+{
+    my ($summary, $pprint_filters, $print_mode, $ppiece_title, $pflags, $pbugs, $pauthors, $prefix, $log) = @_;
+
+    return if ( $summary eq "" );
+
+    # do we want to print this summary at all?
+    my $print;
+    if (%{$pprint_filters}) {
+        foreach my $flag (keys %{$pprint_filters}) {
+            $print = 1 if (defined $pflags->{$flag});
+        }
+    } else {
+        $print = 1;
+    }
+    return unless (defined $print);
+
+    # print piece title if not done yet
+    if ( defined ${$ppiece_title} && $print_mode ne "bugnumbers" ) {
+        printf $log "${$ppiece_title}\n";
+        ${$ppiece_title} = undef;
+    }
+
+    # finally print the summary line
+    my $bugs = "";
+    if ( %{$pbugs} ) {
+        if ( $print_mode eq "bugnumbers" ) {
+            $bugs = join ("\n", keys %{$pbugs}) . "\n";
+        } else {
+            $bugs = " (" . join (", ", keys %{$pbugs}) . ")";
+        }
+    }
+
+    my $authors = "";
+    if ( %{$pauthors} ) {
+        $authors = " [" . join (", ", keys %{$pauthors}) . "]";
+    }
+
+    if ( $print_mode eq "bugnumbers" ) {
+        printf $log $bugs;
+    } else {
+        printf $log $prefix . $summary . $bugs . $authors . "\n";
+    }
+}
+
+sub print_stat($$$$)
+{
+    my ($pdata, $pprint_filters, $print_mode, $log) = @_;
+
+    foreach my $piece ( sort { $a cmp $b } keys %{$pdata}) {
+        # check if this piece has any entries at all
+        my $piece_title = "+ $piece";
+        if ( %{$pdata->{$piece}} ) {
+            my $old_summary="";
+            my %authors = ();
+            my %bugs = ();
+            my %flags = ();
+            foreach my $id ( sort { $pdata->{$piece}{$a}{'summary'} cmp $pdata->{$piece}{$b}{'summary'} } keys %{$pdata->{$piece}}) {
+                my $summary = $pdata->{$piece}{$id}{'summary'};
+                if ($summary ne $old_summary) {
+                    print_summary_in_stat($old_summary, $pprint_filters, $print_mode, \$piece_title, \%flags, \%bugs, \%authors, "    + ", $log);
+                    $old_summary = $summary;
+                    %authors = ();
+                    %bugs = ();
+                    %flags = ();
+                }
+                # collect bug numbers
+                if (defined $pdata->{$piece}{$id}{'bugs'}) {
+                    foreach my $bug (keys %{$pdata->{$piece}{$id}{'bugs'}}) {
+                        $bugs{$bug} = 1;
+                    }
+                }
+                # collect author names
+                my $author = $pdata->{$piece}{$id}{'author'}{'name'};
+                $authors{$author} = 1;
+                # collect flags
+                foreach my $flag ( keys %{$pdata->{$piece}{$id}{'flags'}} ) {
+                    $flags{$flag} = 1;
+                }
+            }
+            print_summary_in_stat($old_summary, $pprint_filters, $print_mode, \$piece_title, \%flags, \%bugs, \%authors, "    + ", $log);
+        }
+    }
+}
+
+########################################################################
+# help
+
+sub usage()
+{
+    print "This script generates LO git commit summary\n\n" .
+          
+          "Usage: lo-commit-stat [--help] [--no-pieces] [--piece=<piece>] --log-dir=<dir> --log-suffix=<string> topdir [git_arg...]\n\n" .
+
+          "Options:\n" .
+          "     --help          print this help\n" .
+          "     --no-pieces     read changes just from the main repository, ignore other cloned repos\n" .
+          "     --piece=<piece> summarize just changes from the given piece\n" .
+          "     --log-dir=<dir> directory where to put the generated log\n" .
+          "     --log-suffix=<string> suffix of the log file name; the result will be\n" .
+          "                     commit-log-<branch>-<log-name-suffix>.log; the branch name\n" .
+          "                     is detected automatically\n" .
+          "     --bugs          print just bug fixes\n" .
+          "     --bug-numbers   print just fixed bug numbers\n" .
+          "     --rev-list      use \"git rev-list\" instead of \"git log\"; useful to check\n" .
+          "                     differences between branches\n" .
+          "      topdir         directory with the libreoffice/bootstrap clone; the piece repos\n" .
+          "                     must be cloned in the main-repo-root/clone/<piece> subdirectories\n" .
+          "      git_arg        extra parameters passed to the git command to define\n" .
+          "                     the area of interest; The default command is \"git log\" and\n" .
+          "                     parameters might be, for example, --after=\"2010-09-27\" or\n" .
+          "                     TAG..HEAD; with the option --rev-list, useful might be, for\n" .
+          "                     example origin/master ^origin/libreoffice-3-3\n";
+}
+
+
+#######################################################################
+#######################################################################
+# MAIN
+#######################################################################
+#######################################################################
+
+
+my $piece;
+my $top_dir;
+my $log_prefix = "commit-log";
+my $log_dir;
+my $log_suffix;
+my $log;
+my $branch_name;
+my $git_command = "git log";
+my $branch_name;
+my @git_args;
+my %data;
+my %print_filters = ();
+my $print_mode = "normal";
+
+foreach my $arg (@ARGV) {
+    if ($arg eq '--help') {
+        usage();
+        exit;
+    } elsif ($arg eq '--no-pieces') {
+        $piece = "bootstrap";
+    } elsif ($arg =~ m/--piece=(.*)/) {
+	$piece = $1;
+    } elsif ($arg =~ m/--log-suffix=(.*)/) {
+	$log_suffix = "$1";
+    } elsif ($arg =~ m/--log-dir=(.*)/) {
+	$log_dir = "$1";
+    } elsif ($arg eq '--bugs') {
+        $print_filters{'bug'} = 1;
+        $log_prefix = "bugfixes"
+    } elsif ($arg eq '--bug-numbers') {
+        $print_filters{'bug'} = 1;
+        $log_prefix = "bugnumbers";
+        $print_mode = "bugnumbers";
+    } elsif ($arg eq '--rev-list') {
+        $git_command = "git rev-list --pretty=medium"
+    } else {
+        if (! defined $top_dir) {
+            $top_dir=$arg;
+        } else {
+            push @git_args, $arg;
+        }
+    }
+}
+
+$git_command .= " " . join ' ', @git_args if (@git_args);
+
+(defined $top_dir) || die "Error: top directory is not defined\n";
+(-d "$top_dir") || die "Error: not a directory: $top_dir\n";
+(-f "$top_dir/.git/config") || die "Error: can't find $top_dir/.git/config\n";
+
+(!defined $log_dir) || (-d $log_dir) || die "Error: directory does no exist: $log_dir\n";
+
+(defined $log_suffix) || die "Error: define log suffix using --log-suffix=<string>\n";
+
+$branch_name = get_branch_name($top_dir);
+
+load_data(\%data, $top_dir, $piece, $branch_name, $git_command);
+
+$log = open_log_file($log_dir, $log_prefix, $log_suffix, $top_dir, $branch_name);
+print_stat(\%data, \%print_filters, $print_mode, $log);
+close $log;
diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
new file mode 100755
index 000000000000..75181fae4ca2
--- /dev/null
+++ b/bin/lo-pack-sources
@@ -0,0 +1,655 @@
+#!/usr/bin/perl
+    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
+        if $running_under_some_shell;
+#!/usr/bin/perl
+
+use strict;
+use File::Copy;
+use File::Temp qw/ tempfile tempdir /;
+
+# get libreoffice-build version from the given libreoffice-build sources
+sub get_config_version($)
+{
+    my ($lo_build_dir) = @_;
+    my $version;
+
+    open (CONFIGURE, "$lo_build_dir/configure.in") ||
+        die "can't open \"$lo_build_dir/configure.in\" for reading: $!\n";
+
+    while (my $line = <CONFIGURE>) {
+        chomp $line;
+
+        if ($line =~ /AC_INIT\s*\(\s*libreoffice-build\s*,\s*([\w\.]*)\)/) {
+            $version="$1";
+        }
+    }
+    close (CONFIGURE);
+    return $version;
+}
+
+# set libreoffice-build version in the given libreoffice-build sources
+sub set_config_version($$)
+{
+    my ($lo_build_dir, $version) = @_;
+    my $configure = "$lo_build_dir/configure.in";
+
+    open (CONFIGURE, "$configure") ||
+        die "can't open \"$configure\" for reading: $!\n";
+
+    my ( $tmp_fh, $tmp_filename ) = tempfile( "$configure.XXXXXX" );
+    if ( !defined $tmp_fh ) {
+        close (CONFIGURE);
+        die "Error: can't create temporary file: \"$configure.XXXXXX\"\n";
+    }
+
+    while (my $line = <CONFIGURE>) {
+        chomp $line;
+
+        if ($line =~ /^(\s*AC_INIT\s*\(\s*libreoffice-build\s*,\s*)([\w\.]*)(\s*\)\s*)$/) {
+            print ${tmp_fh} "$1$version$3\n";
+        } else {
+            print ${tmp_fh} "$line\n";
+        }
+    }
+    close (CONFIGURE);
+    close (${tmp_fh});
+
+    # preserve permissions on target file by applying them to temp file
+    my ( $mode, $uid, $gid ) = ( stat($configure) )[ 2, 4, 5 ];
+    $mode = $mode & 07777;
+
+    chmod $mode, $tmp_filename;
+    chown $uid, $gid, $tmp_filename;
+
+    rename ($tmp_filename, $configure) ||
+        die "Can't rename \"$tmp_filename\" to \"$configure\": $!\n";
+}
+
+# increment the version for a test build:
+#        + add 'a' if the version ended with a number
+#       + bump the letter otherwise
+sub inc_test_version($)
+{
+    my ($version) = @_;
+
+    my $lastchar = chop $version;
+    my $new_version;
+
+    if ($lastchar =~ /\d/) {
+        return "$version" . "$lastchar" . "a";
+    } elsif ($lastchar =~ /\w/) {
+        # select next letter alhabeticaly: a->b, b->c, ...
+        $lastchar =~ tr/0a-zA-Z/a-zA-Z0/;
+        return "$version" . "$lastchar";
+    } else {
+        die "Can't generate test version from \"$version$lastchar\n";
+    }
+}
+
+sub get_release_version($$$$)
+{
+    my ($config_version, $state_config_version, $state_release_version, $inc_version) = @_;
+    my $release_version;
+
+    if (defined $state_config_version &&
+        defined $state_release_version &&
+        "$state_config_version" eq "$config_version") {
+        $release_version = "$state_release_version";
+    } else {
+        $release_version = "$config_version";
+    }
+
+    if ( defined $inc_version ) {
+        $release_version = inc_test_version($release_version);
+    }
+
+    return $release_version;
+}
+
+
+sub generate_lo_build_blacklist($)
+{
+    my ($blacklist) = @_;
+
+    # FIXME: crazy hacks to copy libreoffice-build without too big and useless subdirectories and to show a progress
+    open (BLACKLIST, ">$blacklist") || die "Can't open $blacklist: $!\n";
+
+    # IMPORTANT: Do not remove .git directories because "git log" is called during "make dist"
+    print BLACKLIST "*/.svn\n";
+    print BLACKLIST "rawbuild/*\n";
+    print BLACKLIST "build/*\n";
+    print BLACKLIST "clone/*\n";
+    print BLACKLIST "src/libreoffice-*.tar.bz2\n";
+    print BLACKLIST "src/????????????????????????????????-*\n";
+
+    close BLACKLIST;
+}
+
+sub generate_lo_piece_blacklist($)
+{
+    my ($blacklist) = @_;
+
+    # FIXME: crazy hacks to copy libreoffice-build without too big and useless subdirectories and to show a progress
+    open (BLACKLIST, ">$blacklist") || die "Can't open $blacklist: $!\n";
+
+    # IMPORTANT: Do not remove .git directories because "git log" is called during "make dist"
+    print BLACKLIST ".git\n";
+    print BLACKLIST ".gitignore\n";
+    print BLACKLIST ".gitattributes\n";
+    print BLACKLIST "autom4te.cache/*\n";
+    print BLACKLIST "autom4te.cache\n";
+    print BLACKLIST "autogen.lastrun\n";
+    print BLACKLIST "clone/*\n";
+    print BLACKLIST "config.log\n";
+    print BLACKLIST "config.parms\n";
+    print BLACKLIST "git-hooks\n";
+    print BLACKLIST "Linux*Env.Set.sh\n";
+    print BLACKLIST "src/tmp*\n";
+    print BLACKLIST "src/fetch.log\n";
+    print BLACKLIST "src/libreoffice-*.tar.bz2\n";
+    print BLACKLIST "src/????????????????????????????????-*\n";
+    print BLACKLIST "warn\n";
+
+    close BLACKLIST;
+}
+
+# remove symlinks to clone subdir
+sub remove_module_symlinks($$)
+{
+    my ($tempdir, $piece_tarball_name) = @_;
+
+    print STDERR "find $tempdir/$piece_tarball_name -mindepth 1 -maxdepth 1 -type l -exec rm {} \\;\n";
+    system ("find $tempdir/$piece_tarball_name -mindepth 1 -maxdepth 1 -type l -exec rm {} \\;") &&
+        die "Error: can't delete symlinks to clone dir in $tempdir: $!\n";
+}
+
+
+# copy files to temp dir; showing a progress; using a black list
+sub copy_dir_filter_and_show_progress($$$)
+{
+    my ($source_dir, $target_dir, $blacklist) = @_;
+
+    print "Copying \"$source_dir\" -> \"$target_dir\"...";
+    # FIXME: crazy hacks to copy dir with a blacklist and showing a progress
+    system ("tar -cf - -C $source_dir -X $blacklist \.\/ | " .
+            "tar -xf - -C $target_dir --checkpoint 2>&1 | " .
+            "awk '{ ORS=\"\" ; if (++nlines\%50 == 0) printf \".\"; fflush() }'") &&
+        die "Error: copying failed: $!\n";
+    print "\n";
+}
+
+# copy the local version of libreoffice-build into a tmp directory
+# omit the .svn subdirectories
+sub copy_lo_build_to_tempdir($)
+{
+    my ($lo_build_dir) = @_;
+
+    my $tempdir = tempdir( 'libreoffice-XXXXXX', DIR => File::Spec->tmpdir );
+    my $blacklist = "$tempdir/libreoffice-build.copy.blacklist";
+
+    generate_lo_build_blacklist($blacklist);
+    copy_dir_filter_and_show_progress($lo_build_dir, $tempdir, $blacklist);
+
+    unlink $blacklist;
+
+    return $tempdir;
+}
+
+# copy the piece lo source directory into a tmp directory
+# omit the .git subdirectories
+sub copy_lo_piece_to_tempdir($$$)
+{
+    my ($piece_dir, $piece, $piece_tarball_name) = @_;
+
+
+    my $tempdir = tempdir( 'libreoffice-XXXXXX', DIR => File::Spec->tmpdir );
+    my $blacklist = "$tempdir/libreoffice-$piece.copy.blacklist";
+
+    mkdir "$tempdir/$piece_tarball_name" || die "Can't create directory \"$tempdir/$piece_tarball_name\": $!\n";
+
+    generate_lo_piece_blacklist($blacklist);
+    copy_dir_filter_and_show_progress("$piece_dir", "$tempdir/$piece_tarball_name", $blacklist);
+    remove_module_symlinks($tempdir, $piece_tarball_name);
+
+    unlink $blacklist;
+
+    return $tempdir;
+}
+
+sub generate_lo_piece_changelog($$$)
+{
+    my ($lo_piece_clone, $lo_piece_release_dir, $piece) = @_;
+    print "Generating changelog for $piece...\n";
+    print "1:$lo_piece_clone, 2:$lo_piece_release_dir, 3:$piece\n";
+    # FIXME: crazy hacks to copy dir with a blacklist and showing a progress
+    system ("cd $lo_piece_clone && " .
+            "git log --date=short --pretty='format:@%cd  %an  <%ae>  [%H]%n%n%s%n%n%e%b' | " .
+            "  sed -e 's|^\([^@]\)|\t\1|' -e 's|^@||' >$lo_piece_release_dir/ChangeLog" ) &&
+        die "Error: generating failed: $!\n";
+}
+
+sub run_autoreconf($$)
+{
+    my ($dir, $piece) = @_;
+
+    print "Running autoreconf for $piece...\n";
+    system ("cd $dir && " .
+            "autoreconf -f -i && " .
+            "rm -rf autom4te.cache && " .
+            "cd - >/dev/null 2>&1") && die "Error: autoreconf failed: $!\n";
+}
+
+sub generate_version_file($$$)
+{
+    my ($dir, $piece, $release_version) = @_;
+
+    # FIXME: crazy hacks to copy libreoffice-build without too big and useless subdirectories and to show a progress
+    open (VERFILE, ">$dir/$piece.ver") || die "Can't open $dir/lo-$piece.ver: $!\n";
+
+    print VERFILE "lo_bootstrap_ver=$release_version\n";
+
+    close VERFILE;
+}
+
+sub release_lo_build($)
+{
+    my ($lo_build_dir) = @_;
+
+    print "Creating libreoffice-build tarball...\n";
+    system ("cd $lo_build_dir && " .
+            "./autogen.sh --with-distro=GoOoLinux && " .
+            "make dist && " .
+            "cd - >/dev/null 2>&1") && die "Error: releasing failed: $!\n";
+}
+
+sub release_lo_piece($$)
+{
+    my ($lo_piece_dir, $piece_tarball_name) = @_;
+
+    print "Creating $piece_tarball_name.tar.bz2...";
+    system ("cd $lo_piece_dir && " .
+            "tar -cjf $piece_tarball_name.tar.bz2 --checkpoint * 2>&1 | awk '{ ORS=\"\" ; if (++nlines\%50 == 0) printf \".\"; fflush() }' && " .
+            "cd - >/dev/null 2>&1") && die "Error: releasing failed: $!\n";
+    print "\n";
+}
+
+sub generate_md5($$$)
+{
+    my ($dir, $tarball_name, $tarball_suffix) = @_;
+
+    print "Generating MD5...\n";
+    system ("cd $dir && " .
+            "md5sum $tarball_name$tarball_suffix >$tarball_name$tarball_suffix.md5 && " .
+            "cd - >/dev/null 2>&1") && die "Error: releasing failed: $!\n";
+}
+
+sub default_releases_state_file($)
+{
+    my ($lo_build_dir) = @_;
+
+    my $rootdir = $lo_build_dir;
+    $rootdir =~ s/^(.*?)\/?[^\/]+\/?$/$1/;
+
+    my $releases_state_file;
+    if ($rootdir) {
+        $releases_state_file = "$rootdir/.releases";
+    } else {
+        $releases_state_file = ".releases";
+    }
+
+    return "$releases_state_file";
+}
+
+sub default_releases_archive($)
+{
+    my ($lo_build_dir) = @_;
+
+    my $rootdir = $lo_build_dir;
+    $rootdir =~ s/^(.*?)\/?[^\/]+\/?$/$1/;
+
+    my $releases_archive_dir;
+    if ($rootdir) {
+        $releases_archive_dir = "$rootdir/archive";
+    } else {
+        $releases_archive_dir = "archive";
+    }
+
+    return "$releases_archive_dir";
+}
+
+sub load_releases_state($)
+{
+    my ($releases_state_file) = @_;
+
+    my $state_config_version;
+    my $state_release_version;
+
+    if (open (STATE, "$releases_state_file")) {
+
+        while (my $line = <STATE>) {
+            chomp $line;
+
+            if ($line =~ /^\s*configure_version\s*=\s*(.*)$/) {
+                $state_config_version = "$1";
+            } elsif ($line =~ /^\s*released_version\s*=\s*(.*)$/) {
+                $state_release_version = "$1";
+            }
+        }
+            close (STATE);
+    }
+
+    return $state_config_version, $state_release_version;
+}
+
+sub save_releases_state($$$)
+{
+    my ($releases_state_file, $config_version, $release_version) = @_;
+
+    open (STATE, '>', "$releases_state_file") ||
+        die "Can't open \"$releases_state_file\" for writing: $!\n";
+
+    print STATE "configure_version = $config_version\n";
+    print STATE "released_version  = $release_version\n";
+
+    close (STATE);
+}
+
+sub remove_tempdir($)
+{
+    my ($tempdir) = @_;
+
+#    print "Cleaning $tempdir...\n";
+    system ("rm -rf $tempdir") && die "Error: rm failed: $!\n";
+}
+
+sub save_file($$$)
+{
+    my ($source_dir, $target_dir, $file) = @_;
+
+    unless ( -d "$target_dir" ) {
+        mkdir ("$target_dir") ||
+            die "Can't create directory \"$target_dir\": $!\n";
+    }
+
+    if ( -f "$target_dir/$file" ) {
+        print "Warning: $target_dir/$file already exists and will be replaced\n";
+        unlink ("$target_dir/$file");
+    }
+
+    print "Copying into archive: $target_dir/$file ...\n";
+    copy ("$source_dir/$file", "$target_dir/$file") ||
+        die "Error: Can't copy $source_dir/$file to $target_dir/$file: $!\n";
+}
+
+sub check_if_file_exists($$)
+{
+    my ($file, $force) = @_;
+
+    if (-e $file) {
+        if (defined $force) {
+            print "Warning: $file already exists and will be replaced!\n";
+        } else {
+            die "Error: $file alrady exists.\n".
+                "       Use --force if you want to replace it.\n";
+        }
+    }
+}
+
+sub check_if_tarball_already_released($$$)
+{
+    my ($tarball, $releases_archive_dir, $force) = @_;
+
+    check_if_file_exists($tarball, $force);
+    check_if_file_exists("$releases_archive_dir/$tarball", $force) if (defined $releases_archive_dir);
+}
+
+sub check_if_already_released($$$$$$)
+{
+    my ($lo_build_tarball_name, $p_piece_tarball_name, $releases_archive_dir, $force, $pack_lo_build, $pack_lo_pieces) = @_;
+
+    check_if_tarball_already_released("$lo_build_tarball_name.tar.gz", $releases_archive_dir, $force) if ($pack_lo_build);
+
+    if ($pack_lo_pieces) {
+        foreach my $tarball_name ( values %{$p_piece_tarball_name} ) {
+            check_if_tarball_already_released("$tarball_name.tar.bz2", $releases_archive_dir, $force);
+        }
+    }
+}
+
+sub prepare_lo_build_tarball($$$$)
+{
+    my ($lo_build_dir, $release_version, $md5, $lo_build_tarball_name) = @_;
+
+    my $temp_dir = copy_lo_build_to_tempdir("$lo_build_dir");
+    set_config_version($temp_dir, $release_version);
+    release_lo_build($temp_dir);
+    generate_md5($temp_dir, $lo_build_tarball_name, ".tar.gz") if (defined $md5);
+
+    return $temp_dir;
+}
+
+sub prepare_lo_piece_tarball($$$$$)
+{
+    my ($piece_dir, $release_version, $md5, $piece, $piece_tarball_name) = @_;
+
+    my $temp_dir = copy_lo_piece_to_tempdir($piece_dir, $piece, $piece_tarball_name);
+    generate_lo_piece_changelog($piece_dir, "$temp_dir/$piece_tarball_name", $piece);
+    run_autoreconf("$temp_dir/$piece_tarball_name", $piece) if ($piece eq 'bootstrap');
+    generate_version_file("$temp_dir/$piece_tarball_name", $piece, $release_version) if ($piece eq 'bootstrap');
+    release_lo_piece($temp_dir, $piece_tarball_name);
+    generate_md5($temp_dir, $piece_tarball_name, ".tar.bz2") if (defined $md5);
+
+    return $temp_dir;
+}
+
+sub move_tarball_to_final_location($$$$)
+{
+    my ($temp_dir, $releases_archive_dir, $md5, $tarball) = @_;
+
+    save_file($temp_dir, ".", "$tarball");
+    save_file($temp_dir, ".", "$tarball.md5") if (defined $md5);
+    if ( defined $releases_archive_dir ) {
+        save_file($temp_dir, $releases_archive_dir, "$tarball");
+        save_file($temp_dir, $releases_archive_dir, "$tarball.md5") if (defined $md5);
+    }
+
+    remove_tempdir($temp_dir);
+}
+
+
+sub generate_tarballs($$$$$$$$$)
+{
+    my ($source_dir, $releases_archive_dir, $release_version, $md5, $lo_build_tarball_name, $p_piece_tarball_name, $pack_lo_build, $pack_lo_pieces, $is_lo_build_dir) = @_;
+
+    if ($pack_lo_build) {
+#        my $temp_dir=prepare_lo_build_tarball($source_dir, $release_version, $md5, $lo_build_tarball_name);
+#        move_tarball_to_final_location($temp_dir, $releases_archive_dir, $md5, "$lo_build_tarball_name.tar.gz");
+        my $temp_dir=prepare_lo_piece_tarball($source_dir, $release_version, $md5, "bootstrap", $lo_build_tarball_name);
+        move_tarball_to_final_location($temp_dir, $releases_archive_dir, $md5, "$lo_build_tarball_name.tar.bz2");
+    }
+
+    if ($pack_lo_pieces) {
+        my $piece_dir = $source_dir;
+        foreach my $piece ( keys %{$p_piece_tarball_name} ) {
+            print "\n--- Generating $piece ---\n";
+            $piece_dir = "$source_dir/clone/$piece" if ($is_lo_build_dir);
+            my $temp_dir=prepare_lo_piece_tarball($piece_dir, $release_version, $md5, $piece, $p_piece_tarball_name->{$piece});
+            move_tarball_to_final_location($temp_dir, $releases_archive_dir, $md5, "$p_piece_tarball_name->{$piece}.tar.bz2");
+        }
+    }
+
+}
+
+
+sub usage()
+{
+    print "This tool helps to pack the libreoffice-build and piece sources\n\n" .
+
+          "Usage:\n".
+          "\tlo-pack-sources [--help] [--force] [--version]\n" .
+          "\t [--set-version=<ver>] [--inc-version] [--md5]\n" .
+          "\t [--no-lo-build] [--no-lo-pieces] [--piece=<piece>]\n" .
+          "\t [dir]\n\n" .
+
+          "Options:\n\n" .
+          "\t--help: print this help\n" .
+          "\t--force: replace an already existing release of the same version\n" .
+          "\t--version: just print version of the released package but do not\n" .
+          "\t\trelease it; the version is affected by the other options, e.g.\n" .
+          "\t\t--inc-version\n" .
+          "\t--set-version: force another version\n" .
+          "\t--inc-version: increment the latest version; there is a difference\n" .
+          "\t\tbetween test release (default) and final (not yet supported)\n" .
+          "\t--md5: generate md5 sum for the final tarball\n" .
+          "\t--no-lo-build: do not pack the libreoffice-build tarball\n" .
+          "\t--no-lo-pieces: do not pack the libreoffice-build piece sources\n" .
+          "\t--piece=<piece>: pack just a single piece, .e.g. \"writer\",\n" .
+          "\tdir: path of the source directory, either libreoffice-build or piece\n";
+}
+
+
+my $ptf;
+my $md5;
+my $inc_version;
+my $config_version;
+my $set_version;
+my $get_config_version;
+my $release_version;
+my $pack_lo_build=1;
+my $pack_lo_pieces=1;
+my $source_dir;
+my $releases_archive_dir;
+my $releases_state_file;
+my $state_config_version;
+my $state_release_version;
+my $lo_build_tarball_name;
+my $lo_build_tempdir;
+my $force;
+my $verbose=1;
+my $is_lo_build_dir=0;
+my @pieces=("artwork", "base", "calc", "components",
+            "extensions", "extras", "filters", "help", "impress",
+            "libs-core", "libs-extern", "libs-extern-sys", "libs-gui",
+            "postprocess", "sdk", "testing", "translations", "ure", "writer");
+my %piece_tarball_name;
+
+###################
+# Arguments parsing
+###################
+
+for my $arg (@ARGV) {
+    if ($arg eq '--help' || $arg eq '-h') {
+        usage;
+        exit 0;
+    } elsif ($arg eq '--force') {
+        $force=1;
+    } elsif ($arg eq '--md5') {
+        $md5=1;
+    } elsif ($arg eq '--version') {
+        $get_config_version=1;
+        $verbose = undef;
+    } elsif ($arg eq '--inc-version') {
+        $inc_version=1
+    } elsif ($arg =~ m/--set-version=(.*)/) {
+          $set_version="$1";
+    } elsif ($arg eq '--no-lo-build') {
+        $pack_lo_build=0;
+    } elsif ($arg eq '--no-lo-pieces') {
+        $pack_lo_pieces=0;
+    } elsif ($arg =~ m/--piece=(.*)/) {
+          # process just one piece and do not pack libreoffice-build
+          @pieces=();
+          push @pieces, "$1";
+          $pack_lo_build=0;
+    } elsif ($arg =~ /^-/ ) {
+        die "Error: unknown option: $arg\n";
+    } else {
+        if (! defined $source_dir) {
+            $source_dir = $arg;
+        } else {
+            die "Error: Too many arguments $arg\n";
+        }
+    }
+}
+
+###################
+# Initial checks
+###################
+
+unless ( defined $source_dir ) {
+    die "Error: undefined source directory, try --help\n";
+}
+
+unless ( -d "$source_dir" ) {
+    die "Error: is not a directory: $source_dir\n";
+}
+
+# check if it is a valid libreoffice-bootstrap directory
+$is_lo_build_dir=1 if (-f "$source_dir/autogen.sh" && -f "$source_dir/set_soenv.in");
+
+# all tarballs are generated from the libreoffice-bootstrap directory
+if (@pieces > 1 && $is_lo_build_dir == 0 ) {
+    die "Error: \"$source_dir\" is not a valid libreoffice-bootstrap directory\n";
+}
+
+# just a single piece tarball can be generated from piece directory; version must be explicitely set in this case
+if (@pieces == 1  &&  $is_lo_build_dir == 0  &&  ! defined $set_version ) {
+    die "Error: version must be set using the --set-version=<version> option\n" unless (defined $set_version);
+}
+
+if (defined $set_version && defined $inc_version) {
+    die "Error: --set-version and --inc-version options can't be used together\n";
+}
+
+
+###################
+# Main logic
+###################
+
+
+print "Source: $source_dir\n" if ($verbose);
+
+if ($is_lo_build_dir) {
+    # detect some paths
+    $releases_state_file = default_releases_state_file($source_dir) unless (defined $releases_state_file);
+    $releases_archive_dir = default_releases_archive($source_dir) unless (defined $releases_archive_dir);
+
+    # detect versions
+    $config_version = get_config_version($source_dir);
+    ($state_config_version, $state_release_version) = load_releases_state($releases_state_file);
+    if (defined $set_version) {
+        $release_version = "$set_version";
+    } else {
+        $release_version = get_release_version($config_version, $state_config_version, $state_release_version, $inc_version);
+    }
+} else {
+    # must be single piece release with predefined version
+    $release_version = "$set_version";
+}
+
+# define tarball names
+$lo_build_tarball_name = "libreoffice-bootstrap-$release_version";
+foreach my $piece (@pieces) {
+    $piece_tarball_name{$piece} = "libreoffice-$piece-$release_version";
+}
+
+print "Default version   : $config_version\n" if ($verbose && defined $config_version);
+print "Last used version : $state_release_version\n" if ($verbose && defined $state_release_version);
+print "New version       : $release_version\n" if ($verbose);
+
+# do the real job
+if ( defined $get_config_version ) {
+    print "$release_version\n";
+} else {
+    check_if_already_released($lo_build_tarball_name, \%piece_tarball_name, $releases_archive_dir, $force, $pack_lo_build, $pack_lo_pieces);
+
+    # give a chance to stop the process
+    print ("\nWaiting 3 seconds...\n");
+    sleep 3;
+
+    generate_tarballs($source_dir, $releases_archive_dir, $release_version, $md5, $lo_build_tarball_name, \%piece_tarball_name, $pack_lo_build, $pack_lo_pieces, $is_lo_build_dir);
+
+    if ( defined $releases_state_file ) {
+        save_releases_state($releases_state_file, $config_version, $release_version);
+    }
+}
diff --git a/bin/mkworkdir b/bin/mkworkdir
new file mode 100755
index 000000000000..9691ee1bd16e
--- /dev/null
+++ b/bin/mkworkdir
@@ -0,0 +1,103 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname $0)
+GIT_NEW_WORKDIR=`which git-new-workdir 2>/dev/null`
+if [ -z $GIT_NEW_WORKDIR ] ; then
+   GIT_NEW_WORKDIR="$BASEDIR/git-new-workdir"
+fi
+
+print_help() {
+    echo "Usage: $1 [-s | --source bootstrap_reference_repo_path] [ -d | --workdir-base-path path] [ --as alias_name] [branch name]"
+    echo "--source is optional if you are currently in a bootstrap git repository, in which case that repository is used as source"
+    echo "--workdir-base-path is optional if you have defined LO_BASE_WORKDIR in your environement"
+    echo "--as is the name of the directory that will be the bootstrap of your new workdir ensemble. the default is the branch name used to create the workdir"
+    echo "the branch name is optional, the default is 'master'"
+}
+
+die() {
+    echo $1
+    exit 1
+}
+
+BOOTSTRAP_DIR=
+DEST_DIR=${LO_BASE_WORKDIR:-}
+BRANCH="master"
+
+while [ "${1:-}" != "" ] ; do
+      case $1 in
+	  -s | --source )
+	      shift
+	      BOOTSTRAP_DIR="$1"
+	      ;;
+	  -d | --workdir-base-path )
+	      shift
+	      DEST_DIR="$1"
+	      ;;
+	  --as )
+	      shift
+	      WKDIR_NAME="$1"
+	      ;;
+	  -h | --help )
+	      print_help $0
+	      exit 0
+	      ;;
+	  -* )
+	      die "invalid option $1"
+	      ;;
+	  *)
+	      if [ -z "$BRANCH" ] ; then
+		  BRANCH="$1"
+	      else
+		  die "Too many arguments"
+	      fi
+	      ;;
+      esac
+      shift
+done
+
+
+if [ -z "$BOOTSTRAP_DIR" ]; then
+    BOOTSTRAP_DIR=$(git rev-parse --show-toplevel 2>/dev/null) || die "Cannot use the current working directory as implicit source: Not a git repository"
+    if [ -n "$BOOTSTRAP_DIR" ] ; then
+	if [ "$(basename $(git config remote.origin.url))" != "bootstrap" ] ; then
+	    die "Cannot use the current working directory as implicit source: Not a bootstrap git repository"
+	fi
+    fi
+fi
+if [ -z "$DEST_DIR" ]; then
+    echo "destination directory is missing."
+    print_help $0
+    exit 1
+fi
+
+if [ -z "$WKDIR_NAME" ]; then
+    WKDIR_NAME="$BRANCH"
+fi
+
+if [ -e "$DEST_DIR/$WKDIR_NAME" ]; then
+    die "$DEST_DIR/$WKDIR_NAME already exists."
+fi
+
+echo "===== bootstrap ====="
+$GIT_NEW_WORKDIR $BOOTSTRAP_DIR "$DEST_DIR/$WKDIR_NAME" $BRANCH
+
+echo "creating directory $DEST_DIR/$WKDIR_NAME/clone"
+mkdir -p "$DEST_DIR/$WKDIR_NAME/clone" || die "failed to create $DEST_DIR/$WKDIR_NAME/clone"
+
+REPOS=$(cat ${BASEDIR}/repo-list)
+
+cd "$DEST_DIR/$WKDIR_NAME"
+
+for repo in $REPOS; do
+    repo_path="${BOOTSTRAP_DIR}/clone/$repo"
+    echo "===== $repo ====="
+    $GIT_NEW_WORKDIR $repo_path "$DEST_DIR/$WKDIR_NAME/clone/$repo" $BRANCH
+    for link in $(ls ./clone/$repo) ; do
+        if [ ! -e "$link" ] ; then
+            echo "Creating link $link"
+            ln -s "./clone/$repo/$link" "$link"
+        fi
+    done
+
+done
+
diff --git a/bin/repo-list.in b/bin/repo-list.in
new file mode 100644
index 000000000000..15bad770b6a3
--- /dev/null
+++ b/bin/repo-list.in
@@ -0,0 +1 @@
+@GIT_REPO_NAMES@
\ No newline at end of file
diff --git a/bin/text_cat/COPYING b/bin/text_cat/COPYING
new file mode 100644
index 000000000000..5ab7695ab8ca
--- /dev/null
+++ b/bin/text_cat/COPYING
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/bin/text_cat/Copyright b/bin/text_cat/Copyright
new file mode 100644
index 000000000000..c1e75d3afb42
--- /dev/null
+++ b/bin/text_cat/Copyright
@@ -0,0 +1,21 @@
+Copyright (c) 1994, 1995, 1996, 1997 by Gertjan van Noord.
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the 
+    Free Software Foundation, Inc., 
+    51 Franklin Street, Fifth Floor, Boston, 
+    MA  02110-1301  USA
+
+cf. the file COPYING
+
+
diff --git a/bin/text_cat/LM/english.lm b/bin/text_cat/LM/english.lm
new file mode 100644
index 000000000000..ab71632c6214
--- /dev/null
+++ b/bin/text_cat/LM/english.lm
@@ -0,0 +1,400 @@
+_	 20326
+e	 6617
+t	 4843
+o	 3834
+n	 3653
+i	 3602
+a	 3433
+s	 2945
+r	 2921
+h	 2507
+e_	 2000
+d	 1816
+_t	 1785
+c	 1639
+l	 1635
+th	 1535
+he	 1351
+_th	 1333
+u	 1309
+f	 1253
+m	 1175
+p	 1151
+_a	 1145
+the	 1142
+_the	 1060
+s_	 978
+er	 968
+_o	 967
+he_	 928
+d_	 888
+t_	 885
+the_	 844
+_the_	 843
+on	 842
+in	 817
+y	 783
+n_	 773
+b	 761
+re	 754
+,	 734
+,_	 732
+an	 732
+g	 728
+w	 718
+_i	 707
+en	 676
+f_	 599
+y_	 595
+of	 594
+_of	 592
+es	 589
+ti	 587
+v	 580
+_of_	 575
+of_	 575
+nd	 568
+at	 549
+r_	 540
+_w	 534
+it	 522
+ed	 496
+_p	 494
+nt	 485
+_c	 462
+o_	 457
+io	 450
+_an	 439
+te	 432
+or	 425
+_b	 418
+nd_	 407
+to	 406
+st	 402
+is	 401
+_s	 396
+_in	 389
+ion	 385
+and	 385
+de	 384
+ve	 382
+ha	 375
+ar	 366
+_m	 361
+and_	 360
+_and	 360
+_and_	 358
+se	 353
+_to	 347
+me	 346
+to_	 344
+ed_	 339
+.	 330
+be	 329
+_f	 329
+._	 329
+_to_	 320
+co	 317
+ic	 316
+ns	 308
+al	 307
+le	 304
+ou	 304
+ce	 293
+ent	 279
+l_	 278
+_co	 277
+tio	 275
+on_	 274
+_d	 274
+tion	 268
+ri	 266
+_e	 264
+ng	 253
+hi	 251
+er_	 249
+ea	 246
+as	 245
+_be	 242
+pe	 242
+h_	 234
+_r	 232
+ec	 227
+ch	 223
+ro	 222
+ct	 220
+_h	 219
+pr	 217
+in_	 217
+ne	 214
+ll	 214
+rt	 213
+s,_	 210
+s,	 210
+li	 209
+ra	 208
+T	 207
+wh	 204
+a_	 203
+ac	 201
+_wh	 199
+_n	 196
+ts	 196
+di	 196
+es_	 195
+si	 194
+re_	 193
+at_	 192
+nc	 192
+ie	 190
+_a_	 188
+_in_	 185
+ing	 184
+us	 182
+_re	 182
+g_	 179
+ng_	 178
+op	 178
+con	 177
+tha	 175
+_l	 174
+_tha	 174
+ver	 173
+ma	 173
+ion_	 171
+_con	 171
+ci	 170
+ons	 170
+_it	 170
+po	 169
+ere	 168
+is_	 167
+ta	 167
+la	 166
+_pr	 165
+fo	 164
+ho	 164
+ir	 162
+ss	 161
+men	 160
+be_	 160
+un	 159
+ty	 159
+_be_	 158
+ing_	 157
+om	 156
+ot	 156
+hat	 155
+ly	 155
+_g	 155
+em	 153
+_T	 151
+rs	 150
+mo	 148
+ch_	 148
+wi	 147
+we	 147
+ad	 147
+ts_	 145
+res	 143
+_wi	 143
+I	 143
+hat_	 142
+ei	 141
+ly_	 141
+ni	 140
+os	 140
+ca	 139
+ur	 139
+A	 138
+ut	 138
+that	 138
+_that	 137
+ati	 137
+_fo	 137
+st_	 137
+il	 136
+or_	 136
+for	 136
+pa	 136
+ul	 135
+ate	 135
+ter	 134
+it_	 134
+nt_	 133
+that_	 132
+_ha	 129
+al_	 128
+el	 128
+as_	 127
+ll_	 127
+_ma	 125
+no	 124
+ment	 124
+an_	 124
+tion_	 122
+su	 122
+bl	 122
+_de	 122
+nce	 120
+pl	 120
+fe	 119
+tr	 118
+so	 118
+int	 115
+ov	 114
+e,	 114
+e,_	 114
+_u	 113
+ent_	 113
+Th	 113
+her	 113
+j	 112
+atio	 112
+ation	 112
+_Th	 111
+le_	 110
+ai	 110
+_it_	 110
+_on	 110
+_for	 109
+ect	 109
+k	 109
+hic	 108
+est	 108
+der	 107
+tu	 107
+na	 106
+_by_	 106
+by_	 106
+E	 106
+by	 106
+_by	 106
+ve_	 106
+_di	 106
+en_	 104
+vi	 104
+m_	 103
+_whi	 102
+iv	 102
+whi	 102
+ns_	 102
+_A	 101
+ich	 100
+ge	 100
+pro	 99
+ess	 99
+_whic	 99
+ers	 99
+hich	 99
+ce_	 99
+which	 99
+whic	 99
+all	 98
+ove	 98
+_is	 98
+ich_	 97
+ee	 97
+hich_	 97
+n,_	 96
+n,	 96
+im	 95
+ir_	 94
+hei	 94
+ions	 94
+sti	 94
+se_	 94
+per	 93
+The	 93
+_pa	 93
+heir	 93
+id	 93
+eir	 93
+eir_	 93
+ig	 93
+heir_	 93
+_no	 93
+ev	 93
+era	 92
+_int	 92
+ted	 91
+_The	 91
+ies	 91
+art	 91
+thei	 90
+_ar	 90
+_thei	 90
+their	 90
+_pro	 90
+et	 89
+_pe	 88
+_mo	 88
+ther	 88
+x	 87
+gh	 87
+S	 87
+_is_	 87
+ol	 87
+ty_	 87
+_I	 86
+nde	 86
+am	 86
+rn	 86
+nte	 86
+mp	 85
+_su	 84
+_we	 84
+par	 84
+_v	 84
+pu	 82
+his	 82
+ow	 82
+mi	 82
+go	 81
+N	 81
+ue	 81
+ple	 81
+ep	 80
+ab	 80
+;_	 80
+;	 80
+ex	 80
+ain	 80
+over	 80
+_un	 79
+q	 79
+qu	 79
+pp	 79
+ith	 79
+ry	 79
+_as	 79
+ber	 79
+ub	 78
+av	 78
+uc	 78
+s._	 77
+s.	 77
+enc	 77
+are	 77
+iti	 77
+gr	 76
+his_	 76
+ua	 76
+part	 76
+ff	 75
+eve	 75
+O	 75
+rea	 74
+ous	 74
+ia	 74
+The_	 73
+ag	 73
+mb	 73
+_go	 73
+fa	 72
+on,_	 72
+ern	 72
+t,_	 72
+on,	 72
+t,	 72
+_me	 71
diff --git a/bin/text_cat/LM/german.lm b/bin/text_cat/LM/german.lm
new file mode 100644
index 000000000000..6f14f51ef148
--- /dev/null
+++ b/bin/text_cat/LM/german.lm
@@ -0,0 +1,400 @@
+_	 31586
+e	 15008
+n	 9058
+i	 7299
+r	 6830
+t	 5662
+s	 5348
+a	 4618
+h	 4176
+d	 4011
+er	 3415
+en	 3412
+u	 3341
+l	 3266
+n_	 2848
+c	 2636
+ch	 2460
+g	 2407
+o	 2376
+e_	 2208
+r_	 2128
+m	 2077
+_d	 1948
+de	 1831
+en_	 1786
+ei	 1718
+er_	 1570
+in	 1568
+te	 1505
+ie	 1505
+b	 1458
+t_	 1425
+f	 1306
+k	 1176
+ge	 1144
+s_	 1137
+un	 1113
+,	 1104
+,_	 1099
+w	 1099
+z	 1060
+nd	 1039
+he	 1004
+st	 989
+_s	 952
+_de	 949
+.	 909
+_e	 906
+ne	 906
+der	 880
+._	 847
+be	 841
+es	 829
+ic	 796
+_a	 791
+ie_	 779
+is	 769
+ich	 763
+an	 755
+re	 749
+di	 732
+ein	 730
+se	 730
+"	 720
+ng	 709
+_i	 706
+sc	 683
+sch	 681
+it	 673
+der_	 652
+h_	 651
+ch_	 642
+S	 630
+le	 609
+p	 609
+�	 607
+�	 603
+au	 603
+v	 602
+che	 599
+_w	 596
+d_	 585
+die	 576
+_di	 572
+m_	 562
+_die	 559
+el	 548
+_S	 540
+_der	 529
+li	 527
+_der_	 523
+si	 515
+al	 514
+ns	 507
+on	 501
+or	 495
+ti	 490
+ten	 487
+ht	 486
+die_	 485
+_die_	 483
+D	 479
+rt	 478
+nd_	 476
+_u	 470
+nt	 468
+A	 466
+in_	 464
+den	 461
+cht	 447
+und	 443
+me	 440
+_z	 429
+ung	 426
+ll	 423
+_un	 421
+_ei	 419
+_n	 415
+hr	 412
+ine	 412
+_A	 408
+_ein	 405
+ar	 404
+ra	 403
+_v	 400
+_g	 400
+as	 395
+zu	 392
+et	 389
+em	 385
+_D	 380
+eine	 376
+gen	 376
+g_	 376
+da	 368
+we	 366
+K	 365
+lt	 360
+B	 354
+_"	 353
+nde	 349
+ni	 347
+und_	 345
+E	 345
+ur	 345
+_m	 342
+ri	 341
+ha	 340
+eh	 339
+ten_	 338
+es_	 336
+_K	 336
+_und	 335
+ig	 335
+_b	 335
+hen	 334
+_und_	 332
+_au	 329
+_B	 327
+_da	 325
+_zu	 324
+_in	 322
+at	 321
+us	 318
+wi	 307
+n,	 305
+n,_	 304
+nn	 304
+te_	 301
+eit	 301
+_h	 300
+ter	 299
+M	 298
+n.	 295
+�	 294
+ng_	 289
+sche	 289
+-	 283
+rs	 282
+den_	 282
+_si	 280
+G	 280
+im	 278
+_ge	 277
+chen	 276
+rd	 273
+_E	 273
+n._	 270
+icht	 270
+rn	 268
+uf	 267
+isch	 264
+isc	 264
+nen	 263
+_in_	 262
+_M	 260
+_er	 257
+ich_	 255
+ac	 253
+lic	 252
+_G	 252
+ber	 252
+la	 251
+vo	 251
+eb	 250
+ke	 249
+F	 248
+as_	 248
+hen_	 248
+ach	 245
+en,	 244
+ung_	 243
+lich	 243
+ste	 243
+en,_	 243
+_k	 241
+ben	 241
+_f	 241
+en.	 241
+_be	 239
+it_	 239
+L	 238
+_se	 237
+mi	 236
+ve	 236
+na	 236
+on_	 236
+P	 235
+ss	 234
+ist	 234
+�	 234
+ht_	 233
+ru	 233
+st_	 229
+_F	 229
+ts	 227
+ab	 226
+W	 226
+ol	 225
+_eine	 225
+hi	 225
+so	 224
+em_	 223
+"_	 223
+ren	 222
+en._	 221
+chen_	 221
+R	 221
+ta	 221
+ere	 220
+ische	 219
+ers	 218
+ert	 217
+_P	 217
+tr	 217
+ed	 215
+ze	 215
+eg	 215
+ens	 215
+�r	 213
+ah	 212
+_vo	 212
+ne_	 211
+cht_	 210
+uc	 209
+_wi	 209
+nge	 208
+lle	 208
+fe	 207
+_L	 207
+ver	 206
+hl	 205
+V	 204
+ma	 203
+wa	 203
+auf	 201
+H	 198
+_W	 195
+T	 195
+nte	 193
+uch	 193
+l_	 192
+sei	 192
+nen_	 190
+u_	 189
+_den	 189
+_al	 189
+_V	 188
+t.	 188
+lte	 187
+ut	 186
+ent	 184
+sich	 183
+sic	 183
+il	 183
+ier	 182
+am	 181
+gen_	 180
+sen	 179
+f�	 178
+um	 178
+t._	 177
+f_	 174
+he_	 174
+ner	 174
+nst	 174
+ls	 174
+_sei	 173
+ro	 173
+ir	 173
+ebe	 173
+mm	 173
+ag	 172
+ern	 169
+t,_	 169
+t,	 169
+eu	 169
+ft	 168
+icht_	 167
+hre	 167
+Be	 166
+nz	 165
+nder	 165
+_T	 164
+_den_	 164
+iche	 163
+tt	 163
+zu_	 162
+and	 162
+J	 161
+rde	 160
+rei	 160
+_we	 159
+_H	 159
+ige	 159
+_Be	 158
+rte	 157
+hei	 156
+das	 155
+aus	 155
+che_	 154
+_das	 154
+_zu_	 154
+tz	 154
+_ni	 153
+das_	 153
+_R	 153
+N	 153
+des	 153
+_ve	 153
+_J	 152
+I	 152
+_das_	 152
+men	 151
+_so	 151
+_ver	 151
+_auf	 150
+ine_	 150
+_ha	 150
+rg	 149
+ind	 148
+eben	 148
+kt	 147
+mit	 147
+_an	 147
+her	 146
+Ge	 146
+Sc	 145
+_sich	 145
+U	 145
+Sch	 145
+_sic	 145
+end	 145
+Di	 144
+abe	 143
+ck	 143
+sse	 142
+�r_	 142
+ell	 142
+ik	 141
+o_	 141
+nic	 141
+nich	 141
+sa	 141
+_f�	 140
+hn	 140
+zi	 140
+no	 140
+nicht	 140
+im_	 139
+von_	 139
+von	 139
+_nic	 139
+_nich	 139
+eine_	 139
+oc	 138
+wei	 138
+io	 138
+schen	 138
+gt	 138
diff --git a/bin/text_cat/text_cat b/bin/text_cat/text_cat
new file mode 100755
index 000000000000..6c6b0d1d1483
--- /dev/null
+++ b/bin/text_cat/text_cat
@@ -0,0 +1,229 @@
+#!/usr/bin/perl -w
+# � Gertjan van Noord, 1997.
+# mailto:vannoord@let.rug.nl
+
+use strict;
+use vars qw($opt_d $opt_f $opt_h $opt_i $opt_l $opt_n $opt_s $opt_t $opt_v $opt_u $opt_a);
+use Getopt::Std;
+use Benchmark;
+
+my $non_word_characters='0-9\s';
+
+# OPTIONS
+getopts('a:d:f:hi:lnst:u:v');
+
+# defaults: set $opt_X unless already defined (Perl Cookbook p. 6):
+$opt_a ||= 10;
+$opt_d ||= '/users1/vannoord/Perl/TextCat/LM';
+$opt_f ||= 0;
+$opt_t ||= 400;
+$opt_u ||= 1.05;
+
+sub help {
+    print <<HELP
+Text Categorization. Typically used to determine the language of a
+given document. 
+
+Usage
+-----
+
+* print help message:
+
+$0 -h
+
+* for guessing: 
+
+$0 [-a Int] [-d Dir] [-f Int] [-i N] [-l] [-t Int] [-u Int] [-v]
+
+    -a    the program returns the best-scoring language together
+          with all languages which are $opt_u times worse (cf option -u). 
+          If the number of languages to be printed is larger than the value 
+          of this option (default: $opt_a) then no language is returned, but
+          instead a message that the input is of an unknown language is
+          printed. Default: $opt_a.
+    -d    indicates in which directory the language models are 
+          located (files ending in .lm). Currently only a single 
+          directory is supported. Default: $opt_d.
+    -f    Before sorting is performed the Ngrams which occur this number 
+          of times or less are removed. This can be used to speed up
+          the program for longer inputs. For short inputs you should use
+          -f 0.
+          Default: $opt_f.
+    -i N  only read first N lines
+    -l    indicates that input is given as an argument on the command line,
+          e.g. text_cat -l "this is english text"
+          Cannot be used in combination with -n.
+    -s    Determine language of each line of input. Not very efficient yet,
+          because language models are re-loaded after each line.
+    -t    indicates the topmost number of ngrams that should be used. 
+          If used in combination with -n this determines the size of the 
+          output. If used with categorization this determines
+          the number of ngrams that are compared with each of the language
+          models (but each of those models is used completely). 
+    -u    determines how much worse result must be in order not to be 
+          mentioned as an alternative. Typical value: 1.05 or 1.1. 
+          Default: $opt_u.
+    -v    verbose. Continuation messages are written to standard error.
+
+* for creating new language model, based on text read from standard input:
+
+$0 -n [-v]
+
+    -v    verbose. Continuation messages are written to standard error.
+
+
+HELP
+}
+
+if ($opt_h) { help(); exit 0; };
+
+if ($opt_n) { 
+    my %ngram=();
+    my @result = create_lm(input(),\%ngram);
+    print join("\n",map { "$_\t $ngram{$_}" ; } @result),"\n";
+} elsif ($opt_l) {
+    classify($ARGV[0]);
+} elsif ($opt_s) {
+    while (<>) {
+	chomp;
+	classify($_);
+    }
+} else { 
+    classify(input()); 
+}
+
+# CLASSIFICATION
+sub classify {
+  my ($input)=@_;
+  my %results=();
+  my $maxp = $opt_t;
+  # open directory to find which languages are supported
+  opendir DIR, "$opt_d" or die "directory $opt_d: $!\n";
+  my @languages = sort(grep { s/\.lm// && -r "$opt_d/$_.lm" } readdir(DIR));
+  closedir DIR;
+  @languages or die "sorry, can't read any language models from $opt_d\n" .
+    "language models must reside in files with .lm ending\n";
+
+
+  # create ngrams for input. Note that hash %unknown is not used;
+  # it contains the actual counts which are only used under -n: creating
+  # new language model (and even then they are not really required).
+  my @unknown=create_lm($input);
+  # load model and count for each language.
+  my $language;
+  my $t1 = new Benchmark;
+  foreach $language (@languages) {
+    # loads the language model into hash %$language.
+    my %ngram=();
+    my $rang=1;
+    open(LM,"$opt_d/$language.lm") || die "cannot open $language.lm: $!\n";
+    while (<LM>) {
+      chomp;
+      # only use lines starting with appropriate character. Others are
+      # ignored.
+      if (/^[^$non_word_characters]+/o) {
+	$ngram{$&} = $rang++;
+      } 
+    }
+    close(LM);
+    #print STDERR "loaded language model $language\n" if $opt_v;
+    
+    # compares the language model with input ngrams list
+    my ($i,$p)=(0,0);
+    while ($i < @unknown) {
+      if ($ngram{$unknown[$i]}) {
+	$p=$p+abs($ngram{$unknown[$i]}-$i);
+      } else { 
+	$p=$p+$maxp; 
+      }
+      ++$i;
+    }
+    #print STDERR "$language: $p\n" if $opt_v;
+    
+    $results{$language} = $p;
+  }
+  print STDERR "read language models done (" . 
+    timestr(timediff(new Benchmark, $t1)) . 
+      ".\n" if $opt_v;
+  my @results = sort { $results{$a} <=> $results{$b} } keys %results;
+  
+  print join("\n",map { "$_\t $results{$_}"; } @results),"\n" if $opt_v;
+  my $a = $results{$results[0]};
+  
+  my @answers=(shift(@results));
+  while (@results && $results{$results[0]} < ($opt_u *$a)) {
+    @answers=(@answers,shift(@results));
+  }
+  if (@answers > $opt_a) {
+    print "I don't know; " .
+      "Perhaps this is a language I haven't seen before?\n";
+  } else {
+    print join(" or ", @answers), "\n";
+  }
+}
+
+# first and only argument is reference to hash.
+# this hash is filled, and a sorted list (opt_n elements)
+# is returned.
+sub input {
+    my $read="";
+    if ($opt_i) {
+	while(<>) {
+	    if ($. == $opt_i) {
+		return $read . $_;
+	    }
+	    $read = $read . $_;
+	}
+	return $read;
+    } else {
+	local $/;     # so it doesn't affect $/ elsewhere
+	undef $/;
+	$read = <>;      # swallow input.
+	$read || die "determining the language of an empty file is hard...\n";
+	return $read;
+    }
+}
+
+
+sub create_lm {
+  my $t1 = new Benchmark;
+  my $ngram;
+  ($_,$ngram) = @_;  #$ngram contains reference to the hash we build
+    # then add the ngrams found in each word in the hash
+  my $word;
+  foreach $word (split("[$non_word_characters]+")) {
+    $word = "_" . $word . "_";
+    my $len = length($word);
+    my $flen=$len;
+    my $i;
+    for ($i=0;$i<$flen;$i++) {
+      $$ngram{substr($word,$i,5)}++ if $len > 4;
+      $$ngram{substr($word,$i,4)}++ if $len > 3;
+      $$ngram{substr($word,$i,3)}++ if $len > 2;
+      $$ngram{substr($word,$i,2)}++ if $len > 1;
+      $$ngram{substr($word,$i,1)}++;
+      $len--;
+    }
+  }
+  ###print "@{[%$ngram]}";
+  my $t2 = new Benchmark;
+  print STDERR "count_ngrams done (". 
+    timestr(timediff($t2, $t1)) .").\n" if $opt_v;
+
+  # as suggested by Karel P. de Vos, k.vos@elsevier.nl, we speed up
+  # sorting by removing singletons
+  map { my $key=$_; if ($$ngram{$key} <= $opt_f) 
+             { delete $$ngram{$key}; }; } keys %$ngram;
+  #however I have very bad results for short inputs, this way
+
+  
+  # sort the ngrams, and spit out the $opt_t frequent ones.
+  # adding  `or $a cmp $b' in the sort block makes sorting five
+  # times slower..., although it would be somewhat nicer (unique result)
+  my @sorted = sort { $$ngram{$b} <=> $$ngram{$a} } keys %$ngram;
+  splice(@sorted,$opt_t) if (@sorted > $opt_t); 
+  print STDERR "sorting done (" . 
+    timestr(timediff(new Benchmark, $t2)) . 
+      ").\n" if $opt_v;
+  return @sorted;
+}
diff --git a/bin/text_cat/version b/bin/text_cat/version
new file mode 100644
index 000000000000..e6ba9d571b5b
--- /dev/null
+++ b/bin/text_cat/version
@@ -0,0 +1,2 @@
+1.10
+
diff --git a/bootstrap.1 b/bootstrap.1
index 2a475bf1ef52..db3dbb781d30 100644..100755
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -18,7 +18,7 @@ unalias gunzip
 
 # executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
 # Use spawn instead of fork when building dmake on cygwin. 
-if test "$GUI" = "WNT"; then
+if test "$GUI_FOR_BUILD" = "WNT"; then
     EXEEXT=".exe"
     DMAKE_CONF="--enable-spawn"
 else
@@ -31,18 +31,17 @@ export EXEEXT
 # Build dmake
 
 if test "$BUILD_DMAKE" != "NO"; then
-
-    if test ! -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then
-
+    if test ! -x "$SRC_ROOT/dmake/dmake$EXEEXT"; then
         cd "$SRC_ROOT/dmake" || exit
 
-        # Special case! The w32/tcsh build needs CC pointing to the MSVC++ compiler
-        # but we need a cygwin/gcc build dmake to understand the posix paths
-        if test "$GUI" = "WNT"; then
-            CC=""
-            CXX=""
-            export CC
-            export CXX
+        # If cross-compiling then don't use the cross compilers to build dmake.
+        if test "$GUI_FOR_BUILD" = "WNT"; then
+            # Let the Cygwin gcc be found
+            unset CC CXX AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
+        elif test "$CROSS_COMPILING" = "YES"; then
+            export CC="$CC_FOR_BUILD"
+            export CXX="$CXX_FOR_BUILD"
+            unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
         fi
 
         # For normal unixy systems
@@ -59,33 +58,16 @@ if test "$BUILD_DMAKE" != "NO"; then
         echo "dmake has been successfully built"
 
         cd ..
-
     else
-
-        echo ""
-        echo "dmake present in $SOLARENV/$OUTPATH/bin/dmake$EXEEXT"
-
+        echo "dmake/dmake already built"
     fi
-
 fi
 
-mkdir -p "$SOLARENV/$OUTPATH/bin"
+mkdir -p "$SOLARENV/$OUTPATH_FOR_BUILD/bin"
 if test "$BUILD_DMAKE" != "NO"; then
-    cp -f "$SRC_ROOT/dmake/dmake$EXEEXT" "$SOLARENV/$OUTPATH/bin" || exit
+    cp -f "$SRC_ROOT/dmake/dmake$EXEEXT" "$SOLARENV/$OUTPATH_FOR_BUILD/bin" || exit
     echo ""
-    echo "dmake copied to $SOLARENV/$OUTPATH/bin/dmake$EXEEXT"
-fi
-
-if test "$GUI" = "WNT" -a ! -x "$SOLARENV/$OUTPATH/bin/guw$EXEEXT"; then
-  echo ""
-  echo "Calling $GNUMAKE in guw"
-  cd "$SRC_ROOT/guw" || exit
-  $GNUMAKE || exit
-  echo ""
-  echo "guw has been successfully made"
-  cp -f "$SRC_ROOT/guw/guw$EXEEXT" "$SOLARENV/$OUTPATH/bin" || exit
-  echo ""
-  echo "guw copied to $SOLARENV/$OUTPATH/bin/guw$EXEEXT"
+    echo "dmake copied to $SOLARENV/$OUTPATH_FOR_BUILD/bin/dmake$EXEEXT"
 fi
 
 #make sure build.pl is executable 
@@ -95,7 +77,10 @@ chmod +x "$SRC_ROOT/solenv/bin/build_client.pl"
 chmod +x "$SRC_ROOT/solenv/bin/zipdep.pl"
 chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl"
 
-# fetch or update external tarballs
-if [ "$DO_FETCH_TARBALLS" = "yes" ]; then
-	$SRC_ROOT/fetch_tarballs.sh $SRC_ROOT/ooo.lst
-fi
+# Local Variables:
+# mode: shell-script
+# tab-width: 4
+# indent-tabs-mode: nil
+# End:
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/config.sub b/config.sub
index c2d125724c0e..b3e0dd40d6f5 100755
--- a/config.sub
+++ b/config.sub
@@ -1298,7 +1298,7 @@ case $os in
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
diff --git a/configure b/configure
deleted file mode 100755
index a06d9e54c1e7..000000000000
--- a/configure
+++ /dev/null
@@ -1,25070 +0,0 @@
-#! /bin/sh
-# From configure.in Revision: 1.290  .
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67.
-#
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
-
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='LTLIBOBJS
-LIBOBJS
-BUILD_TYPE
-LOCAL_SOLVER
-nodep
-VERBOSE
-ENABLE_LAYOUT
-ENABLE_STATIC_GTK
-UNIXWRAPPERNAME
-OOO_VENDOR
-ABOUT_BITMAPS
-INTRO_BITMAPS
-WITH_DICT
-WITH_POOR_HELP_LOCALIZATIONS
-WITH_LANG
-OOO_JUNIT_JAR
-ANT_LIB
-ANT_HOME
-ANT
-SYSTEM_LIBJPEG
-SYSTEM_LIBPNG
-SYSTEM_LIBGSF
-SYSTEM_PANGO
-SYSTEM_LIBCROCO
-SYSTEM_GETTEXT
-SYSTEM_GLIB
-SYSTEM_GDKPIXBUF
-SYSTEM_LIBRSVG
-XINERAMA_LINK
-USE_XINERAMA
-SCPDEFS
-WITHOUT_AFMS
-WITHOUT_PPDS
-WITH_FONTS
-ENABLE_KAB
-ENABLE_EVOAB2
-GOBJECT_LIBS
-GOBJECT_CFLAGS
-ENABLE_LOCKDOWN
-KDE4_LIBS
-KDE4_CFLAGS
-MOC4
-KDE_LIBS
-KDE_CFLAGS
-MOC
-COMMONS_LOGGING_JAR
-COMMONS_HTTPCLIENT_JAR
-COMMONS_LANG_JAR
-COMMONS_CODEC_JAR
-SYSTEM_APACHE_COMMONS
-LIBSERIALIZER_JAR
-LIBFONTS_JAR
-LIBREPOSITORY_JAR
-LIBFORMULA_JAR
-LIBLOADER_JAR
-LIBLAYOUT_JAR
-LIBBASE_JAR
-JFREEREPORT_JAR
-FLUTE_JAR
-LIBXML_JAR
-SAC_JAR
-SYSTEM_JFREEREPORT
-ENABLE_REPORTBUILDER
-SERVLETAPI_JAR
-SYSTEM_SERVLETAPI
-ENABLE_MEDIAWIKI
-SYSTEM_POPPLER
-ENABLE_PDFIMPORT
-POPPLER_LIBS
-POPPLER_CFLAGS
-ENABLE_PRESENTER_SCREEN
-ENABLE_MINIMIZER
-ENABLE_PRESENTER_EXTRA_UI
-ENABLE_OPENGL
-ENABLE_LIBRSVG
-LIBRSVG_LIBS
-LIBRSVG_CFLAGS
-ENABLE_CAIRO_CANVAS
-SYSTEM_CAIRO
-BUILD_PIXMAN
-ENABLE_CAIRO
-CAIRO_LIBS
-CAIRO_CFLAGS
-ENABLE_GSTREAMER
-GSTREAMER_LIBS
-GSTREAMER_CFLAGS
-ENABLE_SYSTRAY_GTK
-ENABLE_DBUS
-ENABLE_GIO
-GIO_LIBS
-GIO_CFLAGS
-DBUS_LIBS
-DBUS_CFLAGS
-GTHREAD_LIBS
-GTHREAD_CFLAGS
-GTK_LIBS
-GTK_CFLAGS
-ENABLE_GNOMEVFS
-GNOMEVFS_LIBS
-GNOMEVFS_CFLAGS
-ENABLE_GCONF
-GCONF_LIBS
-GCONF_CFLAGS
-ENABLE_KDE4
-ENABLE_KDE
-ENABLE_GTK
-ZIP_HOME
-UNZIP
-ZIP
-ASM_HOME
-ML_EXE
-CYGWIN_PATH
-GNUPATCH
-GNUCP
-PATCH
-FLEX
-BISON
-NSIS_PATH
-DIRECTXSDK_LIB
-DIRECTXSDK_HOME
-WINDOWS_VISTA_PSDK
-PSDK_HOME
-SYSTEM_LIBC
-HAVE_READDIR_R
-HAVE_GETOPT
-SYSTEM_LIBTEXTCAT_DATA
-SYSTEM_LIBTEXTCAT
-SYSTEM_LPSOLVE
-SYSTEM_MYTHES
-MYTHES_LIBS
-MYTHES_CFLAGS
-HYPHEN_LIB
-SYSTEM_HYPH
-SYSTEM_HUNSPELL
-HUNSPELL_LIBS
-HUNSPELL_CFLAGS
-SYSTEM_REDLAND
-REDLAND_LIBS
-REDLAND_CFLAGS
-AGG_VERSION
-SYSTEM_AGG
-AGG_LIBS
-AGG_CFLAGS
-ENABLE_AGG
-SYSTEM_OPENSSL
-OPENSSL_LIBS
-OPENSSL_CFLAGS
-NEON_VERSION
-SYSTEM_NEON
-NEON_LIBS
-NEON_CFLAGS
-DISABLE_NEON
-ENABLE_RANDR
-XRANDR_DLOPEN
-XRANDR_LIBS
-XRANDR_CFLAGS
-XRENDER_LINK
-SYSTEM_XRENDER_HEADERS
-DISABLE_XAW
-XAU_LIBS
-XLIB
-XINC
-X_EXTRA_LIBS
-X_LIBS
-X_PRE_LIBS
-X_CFLAGS
-XMKMF
-SYSTEM_GRAPHITE
-ENABLE_GRAPHITE
-GRAPHITE_LIBS
-GRAPHITE_CFLAGS
-ICU_MICRO
-ICU_MINOR
-ICU_MAJOR
-SYSTEM_ICU
-ICUCONFIG
-SYSTEM_GENCMN
-SYSTEM_GENCCODE
-SYSTEM_GENBRK
-SYSTEM_SANE_HEADER
-MOZ_LDAP_CFLAGS
-MOZ_LIB_XPCOM
-MOZ_LIB
-MOZ_INC
-MOZ_FLAVOUR
-SYSTEM_MOZILLA
-MOZILLABUILD
-ENABLE_NSS_MODULE
-BUILD_MOZAB
-MOZLIBREQ_LIBS
-MOZLIBREQ_CFLAGS
-MOZGTK2_LIBS
-MOZGTK2_CFLAGS
-MOZILLA_TOOLKIT
-MOZILLA_VERSION
-MOZILLAXPCOM_LIBS
-MOZILLAXPCOM_CFLAGS
-NSPR_LIB
-MOZ_NSPR_LIBS
-MOZ_NSPR_CFLAGS
-NSS_LIB
-MOZ_NSS_LIBS
-MOZ_NSS_CFLAGS
-WITH_OPENLDAP
-WITH_LDAP
-WITH_MOZILLA
-SYSTEM_ODBC_HEADERS
-SYSTEM_VIGRA
-SYSTEM_BOOST
-SYSTEM_MDDS
-CURL_LIBS
-CURL_CFLAGS
-SYSTEM_CURL
-CURLCONFIG
-SAXON_JAR
-SYSTEM_SAXON
-SERIALIZER_JAR
-BSH_JAR
-SYSTEM_BSH
-HSQLDB_JAR
-SYSTEM_HSQLDB
-SYSTEM_MYSQL_CPPCONN
-LIBMYSQL_PATH
-MYSQL_DEFINES
-MYSQL_LIB
-MYSQL_INC
-SYSTEM_MYSQL
-MYSQLCONFIG
-ENABLE_MYSQLC
-LUCENE_ANALYZERS_JAR
-LUCENE_CORE_JAR
-SYSTEM_LUCENE
-DB_JAR
-DB_INCLUDES
-DB_VERSION
-SYSTEM_DB
-HOME
-PYTHON_LIBS
-PYTHON_CFLAGS
-SYSTEM_PYTHON
-BZIP2
-pkgpyexecdir
-pyexecdir
-pkgpythondir
-pythondir
-PYTHON_PLATFORM
-PYTHON_EXEC_PREFIX
-PYTHON_PREFIX
-PYTHON_VERSION
-PYTHON
-SYSTEM_LIBXML
-LIBXML_LIBS
-LIBXML_CFLAGS
-SYSTEM_LIBXSLT
-XSLTPROC
-LIBXSLT_LIBS
-LIBXSLT_CFLAGS
-USE_FT_EMBOLDEN
-FREETYPE_LIBS
-FREETYPE_CFLAGS
-SYSTEM_CPPUNIT
-CPPUNIT_LIBS
-CPPUNIT_CFLAGS
-SYSTEM_LIBWPD
-LIBWPD_LIBS
-LIBWPD_CFLAGS
-PKG_CONFIG
-SYSTEM_EXPAT
-SYSTEM_JPEG
-SYSTEM_ZLIB
-SYSTEM_STDLIBS
-BUILD_UNOWINREG
-MINGWSTRIP
-MINGWCXX
-BUILD_STAX
-GPERF
-PKGFORMAT
-RPM
-BUILD_EPM
-PKGMK
-DPKG
-EPM
-BUILD_DMAKE
-DMAKE
-JAVAIFLAGS
-JAVAFLAGS
-JDK
-JAVA_HOME
-JAVAAOTCOMPILER
-AWTLIB
-JAVADOC
-JAVACISGCJ
-JAVACOMPILER
-JAVAINTERPRETER
-SOLAR_JAVA
-BUILD_VER_STRING
-ALLOC
-HAVE_GCC_VISIBILITY_FEATURE
-CCACHE
-USE_CCACHE
-USE_SYSTEM_STL
-STLPORT_VER
-STLPORT4
-EXCEPTIONS
-MINGW_GXXDLL
-MINGW_GCCDLL
-MINGW_SHARED_LIBSTDCPP
-MINGW_SHARED_GXXLIB
-MINGW_GCCLIB_EH
-MINGW_SHARED_GCCLIB
-MINGW_CLIB_DIR
-MINGW_BACKWARD_INCLUDE_PATH
-MINGW_LIB_INCLUDE_PATH
-GXX_INCLUDE_PATH
-CRYPT_LINK
-PAM_LINK
-NEW_SHADOW_API
-PAM
-VALGRIND_CFLAGS
-LFS_CFLAGS
-WORDS_BIGENDIAN
-SIZEOF_LONG
-CXXCPP
-ac_ct_CXX
-CXXFLAGS
-CXX
-CPP
-FRAME_HOME
-CSC_PATH
-MIDL_PATH
-USE_MINGW
-COMEX
-MSPDB_PATH
-PERL
-HAVE_LD_HASH_STYLE
-_cc
-GNUMAKE
-ENABLE_PCH
-HAVE_LD_BSYMBOLIC_FUNCTIONS
-GCCVER
-COMPATH
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-GCC_HOME
-SHELLPATH
-WITH_MINGWIN
-THES_SYSTEM_DIR
-HYPH_SYSTEM_DIR
-DICT_SYSTEM_DIR
-SYSTEM_DICTS
-WITH_MYSPELL_DICTS
-ENABLE_RPATH
-DISABLE_ATL
-DISABLE_ACTIVEX
-ENABLE_DIRECTX
-WITH_BINFILTER
-DO_FETCH_TARBALLS
-TARFILE_LOCATION
-ENABLE_FONTCONFIG
-ENABLE_CUPS
-DISABLE_STRIP
-ENABLE_SYMBOLS
-PROEXT
-PROFULLSWITCH
-PRODUCT
-ENABLE_DEBUG
-ENABLE_WERROR
-VC_STANDARD
-ENABLE_CRASHDUMP
-PTHREAD_LIBS
-PTHREAD_CFLAGS
-OSVERSION
-GNUTAR
-target_os
-target_vendor
-target_cpu
-target
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-SOURCEVERSION
-UPD
-_solenv
-LOCAL_SOLENV
-SED
-AWK
-EGREP
-GREP
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-with_gnu_patch
-with_agg
-with_gnu_cp
-enable_graphite
-with_system_graphite
-enable_ldap
-enable_fetch_external
-with_external_tar
-with_openldap
-enable_lockdown
-enable_vba
-with_vba_package_format
-enable_pch
-enable_mozilla
-with_fonts
-with_ppds
-with_afms
-enable_epm
-with_epm
-with_package_format
-enable_odk
-enable_mathmldtd
-enable_evolution2
-with_system_stdlibs
-enable_cups
-enable_fontconfig
-enable_directx
-enable_activex
-enable_atl
-enable_symbols
-enable_strip_solver
-enable_werror
-enable_debug
-enable_dbgutil
-enable_crashdump
-enable_cl_standard
-enable_gtk
-enable_gstreamer
-enable_systray
-enable_cairo
-with_system_cairo
-enable_cairo_canvas
-enable_librsvg
-enable_opengl
-enable_dbus
-enable_gconf
-enable_gnome_vfs
-enable_gio
-enable_static_gtk
-enable_layout
-enable_build_mozilla
-with_mozilla_version
-with_mozilla_toolkit
-enable_nss_module
-enable_kde
-enable_kdeab
-enable_kde4
-enable_binfilter
-enable_rpath
-enable_pam
-enable_pam_link
-enable_crypt_link
-enable_xrender_link
-enable_randr
-enable_randr_link
-with_myspell_dicts
-with_system_dicts
-with_external_dict_dir
-with_external_hyph_dir
-with_external_thes_dir
-with_system_libs
-with_system_headers
-with_system_jars
-with_system_zlib
-with_system_openssl
-with_system_jpeg
-with_system_expat
-with_system_libwpd
-with_system_libxml
-with_system_python
-with_system_icu
-with_system_poppler
-with_system_db
-with_system_lucene
-with_lucene_core_jar
-with_lucene_analyzers_jar
-enable_mysql_connector
-with_system_mysql
-with_libmysql_path
-with_system_mysql_cppconn
-with_system_hsqldb
-with_hsqldb_jar
-with_system_beanshell
-with_beanshell_jar
-enable_presenter_extra_ui
-enable_minimizer
-enable_presenter_console
-enable_pdfimport
-enable_wiki_publisher
-with_commons_codec_jar
-with_commons_lang_jar
-with_commons_httpclient_jar
-with_commons_logging_jar
-with_servlet_api_jar
-enable_report_builder
-with_system_jfreereport
-with_sac_jar
-with_libxml_jar
-with_flute_jar
-with_jfreereport_jar
-with_liblayout_jar
-with_libloader_jar
-with_libformula_jar
-with_librepository_jar
-with_libfonts_jar
-with_libserializer_jar
-with_libbase_jar
-with_system_saxon
-with_saxon_jar
-with_system_libxslt
-with_system_odbc
-with_system_sane
-with_system_xrender
-with_system_curl
-with_system_boost
-with_system_mdds
-with_system_vigra
-enable_neon
-enable_Xaw
-with_system_neon
-with_system_agg
-with_system_hunspell
-with_system_mythes
-with_system_altlinuxhyph
-with_system_lpsolve
-with_system_libtextcat
-with_external_libtextcat_data
-with_system_cppunit
-with_system_redland
-with_system_mozilla
-with_stlport
-with_jdk_home
-with_gxx_include_path
-with_java
-enable_gcjaot
-with_ant_home
-with_junit
-with_perl_home
-with_cl_home
-with_mspdb_path
-with_midl_path
-with_csc_path
-with_nsis_path
-with_frame_home
-with_psdk_home
-with_directx_home
-with_mozilla_build
-with_local_solenv
-with_local_solver
-enable_check_only
-enable_ccache_skip
-with_lang
-with_poor_help_localizations
-with_dict
-with_intro_bitmaps
-with_about_bitmaps
-with_vendor
-with_unix_wrapper
-with_asm_home
-with_os_version
-with_unzip_home
-with_zip_home
-with_mingwin
-with_build_version
-with_alloc
-enable_verbose
-enable_dependency_tracking
-enable_largefile
-with_x
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-CXX
-CXXFLAGS
-CCC
-CXXCPP
-XMKMF'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-X features:
-  --x-includes=DIR    X include files are in DIR
-  --x-libraries=DIR   X library files are in DIR
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-graphite       Enables the compilation of Graphite smart font rendering
-
-  --disable-ldap          Disables the use of LDAP backend via Netscape/Mozilla
-                          or OpenLDAP LDAP SDK
-
-  --disable-fetch-external Disables fetching external tarballs from web sources.
-
-  --enable-lockdown       Enables the gconf integration work in OOo
-
-  --disable-vba           disables the vba compatibility feature
-
-  --enable-pch            EXPERIMENTAL: Enables precompiled header support for C++.
-
-  --disable-mozilla       OO.o usually includes a strangely hacked up mozilla
-                          binary for your platform, to build without this
-                          version, use this option.
-
-  --disable-epm           OO.o includes self-packaging code, that requires
-                          epm, however epm is useless for large scale
-                          package building.
-
-  --disable-odk           OO.o includes an ODK, office development kit
-                          which some packagers may with to build without
-
-  --disable-mathmldtd     disable mathmldtd
-                          (useful for distributions that want to avoid packaging
-                          it)
-
-  --enable-evolution2     Allows the built-in evolution 2 addressbook
-                          connectivity build to be enabled.
-
-  --disable-cups          disable cups support in the psprint project
-
-  --disable-fontconfig    disable support for the fontconfig library
-
-  --disable-directx       Remove DirectX implementation for the new XCanvas
-                          interface. The DirectX support requires more stuff
-                          installed on Windows to compile.
-                          (DirectX SDK, GDI+ libs)
-
-  --disable-activex       Disable the use of ActiveX for windows build.
-                          This switch is mandatory when using VC++ 2005/2008 Express.
-
-  --disable-atl          Disable the use of ATL for windows build.
-                          This switch is mandatory when using VC++ 2005/2008 Express.
-
-  --enable-symbols        Include debugging symbols in output.
-                          WARNING - a complete build needs 8 Gb of space and
-                          takes much longer. (enables -g compiler flag)
-
-                          --enable-symbols=SMALL sets the gcc -g1 setting
-                          which is smaller.
-
-                          Enabling symbols disables the stripping of the solver
-                          (--disable-strip-solver).
-
-  --disable-strip-solver  Disable the stripping of the solver.
-                          By default the solver is stripped unless a build with
-                          debugging symbols (--enable-symbols) is requested.
-
-                          This switch allows to override this setting.
-
-  --enable-werror         Turn warnings to errors. (Has no effect in modules
-                          where the treating of warnings as errors is disabled
-                          explicitely)
-
-  --enable-debug          Include debugging symbols from --enable-symbols
-                          plus extra debugging code.  Extra large build!
-                          (enables -g compiler flag and dmake debug=true)
-
-  --enable-dbgutil        Include additional debugging utilities, such as
-                          assertions, object counting, etc. Larger build.
-                          Independent from --enable-debug
-
-  --enable-crashdump      Enable the crashdump feature code.
-
-  --enable-cl-standard    For Microsoft C/C++ compiler users, use non-optimizing
-                          standard compiler. ( This just disavles optimization
-                          options and therefore removes a lot of warnings when
-                          using the cheaper standard compiler. )
-
-  --disable-gtk           Determines whether to use Gtk+ vclplug on platforms
-                          where Gtk+ is available.
-
-  --disable-gstreamer     Determines whether to use the GStreamer media
-                          backend on platforms where GStreamer is available.
-
-  --disable-systray       Determines whether to build the systray quickstarter.
-
-  --enable-cairo          Determines whether to use Cairo library on
-                          platforms where Cairo is available.
-
-  --disable-cairo-canvas  Determines whether to build the Cairo canvas on
-                          platforms where Cairo is available.
-
-  --enable-librsvg        Determines whether to use librsvg library on
-                          platforms where librsvg is available.
-                          (actually, it is possible to build with
-                          --disable-librsvg and to still have SVG support
-                          within a running soffice instance, since this
-                          dependency is a runtime only dependency.
-                          To have SVG suppport at runtime, the librsvg, the cairo
-                          and the gobject library - and all depending libraries
-                          as well - need to be accessible by the running soffice
-                          instance.
-                          The intention of defaulting this flag to yes is to
-                          indicate this fact to the build maintainer)
-
-  --enable-opengl         Determines whether to build the OpenGL 3D slide
-                          transitions component
-
-  --enable-dbus           Determines whether to enable presentation mode
-                          screensaver control under GNOME via DBUS
-
-  --disable-gconf         Determines whether to use the GConf support
-
-  --disable-gnome-vfs     Determines whether to use the Gnome Virtual Filing
-                          System on platforms where that VFS is available
-
-  --enable-gio            Determines whether to use the GIO support
-
-  --enable-static-gtk     Modules that are linked against gtk libraries use
-                          the static libraries instead of the dynamic ones.
-                          (enables -Bstatic linker flag for gtk libraries)
-
-  --enable-layout         Enable the compilation and use of layout dialogs
-
-  --disable-build-mozilla Use this option if you do not want to build the
-                          mozilla components from the mozilla source code but
-                          take precompiled zips
-
-  --disable-nss-module    Whether to use provided NSS module
-
-  --enable-kde            Determines whether to use Qt/KDE vclplug on platforms
-                          where Qt and KDE are available.
-
-  --disable-kdeab         Disable the KDE address book support
-
-  --enable-kde4            Determines whether to use Qt4/KDE4 vclplug on platforms
-                          where Qt4 and KDE4 are available. May be used with --enable-kde
-                          if you want to support both KDE3 and KDE4.
-
-  --disable-binfilter     Disable legacy binary file formats filters
-
-  --disable-rpath         Disable the use of relative paths in shared libraries
-
-  --disable-pam           Disable pam support.
-
-  --enable-pam-link       link with libpam instead of dynamically open it
-
-  --disable-crypt-link    disable linking with libcrypt instead of dynamically
-                          open it (needed for ancient GNU/Linux distributions
-                          without crypt()/libcrypt)
-
-  --enable-xrender-link   link with libXrender instead of dynamically open it
-
-  --disable-randr         disable RandR support in the vcl project
-
-  --disable-randr-link    disable linking with libXrandr, instead dynamically
-                           open it at runtime
-
-  --enable-mysql-connector     enables the build of the MySQL Connector/OOo extension.
-                                This requires access to the MySQL Connector/C (aka libmysql) to be given, too, with
-                                either the --with-system-mysql or --with-libmysql-path option.
-
-  --enable-presenter-extra-ui   enables extra functionality during slideshow,
-                                 e.g. selecting pen color, erasing drawings etc.
-
-  --enable-minimizer          enables the build of the Presentation Minimizer extension
-
-  --enable-presenter-console          enables the build of the Presenter Console extension
-
-  --enable-pdfimport          enables the build of the PDF Import extension and xpdf
-
-  --enable-wiki-publisher      enables the build of the Wiki Publisher extension
-
-  --enable-report-builder  enables the build of the Report Builder extension
-
-  --disable-neon          Disable neon and the compilation of webdav binding
-
-  --disable-Xaw           Disables the use of Xaw for the Netscape/Mozilla
-                           plugin
-
-  --enable-gcjaot         Build with[out] using Ahead of Time java compilation
-                          support to speed up buildsi by compiling the jars also
-                          to native code..
-                          --enable-gcjaot is only known to work with bytecode
-                          created with gcj or ecj
-
-  --enable-check-only     Use this option option if you just want to check your
-                          environment.  This option stops the generation of an
-                          ????env.set
-
-                          Usage: --enable-check-only=yes
-
-  --enable-ccache-skip    [default=auto] allow the use of --ccache-skip to
-                          escape compiler flags that would otherwise prevent
-                          caching of the result (currently used on Mac only)
-                          NOTE: requires patched version because of a bug in
-                          ccache (see issue 104567 for details and patch)
-                          explicitly enable if your version of ccache doesn't
-                          identify as version 2.4_OOo
-
-  --enable-verbose        Increase build verbosity.
-  --disable-verbose       Decrease build verbosity.
-
-  --disable-dependency-tracking  Disables generation of dependency information.
-
-  --disable-largefile     omit support for large files
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gnu-patch        Specify location of GNU patch on Solaris or FreeBSD
-
-  --without-agg           Disable the use of agg altogether
-
-  --with-gnu-cp           Specify location of GNU cp on Solaris or FreeBSD
-
-  --with-system-graphite    use graphite library already installed on system
-
-  --with-external-tar=<TARFILE PATH>   Specify path to tarfiles manually
-  --with-openldap         Enables the use of the OpenLDAP LDAP SDK instead
-                          of the Netscape/Mozilla one
-
-  --with-vba-package-format   specify package format for vba compatibility api.
-                          Specifying  "builtin" means the api component and
-                          associated type library are  part of the installation set.
-                          Specifying "extn" creates an uno extension that is
-                          part of the installation set ( located in the program
-                          directory ) that MUST be optionly registered using
-                          either the unopkg executeable or the extension manager
-                          gui.
-
-                          Note: "builtin" is the default, "extn" can cause
-                          problems.
-                          Usage: --with-vba-package-format="builtin" or
-                                 --with-vba-package-format="extn"
-
-  --without-fonts         OOo includes some third-party fonts to provide a reliable
-                          basis for help content, templates, samples, etc.
-                          When these fonts are already known to be available on the
-                          system then you should use this option.
-
-  --without-ppds          Removes Postscript Printer definition files from
-                          openoffice.org installation set, for people building
-                          for specific distributions where PPDs are known to be
-                          already available (every recent distro with CUPS
-                          backend)
-
-  --without-afms          Removes bitmap font files from openoffice.org
-                          installation set, for people building for specific
-                          distributions where AFM files or TrueType Fonts
-                          are known to be available.
-
-  --with-epm		  Decides which epm to use. Default is to use
-			  the one from the system if one is built. When
-			  either this is not there or you say =internal
-			  epm will be built.
-
-  --with-package-format   specify package format(s) for OOo installsets.
-                          Default is "normal" one of the OS/Distribution.
-
-                          Usage: --with-package-format="foo bar"
-
-  --with-system-stdlibs   use libstdc++/libgcc_s already on system
-
-  --with-system-cairo      Use Cairo libraries already on system
-
-  --with-mozilla-version  Choose which version of mozilla to use while building
-                          mozilla. Default: 1.7.5.
-                          Note that not all versions are supported.
-
-  --with-mozilla-toolkit  Choose which GUI toolkit to use while building mozilla
-                          components. Default: gtk2
-
-  --without-myspell-dicts Removes myspell dictionaries from openoffice.org
-                          installation set, for people building for specific
-                          distributions where the myspell dictionaries are
-                          installed from other sources
-
-  --with-system-dicts    Use dictionaries from system paths- Specify
-                         them via --with-{dict,hyph,thes}-path=/path
-			 if you want to override the default ones
-
-  --with-external-dict-dir Specify external dictionary dir
-
-  --with-external-hyph-dir Specify external hyphenation pattern dir
-
-  --with-external-thes-dir Specify external thesaurus dir
-
-  --with-system-libs      Use libs already on system -- enables all
-                          --with-system-* flags except mozilla and
-                          odbc/sane/xrender-header(s)
-
-  --with-system-headers   Use headers already on system -- enables all
-                          --with-system-* flags for external packages
-                          whose headers are the only entities used i.e.
-                          boost/vigra/odbc/sane/xrender-header(s)
-
-  --without-system-jars   When building with --with-system-libs, also the
-                          needed jars are expected on the system. Use this to
-                          disable that.
-                          (except for the db case where --with-system-db
-                          *has to* imply using the db.jar from there, too)
-
-  --with-system-zlib      Use zlib already on system
-
-  --with-system-openssl   Use OpenSSL already on system
-
-  --with-system-jpeg      Use jpeg already on system
-
-  --with-system-expat     Use expat already on system
-
-  --with-system-libwpd    Use libwpd already on system
-
-  --with-system-libxml    Use libxml already on system
-
-  --with-system-python    Use python already on system
-
-  --with-system-icu       Use icu already on system
-
-  --with-system-poppler   Use poppler already on system
-
-  --with-system-db        Use berkeley db already on system
-
-  --with-system-lucene    Use lucene already on system
-
-  --with-lucene-core-jar=JARFILE   Specify path to jarfile manually
-  --with-lucene-analyzers-jar=JARFILE   Specify path to jarfile manually
-  --with-system-mysql          Use MySQL libraries already on system, for building the MySQL Connector/OOo extension.
-                                Requires MYSQLCONFIG to point to the mysql_config executable.
-
-  --with-libmysql-path         Use Connector/C (libmysql) installation for building the MySQL Connector/OOo extension.
-
-                                Usage: --with-libmysql-path=<absolute path to your Connector/C installation>
-
-  --with-system-mysql-cppconn  Use MySQL C++ Connector libraries already on system
-
-  --with-system-hsqldb    Use hsqldb already on system
-
-  --with-hsqldb-jar=JARFILE   Specify path to jarfile manually
-  --with-system-beanshell Use beanshell already on system
-
-  --with-beanshell-jar=JARFILE   Specify path to jarfile manually
-  --with-commons-codec-jar=JARFILE   Specify path to jarfile manually
-  --with-commons-lang-jar=JARFILE   Specify path to jarfile manually
-  --with-commons-httpclient-jar=JARFILE   Specify path to jarfile manually
-  --with-commons-logging-jar=JARFILE   Specify path to jarfile manually
-  --servlet-api-jar=JARFILE   Specify path to jarfile manually
-  --with-system-jfreereport      Use JFreeReport already on system
-
-  --with-sac-jar=JARFILE   Specify path to jarfile manually
-  --with-libxml-jar=JARFILE   Specify path to jarfile manually
-  --with-flute-jar=JARFILE   Specify path to jarfile manually
-  --with-jfreereport-jar=JARFILE   Specify path to jarfile manually
-  --with-liblayout-jar=JARFILE   Specify path to jarfile manually
-  --with-libloader-jar=JARFILE   Specify path to jarfile manually
-  --with-libformula-jar=JARFILE   Specify path to jarfile manually
-  --with-librepository-jar=JARFILE   Specify path to jarfile manually
-  --with-libfonts-jar=JARFILE   Specify path to jarfile manually
-  --with-libserializer-jar=JARFILE   Specify path to jarfile manually
-  --with-libbase-jar=JARFILE   Specify path to jarfile manually
-  --with-system-saxon     Use saxon already on system
-
-  --with-saxon-jar=JARFILE   Specify path to jarfile manually
-  --with-system-libxslt   Use libxslt already on system
-
-  --with-system-odbc-headers     Use the odbc headers already on system
-
-  --with-system-sane-header      Use sane.h already on system
-
-  --with-system-xrender-headers  Use XRender headers already on system
-
-  --with-system-curl      Use curl already on system
-
-  --with-system-boost     Use boost already on system
-
-  --with-system-mdds      Use mdds already on system
-
-  --with-system-vigra     Use vigra already on system
-
-  --with-system-neon      Use neon already on system
-
-  --with-system-agg       Use AGG already on system
-
-  --with-system-hunspell   Use libhunspell already on system
-
-  --with-system-mythes    Use mythes already on system
-
-  --with-system-altlinuxhyph    Use ALTLinuxhyph already on system
-
-  --with-system-lpsolve         Use lpsolve already on system
-
-  --with-system-libtextcat      Use libtextcat already on system
-
-  --with-system-libtextcat-data Use libtextcat data already on system
-
-  --with-system-cppunit         Use cppunit already on system
-
-  --with-system-redland   Use redland library already on system
-
-  --with-system-mozilla   Use mozilla already on system. Note that some
-                          components cannot be built against a contemporary
-                          mozilla. The flavour used can be specified by
-                          --with-system-mozilla=<flavour>. Supported are:
-                          libxul (default), xulrunner, firefox, seamonkey,
-                          mozilla
-
-  --with-stlport         The location that STLport is installed in. The STL
-                          header files are assumed to be in
-                          stlport-home/stlport and the STLPort library in
-                          stlport-home/lib.
-
-                          Usage: --with-stlport=<absolute path to stlport home>
-
-                          Warning!!, disabling using --without-stlport or
-                          enabling using --with-stlport on a platform that
-                          defaults to the opposite will break ABI compatability
-
-  --with-jdk-home         if you have installed JDK 1.3 or later on your system
-                          please supply the path here.
-                          Note that this is not the location of the Java binary
-                          but the location of the entire distribution.
-
-                          Usage: --with-jdk-home=<absolute path to JDK home>
-
-  --with-gxx-include-path if you want to override the autodetected g++ include
-                          path.
-
-                          Usage: --with-gxx-include-path=<absolute path to g++ include dir>
-
-  --with-java             Build with[out] Java support.  If you use
-                          --without-java/--with-java=no then the build will have
-                          no support for Java components, applets, accessibility
-                          or XML filters.
-
-  --with-ant-home         If you have installed Jakarta Ant on your system,
-                          please supply the path here.
-                          Note that this is not the location of the Ant binary
-                          but the location of the entire distribution.
-
-                          Usage: --with-ant-home=<absolute path to Ant home>
-
-  --with-junit            Specifies the JUnit 4 jar file to use for JUnit-based
-                          tests.  --without-junit disables those tests.  Not
-                          relevant in the --without-java case.
-
-                          Usage: --with-junit=<absolute path to JUnit 4 jar>
-
-  --with-perl-home        If you have installed the Perl 5 Distribution, on your
-                          system, please supply the path here.
-                          Note that this is not the location of the Perl binary
-                          but the location of the entire distribution.
-
-                          Usage: --with-perl-home=<absolute path to Perl 5 home>
-
-  --with-cl-home          For Windows NT users, please supply the path
-                          for the Microsoft C/C++ compiler.
-                          Note that this is not the location of the compiler
-                          binary but the location of the entire distribution.
-
-                          Usage: --with-cl-home=<absolute path to Microsoft C/C++ compiler home>
-
-  --with-mspdb-path       For Microsoft C/C++ compiler users, please supply the
-                          path pointing to the mspdb71.dll (.NET 2003).
-
-                          Usage: --with-mspdb-path=<absolute path to mspdb71.dll>
-
-  --with-midl-path        For Microsoft C/C++ .NET compiler users, please supply
-                          the path pointing to the midl.exe.
-
-                          Usage: --with-midl-path=<absolute path to midl.exe>
-
-  --with-csc-path         For Microsoft C/C++ .NET compiler users, please supply
-                          the path pointing to the csc.exe.
-
-                          Usage: --with-csc-path=<absolute path to csc.exe>
-
-  --with-nsis-path        For Windows users, please supply the path to the
-                          "Nullsoft Scriptable Install System" (NSIS). If NSIS
-                          is found in the path or this option is supplied a self
-                          contained executable installer for OpenOffice.org will
-                          be created.
-
-                          Usage: --with-nsis-path=<absolute path to nsis.exe>
-
-  --with-frame-home       For Microsoft C/C++ .NET compiler users, please supply
-                          the path pointing to lib/mscoree.lib, usually
-                          something like:
-                          "/cygdrive/c/Program Files/Microsoft Visual Studio .NET/FrameworkSDK"
-
-                          MS Visual Toolkit compiler users, please supply the
-                          path pointing to lib/msvcrt.lib, usually something
-                          like:
-                          "/cygdrive/c/Program Files/Microsoft Visual Studio .NET 2003/Vc7"
-
-                          Usage: --with-frame-home=<absolute path to Framework SDK [home]>
-
-  --with-psdk-home        For Windows users, please supply the path to the
-                          Microsoft Platform SDK.
-
-                          Usage: --with-psdk-home=<absolute path to Microsoft Platform SDK>
-
-  --with-directx-home     For Windows users, please supply the path to the
-                          Microsoft DirectX SDK.
-
-                          Usage: --with-directx-home=<absolute path to Microsoft DirectX SDK>
-
-  --with-mozilla-build    For Windows users, please supply the path to the
-                          mozilla build tools.
-
-                          Usage: --with-mozilla-build=<absolute path to mozilla build tools>
-
-						  At the moment of this writing, an installer for the mozilla build tools
-						  can be obtained from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32.
-
-  --with-local-solenv     If you have solenv in a location other than ./solenv,
-                          please supply the path here.
-
-                          Usage: --with-local-solenv=<absolute path to solenv>
-
-  --with-local-solver     if you have solver in a location other than ./solver,
-                          please supply the path here.
-
-                          Usage: --with-local-solver=<absolute path to solver>
-
-  --with-lang             Use this option to build OpenOffice.org with
-                          additional language support. English (US) is always
-                          included by default. Separate multiple languages with
-                          space. For all languages, use --with-lang=ALL.
-
-                          Usage: --with-lang="es sw tu cs sk"
-
-  --with-poor-help-localizations
-                           Use this option to specify which languages have
-                          unusable help localizations. Separate multiple
-                          languages with space.
-
-                          Usage: --with-poor-help-localizations="af ar be-BY ca"
-
-  --with-dict             Use this option to build OpenOffice.org with
-                          dictionary support. ALL dictionaries are always
-                          included by default unless overridden with
-                          this option. Separate multiple dictionaries with
-                          commas. For all dictionaries, use --with-dict=ALL.
-
-                          Usage: --with-dict=ENGB,ENUS,ITIT
-
-  --with-intro-bitmaps    Prefer the specified intro bitmaps over the
-                          the default one.  Can be more than one (separated by
-                          commas), the order means priority of fallback if the
-                          first does not exist (in the installed tree).
-
-                          Usage: --with-intro-bitmaps=/path/my_ooo_intro.bmp
-
-  --with-about-bitmaps    Similarly to --with-intro-bitmaps, this allows
-                          specification of bitmaps for the About box.
-
-                          Usage: --with-about-bitmaps=/path/my_ooo_about.bmp
-
-  --with-vendor           Set vendor of the build.
-
-                          Usage: --with-vendor="John the Builder"
-
-  --with-unix-wrapper    Redefines the name of the UNIX wrapper that will be used
-                          in the desktop files and in the desktop-integration RPMs.
-
-                          Usage: --with-unix-wrapper=ooffice
-
-  --with-asm-home         For Windows users, please supply the path for the
-                          ml.exe assembler.
-
-                          Usage: --with-asm-home=<path to ml.exe directory>
-
-  --with-os-version       For FreeBSD users, use this option option to override
-                          the detected OSVERSION.
-
-                          Usage: --with-os-version=<OSVERSION>
-
-  --with-unzip-home       Deprecated: use --with-zip-home instead
-  --with-zip-home         If you use a non standard zip, for example windows
-                          please supply the path for zip
-
-                          Usage: --with-zip-home=<path to zip executable>
-
-  --with-mingwin          For Windows users, use the mingwin32 compiler within
-                          cygwin environment
-
-                          Usage: --with-mingwin=yes
-
-                          For !Windows use, use the mingw32 C++ compiler to
-                          (re-) build unowinreg.dll. Specify the MinGW C++
-                          Compilers name.
-
-                          Usage: --with-mingwin=i586-mingw32msvc-g++
-
-  --with-build-version    Allows the builder to add a custom version tag
-                          that will appear in the Help/About box for QA
-                          purposes.
-
-                          Usage: --with-build-version="Built by Jim"
-
-  --with-alloc            Define which allocator to build with
-                          (choices are oo, system, tcmalloc, jemalloc)
-
-                          Note that on FreeBSD/NetBSD system==jemalloc
-
-  --with-x                use the X Window System
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  CXXCPP      C++ preprocessor
-  XMKMF       Path to xmkmf, Makefile generator for X Window System
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to the package provider.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.67
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_cxx_try_compile LINENO
-# ----------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_compile
-
-# ac_fn_cxx_try_cpp LINENO
-# ------------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_cpp
-
-# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
-# --------------------------------------------
-# Tries to find the compile-time value of EXPR in a program that includes
-# INCLUDES, setting VAR accordingly. Returns whether the value could be
-# computed
-ac_fn_c_compute_int ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if test "$cross_compiling" = yes; then
-    # Depending upon the size, compute the lo and hi bounds.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=$ac_mid; break
-else
-  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_lo=$ac_mid; break
-else
-  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  ac_lo= ac_hi=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=$ac_mid
-else
-  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in #((
-?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
-'') ac_retval=1 ;;
-esac
-  else
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-static long int longval () { return $2; }
-static unsigned long int ulongval () { return $2; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (($2) < 0)
-    {
-      long int i = longval ();
-      if (i != ($2))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ($2))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else
-  ac_retval=1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-rm -f conftest.val
-
-  fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_compute_int
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_cxx_try_link LINENO
-# -------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_link
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_func
-
-# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
-# ---------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_cxx_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_cxx_check_header_mongrel
-
-# ac_fn_cxx_try_run LINENO
-# ------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_cxx_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_run
-
-# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
-# ----------------------------------------------------
-# Tries to find if the field MEMBER exists in type AGGR, after including
-# INCLUDES, setting cache variable VAR accordingly.
-ac_fn_c_check_member ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-$as_echo_n "checking for $2.$3... " >&6; }
-if eval "test \"\${$4+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (ac_aggr.$3)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$4=yes"
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (sizeof ac_aggr.$3)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$4=yes"
-else
-  eval "$4=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$4
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_member
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-echo "$@" >config.parms
-
-# Check whether --with-gnu-patch was given.
-if test "${with_gnu_patch+set}" = set; then :
-  withval=$with_gnu_patch;
-fi
-
-
-# Check whether --with-agg was given.
-if test "${with_agg+set}" = set; then :
-  withval=$with_agg;
-else
-  with_agg=yes
-fi
-
-
-# Check whether --with-gnu-cp was given.
-if test "${with_gnu_cp+set}" = set; then :
-  withval=$with_gnu_cp;
-fi
-
-# Check whether --enable-graphite was given.
-if test "${enable_graphite+set}" = set; then :
-  enableval=$enable_graphite;
-fi
-
-
-# Check whether --with-system-graphite was given.
-if test "${with_system_graphite+set}" = set; then :
-  withval=$with_system_graphite;
-fi
-
-# Check whether --enable-ldap was given.
-if test "${enable_ldap+set}" = set; then :
-  enableval=$enable_ldap;
-fi
-
-# Check whether --enable-fetch-external was given.
-if test "${enable_fetch_external+set}" = set; then :
-  enableval=$enable_fetch_external;
-fi
-
-
-# Check whether --with-external-tar was given.
-if test "${with_external_tar+set}" = set; then :
-  withval=$with_external_tar;  TARFILE_LOCATION="$withval"
-
-fi
-
-
-# Check whether --with-openldap was given.
-if test "${with_openldap+set}" = set; then :
-  withval=$with_openldap;
-fi
-
-# Check whether --enable-lockdown was given.
-if test "${enable_lockdown+set}" = set; then :
-  enableval=$enable_lockdown;
-fi
-
-# Check whether --enable-vba was given.
-if test "${enable_vba+set}" = set; then :
-  enableval=$enable_vba;
-fi
-
-
-# Check whether --with-vba-package-format was given.
-if test "${with_vba_package_format+set}" = set; then :
-  withval=$with_vba_package_format;
-fi
-
-# Check whether --enable-pch was given.
-if test "${enable_pch+set}" = set; then :
-  enableval=$enable_pch;
-fi
-
-# Check whether --enable-mozilla was given.
-if test "${enable_mozilla+set}" = set; then :
-  enableval=$enable_mozilla;
-else
-  enable_mozilla="yes"
-fi
-
-
-# Check whether --with-fonts was given.
-if test "${with_fonts+set}" = set; then :
-  withval=$with_fonts;
-fi
-
-
-# Check whether --with-ppds was given.
-if test "${with_ppds+set}" = set; then :
-  withval=$with_ppds;
-fi
-
-
-# Check whether --with-afms was given.
-if test "${with_afms+set}" = set; then :
-  withval=$with_afms;
-fi
-
-# Check whether --enable-epm was given.
-if test "${enable_epm+set}" = set; then :
-  enableval=$enable_epm;
-else
-  enable_epm="yes"
-fi
-
-
-# Check whether --with-epm was given.
-if test "${with_epm+set}" = set; then :
-  withval=$with_epm;
-fi
-
-
-# Check whether --with-package-format was given.
-if test "${with_package_format+set}" = set; then :
-  withval=$with_package_format;
-fi
-
-# Check whether --enable-odk was given.
-if test "${enable_odk+set}" = set; then :
-  enableval=$enable_odk;
-else
-  enable_odk="yes"
-fi
-
-# Check whether --enable-mathmldtd was given.
-if test "${enable_mathmldtd+set}" = set; then :
-  enableval=$enable_mathmldtd;
-else
-  enable_mathmldtd="yes"
-fi
-
-# Check whether --enable-evolution2 was given.
-if test "${enable_evolution2+set}" = set; then :
-  enableval=$enable_evolution2;
-fi
-
-
-# Check whether --with-system-stdlibs was given.
-if test "${with_system_stdlibs+set}" = set; then :
-  withval=$with_system_stdlibs;
-fi
-
-# Check whether --enable-cups was given.
-if test "${enable_cups+set}" = set; then :
-  enableval=$enable_cups;
-else
-  enable_cups=yes
-fi
-
-# Check whether --enable-fontconfig was given.
-if test "${enable_fontconfig+set}" = set; then :
-  enableval=$enable_fontconfig;
-else
-  enable_fontconfig=yes
-fi
-
-# Check whether --enable-directx was given.
-if test "${enable_directx+set}" = set; then :
-  enableval=$enable_directx;
-else
-  enable_directx=yes
-fi
-
-# Check whether --enable-activex was given.
-if test "${enable_activex+set}" = set; then :
-  enableval=$enable_activex;
-fi
-
-
-# Check whether --enable-atl was given.
-if test "${enable_atl+set}" = set; then :
-  enableval=$enable_atl;
-fi
-
-
-# Check whether --enable-symbols was given.
-if test "${enable_symbols+set}" = set; then :
-  enableval=$enable_symbols;
-fi
-
-# Check whether --enable-strip-solver was given.
-if test "${enable_strip_solver+set}" = set; then :
-  enableval=$enable_strip_solver;
-fi
-
-# Check whether --enable-werror was given.
-if test "${enable_werror+set}" = set; then :
-  enableval=$enable_werror;
-fi
-
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug;
-fi
-
-# Check whether --enable-dbgutil was given.
-if test "${enable_dbgutil+set}" = set; then :
-  enableval=$enable_dbgutil;
-fi
-
-# Check whether --enable-crashdump was given.
-if test "${enable_crashdump+set}" = set; then :
-  enableval=$enable_crashdump;
-fi
-
-# Check whether --enable-cl-standard was given.
-if test "${enable_cl_standard+set}" = set; then :
-  enableval=$enable_cl_standard;
-fi
-
-# Check whether --enable-gtk was given.
-if test "${enable_gtk+set}" = set; then :
-  enableval=$enable_gtk;
-else
-  enable_gtk=yes
-fi
-
-# Check whether --enable-gstreamer was given.
-if test "${enable_gstreamer+set}" = set; then :
-  enableval=$enable_gstreamer;
-else
-  enable_gstreamer=yes
-fi
-
-# Check whether --enable-systray was given.
-if test "${enable_systray+set}" = set; then :
-  enableval=$enable_systray;
-else
-  enable_systray=yes
-fi
-
-# Check whether --enable-cairo was given.
-if test "${enable_cairo+set}" = set; then :
-  enableval=$enable_cairo;
-else
-  enable_cairo=no
-fi
-
-
-# Check whether --with-system-cairo was given.
-if test "${with_system_cairo+set}" = set; then :
-  withval=$with_system_cairo;
-fi
-
-# Check whether --enable-cairo-canvas was given.
-if test "${enable_cairo_canvas+set}" = set; then :
-  enableval=$enable_cairo_canvas;
-else
-  enable_cairo_canvas=yes
-fi
-
-# Check whether --enable-librsvg was given.
-if test "${enable_librsvg+set}" = set; then :
-  enableval=$enable_librsvg;
-else
-  enable_librsvg=yes
-fi
-
-# Check whether --enable-opengl was given.
-if test "${enable_opengl+set}" = set; then :
-  enableval=$enable_opengl;
-else
-  enable_opengl=no
-fi
-
-# Check whether --enable-dbus was given.
-if test "${enable_dbus+set}" = set; then :
-  enableval=$enable_dbus;
-else
-  enable_dbus=no
-fi
-
-# Check whether --enable-gconf was given.
-if test "${enable_gconf+set}" = set; then :
-  enableval=$enable_gconf;
-else
-  enable_gconf=yes
-fi
-
-# Check whether --enable-gnome-vfs was given.
-if test "${enable_gnome_vfs+set}" = set; then :
-  enableval=$enable_gnome_vfs;
-else
-  enable_gnome_vfs=yes
-fi
-
-# Check whether --enable-gio was given.
-if test "${enable_gio+set}" = set; then :
-  enableval=$enable_gio;
-else
-  enable_gio=no
-fi
-
-# Check whether --enable-static-gtk was given.
-if test "${enable_static_gtk+set}" = set; then :
-  enableval=$enable_static_gtk;
-fi
-
-# Check whether --enable-layout was given.
-if test "${enable_layout+set}" = set; then :
-  enableval=$enable_layout;
-fi
-
-# Check whether --enable-build-mozilla was given.
-if test "${enable_build_mozilla+set}" = set; then :
-  enableval=$enable_build_mozilla;
-fi
-
-
-# Check whether --with-mozilla-version was given.
-if test "${with_mozilla_version+set}" = set; then :
-  withval=$with_mozilla_version;
-fi
-
-
-# Check whether --with-mozilla-toolkit was given.
-if test "${with_mozilla_toolkit+set}" = set; then :
-  withval=$with_mozilla_toolkit;
-fi
-
-# Check whether --enable-nss_module was given.
-if test "${enable_nss_module+set}" = set; then :
-  enableval=$enable_nss_module;
-else
-  enable_nss_module=yes
-fi
-
-# Check whether --enable-kde was given.
-if test "${enable_kde+set}" = set; then :
-  enableval=$enable_kde;
-fi
-
-# Check whether --enable-kdeab was given.
-if test "${enable_kdeab+set}" = set; then :
-  enableval=$enable_kdeab;
-else
-  if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi
-fi
-
-# Check whether --enable-kde4 was given.
-if test "${enable_kde4+set}" = set; then :
-  enableval=$enable_kde4;
-fi
-
-# Check whether --enable-binfilter was given.
-if test "${enable_binfilter+set}" = set; then :
-  enableval=$enable_binfilter;
-else
-  if ! test -d ./binfilter; then enable_binfilter=no; fi
-fi
-
-# Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then :
-  enableval=$enable_rpath;
-fi
-
-# Check whether --enable-pam was given.
-if test "${enable_pam+set}" = set; then :
-  enableval=$enable_pam;
-fi
-
-# Check whether --enable-pam-link was given.
-if test "${enable_pam_link+set}" = set; then :
-  enableval=$enable_pam_link;
-fi
-
-# Check whether --enable-crypt-link was given.
-if test "${enable_crypt_link+set}" = set; then :
-  enableval=$enable_crypt_link;
-else
-  enable_crypt_link=yes
-fi
-
-# Check whether --enable-xrender-link was given.
-if test "${enable_xrender_link+set}" = set; then :
-  enableval=$enable_xrender_link;
-fi
-
-# Check whether --enable-randr was given.
-if test "${enable_randr+set}" = set; then :
-  enableval=$enable_randr;
-else
-  enable_randr=yes
-fi
-
-# Check whether --enable-randr-link was given.
-if test "${enable_randr_link+set}" = set; then :
-  enableval=$enable_randr_link;
-else
-  enable_randr_link=yes
-fi
-
-
-# Check whether --with-myspell-dicts was given.
-if test "${with_myspell_dicts+set}" = set; then :
-  withval=$with_myspell_dicts;
-fi
-
-
-# Check whether --with-system-dicts was given.
-if test "${with_system_dicts+set}" = set; then :
-  withval=$with_system_dicts;
-fi
-
-
-# Check whether --with-external-dict-dir was given.
-if test "${with_external_dict_dir+set}" = set; then :
-  withval=$with_external_dict_dir;
-fi
-
-
-# Check whether --with-external-hyph-dir was given.
-if test "${with_external_hyph_dir+set}" = set; then :
-  withval=$with_external_hyph_dir;
-fi
-
-
-# Check whether --with-external-thes-dir was given.
-if test "${with_external_thes_dir+set}" = set; then :
-  withval=$with_external_thes_dir;
-fi
-
-
-# Check whether --with-system-libs was given.
-if test "${with_system_libs+set}" = set; then :
-  withval=$with_system_libs;
-fi
-
-
-# Check whether --with-system-headers was given.
-if test "${with_system_headers+set}" = set; then :
-  withval=$with_system_headers;
-fi
-
-
-# Check whether --with-system-jars was given.
-if test "${with_system_jars+set}" = set; then :
-  withval=$with_system_jars;
-fi
-
-
-# Check whether --with-system-zlib was given.
-if test "${with_system_zlib+set}" = set; then :
-  withval=$with_system_zlib;
-fi
-
-
-# Check whether --with-system-openssl was given.
-if test "${with_system_openssl+set}" = set; then :
-  withval=$with_system_openssl;
-fi
-
-
-# Check whether --with-system-jpeg was given.
-if test "${with_system_jpeg+set}" = set; then :
-  withval=$with_system_jpeg;
-fi
-
-
-# Check whether --with-system-expat was given.
-if test "${with_system_expat+set}" = set; then :
-  withval=$with_system_expat;
-fi
-
-
-# Check whether --with-system-libwpd was given.
-if test "${with_system_libwpd+set}" = set; then :
-  withval=$with_system_libwpd;
-fi
-
-
-# Check whether --with-system-libxml was given.
-if test "${with_system_libxml+set}" = set; then :
-  withval=$with_system_libxml;
-fi
-
-
-# Check whether --with-system-python was given.
-if test "${with_system_python+set}" = set; then :
-  withval=$with_system_python;
-fi
-
-
-# Check whether --with-system-icu was given.
-if test "${with_system_icu+set}" = set; then :
-  withval=$with_system_icu;
-fi
-
-
-# Check whether --with-system-poppler was given.
-if test "${with_system_poppler+set}" = set; then :
-  withval=$with_system_poppler;
-fi
-
-
-# Check whether --with-system-db was given.
-if test "${with_system_db+set}" = set; then :
-  withval=$with_system_db;
-fi
-
-
-# Check whether --with-system-lucene was given.
-if test "${with_system_lucene+set}" = set; then :
-  withval=$with_system_lucene;
-fi
-
-
-# Check whether --with-lucene-core-jar was given.
-if test "${with_lucene_core_jar+set}" = set; then :
-  withval=$with_lucene_core_jar;  LUCENE_CORE_JAR="$withval"
-
-fi
-
-
-# Check whether --with-lucene-analyzers-jar was given.
-if test "${with_lucene_analyzers_jar+set}" = set; then :
-  withval=$with_lucene_analyzers_jar;  LUCENE_ANALYZERS_JAR="$withval"
-
-fi
-
-# Check whether --enable-mysql-connector was given.
-if test "${enable_mysql_connector+set}" = set; then :
-  enableval=$enable_mysql_connector;
-fi
-
-
-# Check whether --with-system-mysql was given.
-if test "${with_system_mysql+set}" = set; then :
-  withval=$with_system_mysql;
-fi
-
-
-# Check whether --with-libmysql-path was given.
-if test "${with_libmysql_path+set}" = set; then :
-  withval=$with_libmysql_path;
-fi
-
-
-# Check whether --with-system-mysql-cppconn was given.
-if test "${with_system_mysql_cppconn+set}" = set; then :
-  withval=$with_system_mysql_cppconn;
-fi
-
-
-# Check whether --with-system-hsqldb was given.
-if test "${with_system_hsqldb+set}" = set; then :
-  withval=$with_system_hsqldb;
-fi
-
-
-# Check whether --with-hsqldb-jar was given.
-if test "${with_hsqldb_jar+set}" = set; then :
-  withval=$with_hsqldb_jar;  HSQLDB_JAR="$withval"
-
-fi
-
-
-# Check whether --with-system-beanshell was given.
-if test "${with_system_beanshell+set}" = set; then :
-  withval=$with_system_beanshell;
-fi
-
-
-# Check whether --with-beanshell-jar was given.
-if test "${with_beanshell_jar+set}" = set; then :
-  withval=$with_beanshell_jar;  BSH_JAR="$withval"
-
-fi
-
-# Check whether --enable-presenter-extra-ui was given.
-if test "${enable_presenter_extra_ui+set}" = set; then :
-  enableval=$enable_presenter_extra_ui;
-else
-  enable_presenter_extra_ui=no
-fi
-
-# Check whether --enable-minimizer was given.
-if test "${enable_minimizer+set}" = set; then :
-  enableval=$enable_minimizer;
-fi
-
-# Check whether --enable-presenter-console was given.
-if test "${enable_presenter_console+set}" = set; then :
-  enableval=$enable_presenter_console;
-fi
-
-# Check whether --enable-pdfimport was given.
-if test "${enable_pdfimport+set}" = set; then :
-  enableval=$enable_pdfimport;
-fi
-
-# Check whether --enable-wiki-publisher was given.
-if test "${enable_wiki_publisher+set}" = set; then :
-  enableval=$enable_wiki_publisher;
-fi
-
-
-# Check whether --with-commons-codec-jar was given.
-if test "${with_commons_codec_jar+set}" = set; then :
-  withval=$with_commons_codec_jar;  COMMONS_CODEC_JAR="$withval"
-
-fi
-
-
-# Check whether --with-commons-lang-jar was given.
-if test "${with_commons_lang_jar+set}" = set; then :
-  withval=$with_commons_lang_jar;  COMMONS_LANG_JAR="$withval"
-
-fi
-
-
-# Check whether --with-commons-httpclient-jar was given.
-if test "${with_commons_httpclient_jar+set}" = set; then :
-  withval=$with_commons_httpclient_jar;  COMMONS_HTTPCLIENT_JAR="$withval"
-
-fi
-
-
-# Check whether --with-commons-logging-jar was given.
-if test "${with_commons_logging_jar+set}" = set; then :
-  withval=$with_commons_logging_jar;  COMMONS_LOGGING_JAR="$withval"
-
-fi
-
-
-# Check whether --with-servlet-api-jar was given.
-if test "${with_servlet_api_jar+set}" = set; then :
-  withval=$with_servlet_api_jar;  SERVLETAPI_JAR="$withval"
-
-fi
-
-# Check whether --enable-report-builder was given.
-if test "${enable_report_builder+set}" = set; then :
-  enableval=$enable_report_builder;
-fi
-
-
-# Check whether --with-system-jfreereport was given.
-if test "${with_system_jfreereport+set}" = set; then :
-  withval=$with_system_jfreereport;
-fi
-
-
-# Check whether --with-sac-jar was given.
-if test "${with_sac_jar+set}" = set; then :
-  withval=$with_sac_jar;  SAC_JAR="$withval"
-
-fi
-
-
-# Check whether --with-libxml-jar was given.
-if test "${with_libxml_jar+set}" = set; then :
-  withval=$with_libxml_jar;  LIBXML_JAR="$withval"
-
-fi
-
-
-# Check whether --with-flute-jar was given.
-if test "${with_flute_jar+set}" = set; then :
-  withval=$with_flute_jar;  FLUTE_JAR="$withval"
-
-fi
-
-
-# Check whether --with-jfreereport-jar was given.
-if test "${with_jfreereport_jar+set}" = set; then :
-  withval=$with_jfreereport_jar;  JFREEREPORT_JAR="$withval"
-
-fi
-
-
-# Check whether --with-liblayout-jar was given.
-if test "${with_liblayout_jar+set}" = set; then :
-  withval=$with_liblayout_jar;  LIBLAYOUT_JAR="$withval"
-
-fi
-
-
-# Check whether --with-libloader-jar was given.
-if test "${with_libloader_jar+set}" = set; then :
-  withval=$with_libloader_jar;  LIBLOADER_JAR="$withval"
-
-fi
-
-
-# Check whether --with-libloader-jar was given.
-if test "${with_libloader_jar+set}" = set; then :
-  withval=$with_libloader_jar;  LIBLOADER_JAR="$withval"
-
-fi
-
-
-# Check whether --with-libformula-jar was given.
-if test "${with_libformula_jar+set}" = set; then :
-  withval=$with_libformula_jar;  LIBFORMULA_JAR="$withval"
-
-fi
-
-
-# Check whether --with-librepository-jar was given.
-if test "${with_librepository_jar+set}" = set; then :
-  withval=$with_librepository_jar;  LIBREPOSITORY_JAR="$withval"
-
-fi
-
-
-# Check whether --with-libfonts-jar was given.
-if test "${with_libfonts_jar+set}" = set; then :
-  withval=$with_libfonts_jar;  LIBFONTS_JAR="$withval"
-
-fi
-
-
-# Check whether --with-libserializer-jar was given.
-if test "${with_libserializer_jar+set}" = set; then :
-  withval=$with_libserializer_jar;  LIBSERIALIZER_JAR="$withval"
-
-fi
-
-
-# Check whether --with-libbase-jar was given.
-if test "${with_libbase_jar+set}" = set; then :
-  withval=$with_libbase_jar;  LIBBASE_JAR="$withval"
-
-fi
-
-
-# Check whether --with-system-saxon was given.
-if test "${with_system_saxon+set}" = set; then :
-  withval=$with_system_saxon;
-fi
-
-
-# Check whether --with-saxon-jar was given.
-if test "${with_saxon_jar+set}" = set; then :
-  withval=$with_saxon_jar;  SAXON_JAR="$withval"
-
-fi
-
-
-# Check whether --with-system-libxslt was given.
-if test "${with_system_libxslt+set}" = set; then :
-  withval=$with_system_libxslt;
-fi
-
-
-# Check whether --with-system-odbc was given.
-if test "${with_system_odbc+set}" = set; then :
-  withval=$with_system_odbc;
-fi
-
-
-# Check whether --with-system-sane was given.
-if test "${with_system_sane+set}" = set; then :
-  withval=$with_system_sane;
-fi
-
-
-# Check whether --with-system-xrender was given.
-if test "${with_system_xrender+set}" = set; then :
-  withval=$with_system_xrender;
-fi
-
-
-# Check whether --with-system-curl was given.
-if test "${with_system_curl+set}" = set; then :
-  withval=$with_system_curl;
-fi
-
-
-# Check whether --with-system-boost was given.
-if test "${with_system_boost+set}" = set; then :
-  withval=$with_system_boost;
-fi
-
-
-# Check whether --with-system-mdds was given.
-if test "${with_system_mdds+set}" = set; then :
-  withval=$with_system_mdds;
-fi
-
-
-# Check whether --with-system-vigra was given.
-if test "${with_system_vigra+set}" = set; then :
-  withval=$with_system_vigra;
-fi
-
-# Check whether --enable-neon was given.
-if test "${enable_neon+set}" = set; then :
-  enableval=$enable_neon;
-fi
-
-# Check whether --enable-Xaw was given.
-if test "${enable_Xaw+set}" = set; then :
-  enableval=$enable_Xaw;
-fi
-
-
-# Check whether --with-system-neon was given.
-if test "${with_system_neon+set}" = set; then :
-  withval=$with_system_neon;
-fi
-
-
-# Check whether --with-system-agg was given.
-if test "${with_system_agg+set}" = set; then :
-  withval=$with_system_agg;
-fi
-
-
-# Check whether --with-system-hunspell was given.
-if test "${with_system_hunspell+set}" = set; then :
-  withval=$with_system_hunspell;
-fi
-
-
-# Check whether --with-system-mythes was given.
-if test "${with_system_mythes+set}" = set; then :
-  withval=$with_system_mythes;
-fi
-
-
-# Check whether --with-system-altlinuxhyph was given.
-if test "${with_system_altlinuxhyph+set}" = set; then :
-  withval=$with_system_altlinuxhyph;
-fi
-
-
-# Check whether --with-system-lpsolve was given.
-if test "${with_system_lpsolve+set}" = set; then :
-  withval=$with_system_lpsolve;
-fi
-
-
-# Check whether --with-system-libtextcat was given.
-if test "${with_system_libtextcat+set}" = set; then :
-  withval=$with_system_libtextcat;
-fi
-
-
-# Check whether --with-external-libtextcat-data was given.
-if test "${with_external_libtextcat_data+set}" = set; then :
-  withval=$with_external_libtextcat_data;
-fi
-
-
-# Check whether --with-system-cppunit was given.
-if test "${with_system_cppunit+set}" = set; then :
-  withval=$with_system_cppunit;
-fi
-
-
-# Check whether --with-system-redland was given.
-if test "${with_system_redland+set}" = set; then :
-  withval=$with_system_redland;
-fi
-
-
-# Check whether --with-system-mozilla was given.
-if test "${with_system_mozilla+set}" = set; then :
-  withval=$with_system_mozilla; WITH_SYSTEM_MOZILLA=$withval
-else
-  WITH_SYSTEM_MOZILLA=no
-fi
-
-
-# Check whether --with-stlport was given.
-if test "${with_stlport+set}" = set; then :
-  withval=$with_stlport; WITH_STLPORT=$withval
-else
-  WITH_STLPORT=auto
-fi
-
-
-# Check whether --with-jdk-home was given.
-if test "${with_jdk_home+set}" = set; then :
-  withval=$with_jdk_home;
-fi
-
-
-# Check whether --with-gxx_include_path was given.
-if test "${with_gxx_include_path+set}" = set; then :
-  withval=$with_gxx_include_path;
-fi
-
-
-# Check whether --with-java was given.
-if test "${with_java+set}" = set; then :
-  withval=$with_java; if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi
-else
-  WITH_JAVA=java
-fi
-
-# Check whether --enable-gcjaot was given.
-if test "${enable_gcjaot+set}" = set; then :
-  enableval=$enable_gcjaot;
-fi
-
-
-# Check whether --with-ant-home was given.
-if test "${with_ant_home+set}" = set; then :
-  withval=$with_ant_home;
-fi
-
-
-# Check whether --with-junit was given.
-if test "${with_junit+set}" = set; then :
-  withval=$with_junit;
-else
-  with_junit=yes
-fi
-
-
-# Check whether --with-perl-home was given.
-if test "${with_perl_home+set}" = set; then :
-  withval=$with_perl_home;
-fi
-
-
-# Check whether --with-cl-home was given.
-if test "${with_cl_home+set}" = set; then :
-  withval=$with_cl_home;
-fi
-
-
-# Check whether --with-mspdb-path was given.
-if test "${with_mspdb_path+set}" = set; then :
-  withval=$with_mspdb_path;
-fi
-
-
-# Check whether --with-midl-path was given.
-if test "${with_midl_path+set}" = set; then :
-  withval=$with_midl_path;
-fi
-
-
-# Check whether --with-csc-path was given.
-if test "${with_csc_path+set}" = set; then :
-  withval=$with_csc_path;
-fi
-
-
-# Check whether --with-nsis-path was given.
-if test "${with_nsis_path+set}" = set; then :
-  withval=$with_nsis_path;
-fi
-
-
-# Check whether --with-frame-home was given.
-if test "${with_frame_home+set}" = set; then :
-  withval=$with_frame_home;
-fi
-
-
-# Check whether --with-psdk-home was given.
-if test "${with_psdk_home+set}" = set; then :
-  withval=$with_psdk_home;
-fi
-
-
-# Check whether --with-directx-home was given.
-if test "${with_directx_home+set}" = set; then :
-  withval=$with_directx_home;
-fi
-
-
-# Check whether --with-mozilla-build was given.
-if test "${with_mozilla_build+set}" = set; then :
-  withval=$with_mozilla_build; MOZILLABUILD=$withval
-fi
-
-
-# Check whether --with-local-solenv was given.
-if test "${with_local_solenv+set}" = set; then :
-  withval=$with_local_solenv;
-fi
-
-
-# Check whether --with-local-solver was given.
-if test "${with_local_solver+set}" = set; then :
-  withval=$with_local_solver;
-fi
-
-# Check whether --enable-check-only was given.
-if test "${enable_check_only+set}" = set; then :
-  enableval=$enable_check_only;
-fi
-
-# Check whether --enable-ccache-skip was given.
-if test "${enable_ccache_skip+set}" = set; then :
-  enableval=$enable_ccache_skip;
-else
-  enable_ccache_skip=auto
-fi
-
-
-# Check whether --with-lang was given.
-if test "${with_lang+set}" = set; then :
-  withval=$with_lang;
-fi
-
-
-# Check whether --with-poor-help-localizations was given.
-if test "${with_poor_help_localizations+set}" = set; then :
-  withval=$with_poor_help_localizations;
-fi
-
-
-# Check whether --with-dict was given.
-if test "${with_dict+set}" = set; then :
-  withval=$with_dict;
-fi
-
-
-# Check whether --with-intro-bitmaps was given.
-if test "${with_intro_bitmaps+set}" = set; then :
-  withval=$with_intro_bitmaps;
-fi
-
-
-# Check whether --with-about-bitmaps was given.
-if test "${with_about_bitmaps+set}" = set; then :
-  withval=$with_about_bitmaps;
-fi
-
-
-# Check whether --with-vendor was given.
-if test "${with_vendor+set}" = set; then :
-  withval=$with_vendor;
-fi
-
-
-# Check whether --with-unix-wrapper was given.
-if test "${with_unix_wrapper+set}" = set; then :
-  withval=$with_unix_wrapper;
-fi
-
-
-# Check whether --with-asm-home was given.
-if test "${with_asm_home+set}" = set; then :
-  withval=$with_asm_home;
-fi
-
-
-# Check whether --with-os-version was given.
-if test "${with_os_version+set}" = set; then :
-  withval=$with_os_version;
-fi
-
-
-# Check whether --with-unzip-home was given.
-if test "${with_unzip_home+set}" = set; then :
-  withval=$with_unzip_home;
-fi
-
-
-# Check whether --with-zip-home was given.
-if test "${with_zip_home+set}" = set; then :
-  withval=$with_zip_home;
-fi
-
-
-# Check whether --with-mingwin was given.
-if test "${with_mingwin+set}" = set; then :
-  withval=$with_mingwin; WITH_MINGWIN=$withval
-else
-  WITH_MINGWIN=0
-fi
-
-
-# Check whether --with-build-version was given.
-if test "${with_build_version+set}" = set; then :
-  withval=$with_build_version; with_build_version=$withval
-fi
-
-
-# Check whether --with-alloc was given.
-if test "${with_alloc+set}" = set; then :
-  withval=$with_alloc;
-fi
-
-# Check whether --enable-verbose was given.
-if test "${enable_verbose+set}" = set; then :
-  enableval=$enable_verbose;
-fi
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-
-BUILD_TYPE="OOo"
-
-echo "********************************************************************"
-echo "*                                                                  *"
-echo "*   OpenOffice.org build configuration.                            *"
-echo "*                                                                  *"
-echo "*   The configure process checks your platform to see whether      *"
-echo "*   you can build OpenOffice.org on it.                            *"
-echo "*   This process checks all pre-requisites and generates a file    *"
-echo "*   containing the necessary environment variables.                *"
-echo "*   Source this file after configure has ended successfully.       *"
-echo "*                                                                  *"
-echo "*   Any warning that is generated during the configure process     *"
-echo "*   must be taken into account since it can be a reason for        *"
-echo "*   an unsuccessful build of OpenOffice.org                        *"
-echo "*                                                                  *"
-echo "********************************************************************"
-echo ""
-echo "********************************************************************"
-echo "*                                                                  *"
-echo "*   Checking the platform pre-requisites.                          *"
-echo "*                                                                  *"
-echo "********************************************************************"
-echo ""
-cat /dev/null > warn
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-# Extract the first word of "$AWK", so it can be a program name with args.
-set dummy $AWK; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_AWK+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $AWK in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_AWK="$AWK" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-AWK=$ac_cv_path_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$AWK"; then
-   as_fn_error $? "install awk to run this script" "$LINENO" 5
-fi
-
-for ac_prog in sed
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $SED in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_SED="$SED" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-SED=$ac_cv_path_SED
-if test -n "$SED"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
-$as_echo "$SED" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$SED" && break
-done
-
-if test -z "$SED"; then
-   as_fn_error $? "install sed to run this script" "$LINENO" 5
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for solenv environment" >&5
-$as_echo_n "checking for solenv environment... " >&6; }
-if test -z "$with_local_solenv"; then
-   LOCAL_SOLENV="DEFAULT"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: default" >&5
-$as_echo "default" >&6; }
-else
-   LOCAL_SOLENV=$with_local_solenv
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_local_solenv" >&5
-$as_echo "$with_local_solenv" >&6; }
-fi
-
-
-if test "$LOCAL_SOLENV" = "DEFAULT"; then
-  _solenv="./solenv"
-else
-  _solenv="$LOCAL_SOLENV"
-fi
-
-
-if test -e $_solenv/inc/minor.mk; then
-   # Get UPD number from ./solenv/inc/minor.mk
-   UPD="`grep RSCVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
-
-   SOURCEVERSION="`grep SOURCEVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
-
-else
-   as_fn_error $? "$_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." "$LINENO" 5
-fi
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$target_alias" = x; then
-  ac_cv_target=$ac_cv_host
-else
-  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
-esac
-target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-if test "$build" != "$host" -o "$build" != "$target" \
-  -o "$host" != "$target"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross-compiling by any means is not supported (yet)!" >&5
-$as_echo "$as_me: WARNING: cross-compiling by any means is not supported (yet)!" >&2;}
-	echo "cross-compiling by any means is not supported (yet)!" >> warn
-fi
-
-if echo "$build_os" | grep cygwin; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking Cygwin version" >&5
-$as_echo_n "checking Cygwin version... " >&6; }
-   CygwinVer=`uname -r`
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CygwinVer" >&5
-$as_echo "$CygwinVer" >&6; }
-   if test "`echo $CygwinVer | $AWK -F . '{ print $1$2 }'`" -lt "15"; then
-      as_fn_error $? "You need at least Cygwin V1.5.x" "$LINENO" 5
-   fi
-else
-   CygwinVer="false"
-fi
-
-case "$build_os" in
-	solaris*)
-		test_gtk=yes
-		test_cairo=yes
-		test_librsvg=yes
-		test_kde=yes
-		test_cups=yes
-        test_randr=yes
-		test_freetype=yes
-        test_gstreamer=yes
-		_os=SunOS
-		# Extract the first word of "gtar", so it can be a program name with args.
-set dummy gtar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GNUTAR+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GNUTAR in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GNUTAR="$GNUTAR" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:/usr/sfw/bin"
-for as_dir in $as_dummy
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_GNUTAR="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-GNUTAR=$ac_cv_path_GNUTAR
-if test -n "$GNUTAR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUTAR" >&5
-$as_echo "$GNUTAR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-		if test -z "$GNUTAR"; then
-			as_fn_error $? "gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." "$LINENO" 5
-		fi
-
-
-						   		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the Solaris operating system release" >&5
-$as_echo_n "checking the Solaris operating system release... " >&6; }
-   		_os_release=`echo $build_os | $SED -e s/solaris2\.//`
-		if test "$_os_release" -lt "6"; then
-      			as_fn_error $? "use solaris >= 6 to build OpenOffice.org" "$LINENO" 5
-   		else
-      			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok ($_os_release)" >&5
-$as_echo "ok ($_os_release)" >&6; }
-   		fi
-
-   		   		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the processor type" >&5
-$as_echo_n "checking the processor type... " >&6; }
-   		if test "$build_cpu" = "sparc" -o "$build_cpu" = "i386"; then
-      			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok ($build_cpu)" >&5
-$as_echo "ok ($build_cpu)" >&6; }
-   		else
-      			as_fn_error $? "only sparc and i386 processors are supported" "$LINENO" 5
-   		fi
-		;;
-	linux-gnu*|k*bsd*-gnu*)
-		test_gtk=yes
-		test_cairo=yes
-		test_librsvg=yes
-		test_kde=yes
-		test_kde4=yes
-		test_cups=yes
-        test_randr=yes
-		test_freetype=yes
-        test_gstreamer=yes
-        _os=Linux
-		;;
-	gnu)
-		test_cups=no
-		_os=GNU
-		;;
-	cygwin*) # Windows
-		test_cups=no
-		test_cairo=yes
-		test_librsvg=no
-		test_freetype=no
-        test_gstreamer=no
-		_os=WINNT
-		;;
-	darwin*) # Mac OS X
-		test_cups=yes
-		test_gtk=yes
-		test_cairo=yes
-		test_librsvg=no
-        test_randr=no
-		test_freetype=no
-        test_gstreamer=no
-		_os=Darwin
-      if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&5
-$as_echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&2;}
-         echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn
-         enable_systray=no
-      fi
-		;;
-	os2*)
-		test_x=no
-		test_cups=no
-        test_randr=no
-		test_gtk=no
-		test_librsvg=no
-		test_freetype=no
-        test_gstreamer=no
-		_os=OS2
-		;;
-	freebsd*)
-		test_gtk=yes
-		test_cairo=yes
-		test_librsvg=yes
-		test_kde=yes
-		test_kde4=yes
-		test_cups=yes
-        test_randr=yes
-		test_freetype=yes
-        test_gstreamer=yes
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the FreeBSD operating system release" >&5
-$as_echo_n "checking the FreeBSD operating system release... " >&6; }
-		if test -n "$with_os_version"; then
-			OSVERSION="$with_os_version"
-		else
-			OSVERSION=`/sbin/sysctl -n kern.osreldate`
-		fi
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found OSVERSION=$OSVERSION" >&5
-$as_echo "found OSVERSION=$OSVERSION" >&6; }
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which thread library to use" >&5
-$as_echo_n "checking which thread library to use... " >&6; }
-		if test "$OSVERSION" -lt "500016"; then
-			PTHREAD_CFLAGS="-D_THREAD_SAFE"
-			PTHREAD_LIBS="-pthread"
-		elif test "$OSVERSION" -lt "502102"; then
-			PTHREAD_CFLAGS="-D_THREAD_SAFE"
-			PTHREAD_LIBS="-lc_r"
-		else
-			PTHREAD_CFLAGS=""
-			PTHREAD_LIBS="-pthread"
-		fi
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_LIBS" >&5
-$as_echo "$PTHREAD_LIBS" >&6; }
-		_os=FreeBSD
-		;;
-	osf)
-		test_cups=no
-        test_randr=no
-		_os=OSF1
-		;;
-	netbsd)
-		test_gtk=yes
-		test_cairo=yes
-		test_librsvg=yes
-		test_kde=yes
-		test_kde4=yes
-		test_cups=no
-        test_randr=yes
-		test_freetype=yes
-        test_gstreamer=yes
-		PTHREAD_CFLAGS="-pthread"
-		PTHREAD_LIBS="-pthread -lpthread"
-		_os=NetBSD
-		;;
-	aix*)
-		test_cups=no
-        test_randr=no
-		test_freetype=yes
-        test_gstreamer=yes
-	   PTHREAD_LIBS=-pthread
-		echo "AIX is an alpha port --- Use at own risk" >> warn
-		_os=AIX
-		;;
-   *)
-   as_fn_error $? "$_os operating system is not suitable to build OpenOffice.org!" "$LINENO" 5
-   ;;
-esac
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable crashdump feature" >&5
-$as_echo_n "checking whether to enable crashdump feature... " >&6; }
-if test "$enable_crashdump" = "yes"; then
-   ENABLE_CRASHDUMP="TRUE"
-   BUILD_TYPE="$BUILD_TYPE CRASHREP"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-   ENABLE_CRASHDUMP=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test "$_os" = "WINNT"; then
-   BUILD_TYPE="$BUILD_TYPE TWAIN"
-fi
-
-if test "$_os" = "WINNT"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use the standard non-optimizing compiler" >&5
-$as_echo_n "checking whether to use the standard non-optimizing compiler... " >&6; }
-   if test "$enable_cl_standard" = "" -o "$enable_cl_standard" = "no"; then
-      VC_STANDARD=""
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   else
-      VC_STANDARD="TRUE"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   fi
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to turn warnings to errors" >&5
-$as_echo_n "checking whether to turn warnings to errors... " >&6; }
-if test -n "$enable_werror" && test "$enable_werror" != "no"; then
-   ENABLE_WERROR="TRUE"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Turning warnings to errors has no effect in modules or" >&5
-$as_echo "$as_me: WARNING: Turning warnings to errors has no effect in modules or" >&2;}
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: on platforms where it has been disabled explicitely" >&5
-$as_echo "$as_me: WARNING: on platforms where it has been disabled explicitely" >&2;}
-   echo "Turning warnings to errors has no effect in modules or on platforms where it has been disabled explicitely" >> warn
-else
-   ENABLE_WERROR="FALSE"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to do a debug build" >&5
-$as_echo_n "checking whether to do a debug build... " >&6; }
-if test -n "$enable_debug" && test "$enable_debug" != "no"; then
-   ENABLE_DEBUG="TRUE"
-   if test -z "$enable_symbols"; then
-      enable_symbols="yes"
-   fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-   ENABLE_DEBUG="FALSE"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with additional debug utilities" >&5
-$as_echo_n "checking whether to build with additional debug utilities... " >&6; }
-if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then
-   PROEXT=""
-   PRODUCT=""
-   PROFULLSWITCH=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-   PRODUCT="full"
-   PROFULLSWITCH="product=full"
-   PROEXT=".pro"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, full product build" >&5
-$as_echo "no, full product build" >&6; }
-fi
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include symbols into final build" >&5
-$as_echo_n "checking whether to include symbols into final build... " >&6; }
-if test -n "$enable_symbols" && test "$enable_symbols" != "no"; then
-	if test "$enable_symbols" = "yes" -o "$enable_symbols" = "TRUE"; then
-		ENABLE_SYMBOLS="TRUE"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
-			ENABLE_SYMBOLS="SMALL"
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, small ones" >&5
-$as_echo "yes, small ones" >&6; }
-		else if test "$enable_symbols" != "no" ; then
-			     echo enable symbols is: $enable_symbols
-			     as_fn_error $? "--enable-symbols only accepts yes, TRUE or SMALL as parameter." "$LINENO" 5
-           	     else
-              		     ENABLE_SYMBOLS=
-		     fi
-		fi
-	fi
-else
-   ENABLE_SYMBOLS=
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to strip the solver or not." >&5
-$as_echo_n "checking whether to strip the solver or not.... " >&6; }
-if test -n "$enable_strip_solver"; then
-   if test "$enable_strip_solver" = "yes"; then
-      DISABLE_STRIP=
-   else if test "$enable_strip_solver" = "no"; then
-           DISABLE_STRIP="TRUE"
-        else
-           as_fn_error $? "--disable-strip-solver only accepts yes or no as parameter." "$LINENO" 5
-        fi
-   fi
-else
-   if test -n "$ENABLE_SYMBOLS"; then
-      DISABLE_STRIP="TRUE"
-   else
-      DISABLE_STRIP=
-   fi
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable native CUPS support" >&5
-$as_echo_n "checking whether to enable native CUPS support... " >&6; }
-if test "$test_cups" = "yes" -a \( "$enable_cups" = "yes" -o "$enable_cups" = "TRUE" \) ; then
-   ENABLE_CUPS="TRUE"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-   ENABLE_CUPS=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable fontconfig support" >&5
-$as_echo_n "checking whether to enable fontconfig support... " >&6; }
-if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a \( "$enable_fontconfig" = "yes" -o "$enable_fontconfig" = "TRUE" \); then
-   ENABLE_FONTCONFIG="TRUE"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-   ENABLE_FONTCONFIG=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z $TARFILE_LOCATION; then
-   TARFILE_LOCATION="DEFAULT"
-fi
-
-
-if test -z "$enable_fetch_external" || test "$enable_fetch_external" = "yes" \
-   && test -z "$with_system_libs" -a "$with_system_jars" != "no"; then
-   DO_FETCH_TARBALLS="yes"
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable filters for legacy binary file formats (StarOffice 5.2)" >&5
-$as_echo_n "checking whether to enable filters for legacy binary file formats (StarOffice 5.2)... " >&6; }
-if test "$enable_binfilter" = "no"; then
-   WITH_BINFILTER="NO"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
-   WITH_BINFILTER="YES"
-   BUILD_TYPE="$BUILD_TYPE BINFILTER"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-
-
-if test "$_os" = "WINNT"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use DirectX" >&5
-$as_echo_n "checking whether to use DirectX... " >&6; }
-   if test "$enable_directx" = "yes" -o "$enable_directx" = "TRUE" -o "$enable_directx" = ""; then
-      ENABLE_DIRECTX="TRUE"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   else
-      ENABLE_DIRECTX=""
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   fi
-
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use ActiveX" >&5
-$as_echo_n "checking whether to use ActiveX... " >&6; }
-   if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then
-      DISABLE_ACTIVEX=""
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   else
-      DISABLE_ACTIVEX="TRUE"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   fi
-
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use ATL" >&5
-$as_echo_n "checking whether to use ATL... " >&6; }
-   if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE" -o "$enable_atl" = ""; then
-      DISABLE_ATL=""
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   else
-      DISABLE_ATL="TRUE"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   fi
-
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use RPATH in shared libraries" >&5
-$as_echo_n "checking whether to use RPATH in shared libraries... " >&6; }
-if test "$enable_rpath" = "no"; then
-   ENABLE_RPATH="no"
-else
-   ENABLE_RPATH="yes"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_RPATH" >&5
-$as_echo "$ENABLE_RPATH" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include MySpell dictionaries" >&5
-$as_echo_n "checking whether to include MySpell dictionaries... " >&6; }
-if test -z "$with_myspell_dicts" || test "$with_myspell_dicts" = "yes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  WITH_MYSPELL_DICTS=YES
-  BUILD_TYPE="$BUILD_TYPE DICTIONARIES"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  WITH_MYSPELL_DICTS=NO
-fi
-
-
-if test "$WITH_MYSPELL_DICTS" = "NO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use dicts from external paths" >&5
-$as_echo_n "checking whether to use dicts from external paths... " >&6; }
-  if test -n "$with_system_dicts" -a "$with_system_dicts" = "yes"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	SYSTEM_DICTS=YES
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for spelling dictionary directory" >&5
-$as_echo_n "checking for spelling dictionary directory... " >&6; }
-	if test -n "$with_external_dict_dir"; then
-		DICT_SYSTEM_DIR=file://$with_external_dict_dir
-	else
-		DICT_SYSTEM_DIR=file:///usr/share/hunspell
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DICT_SYSTEM_DIR" >&5
-$as_echo "$DICT_SYSTEM_DIR" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hyphenation patterns directory" >&5
-$as_echo_n "checking for hyphenation patterns directory... " >&6; }
-	if test -n "$with_external_hyph_dir"; then
-		HYPH_SYSTEM_DIR=file://$with_external_hyph_dir
-	else
-		HYPH_SYSTEM_DIR=file:///usr/share/hyphen
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HYPH_SYSTEM_DIR" >&5
-$as_echo "$HYPH_SYSTEM_DIR" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for thesaurus directory" >&5
-$as_echo_n "checking for thesaurus directory... " >&6; }
-	if test -n "$with_external_thes_dir"; then
-		THES_SYSTEM_DIR=file://$with_external_thes_dir
-	else
-		THES_SYSTEM_DIR=file:///usr/share/mythes
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $THES_SYSTEM_DIR" >&5
-$as_echo "$THES_SYSTEM_DIR" >&6; }
-  else
-  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  	SYSTEM_DICTS=NO
-  fi
-fi
-
-
-
-
-
-if test $_os = "WINNT"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking Windows build environment sanity" >&5
-$as_echo_n "checking Windows build environment sanity... " >&6; }
-                     if test -L $AWK -o -L `which awk` -o -L `which tar` -o -L `which gunzip` ; then
-         as_fn_error $? "$AWK, awk, tar or gunzip is a cygwin symlink!
-Native windows programs cannot use cygwin symlinks. Remove the symbolic
-link, and copy the program to the name of the link." "$LINENO" 5
-      fi
-                  CC=`echo $CC | $SED "s/^guw.exe //"`
-   CXX=`echo $CXX | $SED "s/^guw.exe //"`
-                  if test -n "$CC";then
-         if test "`$CC -dumpmachine 2>/dev/null | $SED -e 's/^.*-//'`" = "mingw32"; then
-            WITH_MINGWIN="yes"
-         fi
-      fi
-      if test "$WITH_MINGWIN" = "yes" ; then
-      if test -z "$CC"; then
-         CC="gcc -mno-cygwin"
-         CXX="g++ -mno-cygwin"
-      fi
-   fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
-
-
-if test "$_os" = "WINNT" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cygwin gcc/g++" >&5
-$as_echo_n "checking for cygwin gcc/g++... " >&6; }
-   if which gcc > /dev/null && which g++ > /dev/null ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
-   else
-      as_fn_error $? "cygwin gcc and g++ are needed, please install them." "$LINENO" 5
-   fi
-fi
-
-
-# Extract the first word of "bash", so it can be a program name with args.
-set dummy bash; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SHELLPATH+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $SHELLPATH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_SHELLPATH="$SHELLPATH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_SHELLPATH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-SHELLPATH=$ac_cv_path_SHELLPATH
-if test -n "$SHELLPATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHELLPATH" >&5
-$as_echo "$SHELLPATH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$SHELLPATH"; then
-   as_fn_error $? "bash not found in \$PATH" "$LINENO" 5
-else
-   SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"`
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc home" >&5
-$as_echo_n "checking gcc home... " >&6; }
-if test -z "$with_gcc_home"; then
-	GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,`
-else
-	GCC_HOME="$with_gcc_home"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_HOME" >&5
-$as_echo "$GCC_HOME" >&6; }
-
-
-save_CC=$CC
-save_CXX=$CXX
-
-if test -n "$with_gcc_home"; then
-   if test -z "$CC"; then
-      CC="$with_gcc_home/bin/gcc"
-   fi
-fi
-
-if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
-   ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-
-COMPATH=`dirname "$CC"`
-if test "$COMPATH" = "." ; then
-    for ac_prog in $CC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_COMPATH+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $COMPATH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_COMPATH="$COMPATH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_COMPATH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-COMPATH=$ac_cv_path_COMPATH
-if test -n "$COMPATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPATH" >&5
-$as_echo "$COMPATH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$COMPATH" && break
-done
-
-        COMPATH=`echo $COMPATH | $SED "s@/[^/:]*\\\$@@"`;
-fi
-COMPATH=`echo $COMPATH | $SED "s@/[Bb][Ii][Nn]\\\$@@"`;
-
-GCCVER=20995
-if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking the GNU gcc compiler version" >&5
-$as_echo_n "checking the GNU gcc compiler version... " >&6; }
-   _gcc_version=`$CC -dumpversion`
-   _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
-   GCCVER=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-
-   if test "$_gcc_major" -lt "3"; then
-      as_fn_error $? "found version \"$_gcc_version\", use version 3+ of the gcc compiler" "$LINENO" 5
-   else
-      if test "$GCCVER" -eq "030203"; then
-	    if test "$ENABLE_SYMBOLS" = "SMALL"; then
-           as_fn_error $? "version \"$_gcc_version\" gives internal error with small." "$LINENO" 5
-	    fi
-      fi
-   fi
-   if test "$_os" = "Darwin" -a "$GCCVER" -ge "040100" ; then
-      if test -z "$save_CC" -a -x "$GCC_HOME/bin/gcc-4.0" ; then
-         export CC=$GCC_HOME/bin/gcc-4.0
-                   GCCVER2=`"$CC" -dumpversion | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-         if test "$GCCVER2" -ge "040000" -a "$GCCVER2" -lt "040100" ; then
-            GCCVER=$GCCVER2
-         fi
-      fi
-      if test "$GCCVER" -ge "040100" ; then
-         as_fn_error $? "You need to use the gcc-4.0 compiler (gcc $_gcc_version won't work with the MacOSX10.4u.sdk) - set CC accordingly" "$LINENO" 5
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: implicitly using CC=$CC" >&5
-$as_echo "implicitly using CC=$CC" >&6; }
-      fi
-   else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (gcc $_gcc_version)" >&5
-$as_echo "checked (gcc $_gcc_version)" >&6; }
-   fi
-   if test "$_os" = "SunOS"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc linker" >&5
-$as_echo_n "checking gcc linker... " >&6; }
-      if $CC -Wl,--version 2>&1 |head -n 1| grep -v GNU > /dev/null;then
-          as_fn_error $? "failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" "$LINENO" 5
-      fi
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (GNU ld)" >&5
-$as_echo "ok (GNU ld)" >&6; }
-   fi
-fi
-
-
-HAVE_LD_BSYMBOLIC_FUNCTIONS=
-if test "$GCC" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Bsymbolic-functions linker support " >&5
-$as_echo_n "checking for -Bsymbolic-functions linker support ... " >&6; }
-   bsymbolic_functions_ldflags_save=$LDFLAGS
-   LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo"
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-   #include <stdio.h>
-
-int
-main ()
-{
-
-    printf ("hello world\n");
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  HAVE_LD_BSYMBOLIC_FUNCTIONS=TRUE
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-   if test "z$HAVE_LD_BSYMBOLIC_FUNCTIONS" = "zTRUE"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: found " >&5
-$as_echo "found " >&6; }
-   else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found " >&5
-$as_echo "not found " >&6; }
-   fi
-   LDFLAGS=$bsymbolic_functions_ldflags_save
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable pch feature" >&5
-$as_echo_n "checking whether to enable pch feature... " >&6; }
-if test -n "$enable_pch" && test "$enable_pch" != "no"; then
-   if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
-	   ENABLE_PCH="TRUE"
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   elif test "$GCC" = "yes" -a "$GCCVER" -gt "030400"; then
-	   ENABLE_PCH="TRUE"
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   else
-	   ENABLE_PCH=""
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Precompiled header not yet supported for your platform/compiler" >&5
-$as_echo "$as_me: WARNING: Precompiled header not yet supported for your platform/compiler" >&2;}
-   fi
-else
-   ENABLE_PCH=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
-$as_echo_n "checking for GNU make... " >&6; }
-for a in "$MAKE" $GNUMAKE make gmake gnumake; do
-      $a --version 2> /dev/null | grep GNU  2>&1 > /dev/null
-      if test $? -eq 0;  then
-           GNUMAKE=$a
-           break
-      fi
-done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUMAKE" >&5
-$as_echo "$GNUMAKE" >&6; }
-if test -z "$GNUMAKE"; then
-    as_fn_error $? "not found. install GNU make." "$LINENO" 5
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the GNU make version" >&5
-$as_echo_n "checking the GNU make version... " >&6; }
-_make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
-_make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-if test "$_make_longver" -ge "038100" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUMAKE $_make_version" >&5
-$as_echo "$GNUMAKE $_make_version" >&6; }
-else
-   as_fn_error $? "failed ($GNUMAKE version >= 3.81 needed" "$LINENO" 5
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU tar" >&5
-$as_echo_n "checking for GNU tar... " >&6; }
-for a in $GNUTAR gtar gnutar tar; do
-      $a --version 2> /dev/null | grep GNU  2>&1 > /dev/null
-      if test $? -eq 0;  then
-           GNUTAR=$a
-           break
-      fi
-done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUTAR" >&5
-$as_echo "$GNUTAR" >&6; }
-if test -z "$GNUTAR"; then
-    as_fn_error $? "not found. install GNU tar." "$LINENO" 5
-fi
-
-
-
-if test "$_os" = "SunOS"; then
-   if test "$CC" = "cc"; then
-      for ac_prog in cc
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path__cc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $_cc in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path__cc="$_cc" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-_cc=$ac_cv_path__cc
-if test -n "$_cc"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cc" >&5
-$as_echo "$_cc" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$_cc" && break
-done
-
-      COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking the SunStudio C/C++ compiler version" >&5
-$as_echo_n "checking the SunStudio C/C++ compiler version... " >&6; }
-            _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'`
-      _sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'`
-      _sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'`
-      if test "$_sunstudio_major" != "5"; then
-         as_fn_error $? "found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" "$LINENO" 5
-      else
-         _sunstudio_minor=`echo $_sunstudio_version | $AWK -F. '{ if ($2 == 5) print "true"; else if ($2 == 7) print "true"; else if ($2 == 8) print "true"; else if ($2 == 9) print "true"; else print "false" }'`
-         if test "$_sunstudio_minor" = "false"; then
-            as_fn_error $? "found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" "$LINENO" 5
-         else
-                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
-$as_echo "checked" >&6; }
-         fi
-      fi
-   fi
-fi
-
-if test "$GCC" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --hash-style=both linker support " >&5
-$as_echo_n "checking for --hash-style=both linker support ... " >&6; }
-   hash_style_ldflags_save=$LDFLAGS
-   LDFLAGS="$LDFLAGS -Wl,--hash-style=both"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-   #include <stdio.h>
-
-int
-main ()
-{
-
-    printf ("hello world\n");
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  HAVE_LD_HASH_STYLE=TRUE
-else
-  HAVE_LD_HASH_STYLE=FALSE
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-   if test "z$HAVE_LD_HASH_STYLE" = "zTRUE"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: found " >&5
-$as_echo "found " >&6; }
-   else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found " >&5
-$as_echo "not found " >&6; }
-   fi
-   LDFLAGS=$hash_style_ldflags_save
-fi
-
-
-if test "$_os" = "OSF1"; then
-   if test "$CC" = "cc"; then
-      for ac_prog in cc
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path__cc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $_cc in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path__cc="$_cc" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-_cc=$ac_cv_path__cc
-if test -n "$_cc"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cc" >&5
-$as_echo "$_cc" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$_cc" && break
-done
-
-      COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ******* $_cc , $COMPATH" >&5
-$as_echo "$as_me: WARNING: ******* $_cc , $COMPATH" >&2;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking the Compaq C compiler version" >&5
-$as_echo_n "checking the Compaq C compiler version... " >&6; }
-            _compaqc_version=`$CC -V 2>&1 | $AWK '{ print $3 }'`
-      _compaqc_major=`echo $_compaqc_version | $AWK -F. '{ print $1 }'`
-      if test "$_compaqc_major" != "T6"; then
-         as_fn_error $? "found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" "$LINENO" 5
-      else
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
-$as_echo "checked" >&6; }
-      fi
-   fi
-fi
-
-if test -z "$with_perl_home"; then
-   # Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PERL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PERL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PERL=$ac_cv_path_PERL
-if test -n "$PERL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
-$as_echo "$PERL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-else
-   if test "$_os" = "WINNT"; then
-      with_perl_home=`cygpath -u "$with_perl_home"`
-   fi
-   _perl_path="$with_perl_home/bin/perl"
-   if test -x "$_perl_path"; then
-      PERL=$_perl_path
-   else
-      as_fn_error $? "$_perl_path not found" "$LINENO" 5
-   fi
-fi
-
-if test "$PERL"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking the Perl version" >&5
-$as_echo_n "checking the Perl version... " >&6; }
-   ${PERL} -e "exit($]);"
-   _perl_version=$?
-   if test "$_perl_version" -lt 5; then
-      as_fn_error $? "found Perl version \"$_perl_version\", use version 5 of Perl" "$LINENO" 5
-   fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (perl $_perl_version)" >&5
-$as_echo "checked (perl $_perl_version)" >&6; }
-else
-   as_fn_error $? "Perl not found, install version 5 of Perl" "$LINENO" 5
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for required Perl modules" >&5
-$as_echo_n "checking for required Perl modules... " >&6; }
-if `$PERL -e 'use Archive::Zip;'`; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: all modules found" >&5
-$as_echo "all modules found" >&6; }
-else
-	as_fn_error $? "Failed to find some modules" "$LINENO" 5
-fi
-
-if test "$_os" = "WINNT"; then
-	if test "$WITH_MINGWIN" != "yes"; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for friendly registry keys" >&5
-$as_echo_n "checking for friendly registry keys... " >&6; }
-		# VS.Net 2003, VS.Net 2005
-		if test -z "$with_cl_home"; then
-			vctest=`./oowintool --msvc-productdir`;
-			if test -x "$vctest/bin/cl.exe"; then
-				with_cl_home=$vctest;
-			fi
-		else
-			with_cl_home=`cygpath -u "$with_cl_home"`
-		fi
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
-
-										if test -n "$with_mspdb_path";then
-			with_mspdb_path=`cygpath -u "$with_mspdb_path"`
-		fi
-		if test -e "$with_mspdb_path/mspdb71.dll" -o -e "$with_mspdb_path/mspdb80.dll"; then
-			MSPDB_PATH="$with_mspdb_path"
-		fi
-				if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb71.dll"; then
-			MSPDB_PATH="$with_cl_home/../Common7/IDE"
-		fi
-				if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb80.dll"; then
-			MSPDB_PATH="$with_cl_home/../Common7/IDE"
-		fi
-				if test -z "$MSPDB_PATH" -a -e "$with_cl_home/bin/mspdb80.dll"; then
-			MSPDB_PATH="$with_cl_home/bin"
-		fi
-
-		if test -z "$MSPDB_PATH";then
-						# Extract the first word of "mspdb80.dll", so it can be a program name with args.
-set dummy mspdb80.dll; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSPDB_PATH+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MSPDB_PATH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MSPDB_PATH="$MSPDB_PATH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MSPDB_PATH=$ac_cv_path_MSPDB_PATH
-if test -n "$MSPDB_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSPDB_PATH" >&5
-$as_echo "$MSPDB_PATH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-			# Extract the first word of "mspdb71.dll", so it can be a program name with args.
-set dummy mspdb71.dll; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSPDB_PATH+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MSPDB_PATH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MSPDB_PATH="$MSPDB_PATH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MSPDB_PATH=$ac_cv_path_MSPDB_PATH
-if test -n "$MSPDB_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSPDB_PATH" >&5
-$as_echo "$MSPDB_PATH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-			MSPDB_PATH=`dirname "$MSPDB_PATH"`
-		fi
-
-		if test -z "$MSPDB_PATH"; then
-			as_fn_error $? "You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" "$LINENO" 5
-		fi
-		MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
-		MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
-				PATH="$MSPDB_PATH:$PATH"
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the Microsoft C/C++ Compiler" >&5
-$as_echo_n "checking the Microsoft C/C++ Compiler... " >&6; }
-   		if test -x "$with_cl_home/bin/cl.exe"; then
-   			CC="$with_cl_home/bin/cl.exe"
-   		else
-   			# Extract the first word of "cl.exe", so it can be a program name with args.
-set dummy cl.exe; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CC in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CC="$CC" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_CC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CC=$ac_cv_path_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-   		fi
-  		if test -e "$CC"; then
-			# This gives us a posix path with 8.3 filename restrictions
-			CC=`cygpath -d "$CC"`
-			CC=`cygpath -u "$CC"`
-			# Remove /cl.exe from CC case insensitive
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found ($CC)" >&5
-$as_echo "found ($CC)" >&6; }
-			COMPATH=`echo $CC | $SED 's@\/[Bb][Ii][Nn]\/[cC][lL]\.[eE][xX][eE]@@'`
-			export INCLUDE=`cygpath -d "$COMPATH/Include"`
-						{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the Version of Microsoft C/C++ Compiler" >&5
-$as_echo_n "checking the Version of Microsoft C/C++ Compiler... " >&6; }
-			CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
-							x = match( \\\$0, /..\\...\\...../ )
-							CCversion = substr( \\\$0, RSTART, RLENGTH)
-							tokencount = split (CCversion,vertoken,\".\")
-							for ( i = 1 ; i <= tokencount ; i++ ) {
-								printf (\"%04d\",vertoken[i] )
-							}
-							}"`
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found Compiler version $CCNUMVER." >&5
-$as_echo "found Compiler version $CCNUMVER." >&6; }
-			if test "$CCNUMVER" -ge "001500000000"; then
-				COMEX=12
-				MSVSVER=2008
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found .NET 2008 / VS 9.0." >&5
-$as_echo "found .NET 2008 / VS 9.0." >&6; }
-			elif test "$CCNUMVER" -ge "001400000000"; then
-				COMEX=11
-				MSVSVER=2005
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found .NET 2005." >&5
-$as_echo "found .NET 2005." >&6; }
-			elif test "$CCNUMVER" -ge "001300102240"; then
-				COMEX=10
-				MSVSVER=2003
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found .NET 2003." >&5
-$as_echo "found .NET 2003." >&6; }
-			else
-				as_fn_error $? "Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." "$LINENO" 5
-			fi
-		else
-			as_fn_error $? "Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." "$LINENO" 5
-		fi
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the Mingwin32 C++ Compiler" >&5
-$as_echo_n "checking the Mingwin32 C++ Compiler... " >&6; }
-		if test `$CC -dumpmachine | $SED -e 's/^.*-//'` = "mingw32"; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found." >&5
-$as_echo "found." >&6; }
-			if $CC -dumpspecs | grep -q "mno-cygwin"; then
-				USE_MINGW="cygwin"
-			else
-				USE_MINGW="pure-mingw"
-			fi
-		else
-			as_fn_error $? "Mingwin32 C++ Compiler not found." "$LINENO" 5
-		fi
-	fi
-fi
-
-
-
-
-if test "$_os" = "WINNT"; then
-if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
-		# Extract the first word of "midl.exe", so it can be a program name with args.
-set dummy midl.exe; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MIDL_PATH+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MIDL_PATH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MIDL_PATH="$MIDL_PATH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MIDL_PATH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MIDL_PATH=$ac_cv_path_MIDL_PATH
-if test -n "$MIDL_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MIDL_PATH" >&5
-$as_echo "$MIDL_PATH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-	if test -n "$MIDL_PATH";then
-		MIDL_PATH=`dirname "$MIDL_PATH"`
-	fi
-	if test -n "$with_midl_path";then
-		with_midl_path=`cygpath -u "$with_midl_path"`
-	fi
-	if test -x "$with_midl_path/midl.exe"; then
-		MIDL_PATH="$with_midl_path"
-	fi
-	if test -z "$MIDL_PATH" -a -e "$with_cl_home/../Common7/Tools/Bin/midl.exe"; then
-		MIDL_PATH="$with_cl_home/../Common7/Tools/Bin"
-	fi
-	if test -z "$MIDL_PATH" ; then
-      vstest=`./oowintool --msvs-productdir`;
-      if test -x "$vstest/Common7/Tools/Bin/midl.exe" ; then
-		  MIDL_PATH="$vstest/Common7/Tools/Bin"
-      fi
-	fi
-	if test -z "$MIDL_PATH" ; then
-		psdktest=`./oowintool --psdk-home`
-		if test -x "$psdktest/Bin/midl.exe" ; then
-			MIDL_PATH="$psdktest/Bin"
-		fi
-	fi
-	if test ! -x "$MIDL_PATH/midl.exe"; then
-		as_fn_error $? "midl.exe not found. Make sure it's in the path or use --with-midl-path" "$LINENO" 5
-	fi
-	# Convert to posix path with 8.3 filename restrictions ( No spaces )
-	MIDL_PATH=`cygpath -d "$MIDL_PATH"`
-	MIDL_PATH=`cygpath -u "$MIDL_PATH"`
-
-		# Extract the first word of "csc.exe", so it can be a program name with args.
-set dummy csc.exe; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CSC_PATH+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CSC_PATH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CSC_PATH="$CSC_PATH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_CSC_PATH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CSC_PATH=$ac_cv_path_CSC_PATH
-if test -n "$CSC_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CSC_PATH" >&5
-$as_echo "$CSC_PATH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-	if test -n "$CSC_PATH";then
-		CSC_PATH=`dirname "$CSC_PATH"`
-	fi
-	if test -n "$with_csc_path";then
-		with_csc_path=`cygpath -u "$with_csc_path"`
-	fi
-	if test -x "$with_csc_path/csc.exe"; then
-		CSC_PATH="$with_csc_path"
-	else
-	   csctest=`./oowintool --csc-compilerdir`;
-	   if test -x "$csctest/csc.exe"; then
-	      CSC_PATH="$csctest"
-	   fi
-	fi
-	if test ! -x "$CSC_PATH/csc.exe"; then
-		as_fn_error $? "csc.exe not found. Make sure it's in the path or use --with-csc-path" "$LINENO" 5
-	fi
-	# Convert to posix path with 8.3 filename restrictions ( No spaces )
-	CSC_PATH=`cygpath -d "$CSC_PATH"`
-	CSC_PATH=`cygpath -u "$CSC_PATH"`
-
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking .NET Framework" >&5
-$as_echo_n "checking .NET Framework... " >&6; }
-	    if test -n "$with_frame_home"; then
-		with_frame_home=`cygpath -u "$with_frame_home"`
-	    fi
-	    if test -f "$with_frame_home/lib/mscoree.lib"; then
-		    FRAME_HOME="$with_frame_home"
-	    fi
-	    if test -z "$FRAME_HOME" -a -e "$with_cl_home/../SDK/v1.1/lib/mscoree.lib"; then
-		    FRAME_HOME="$with_cl_home/../SDK/v1.1"
-	    fi
-	    if test -z "$FRAME_HOME" ; then
-          frametest=`./oowintool --dotnetsdk-dir`
-          if test -f "$frametest/lib/mscoree.lib"; then
-             FRAME_HOME="$frametest"
-          else
-             frametest=`./oowintool --psdk-home`
-             if test -f "$frametest/lib/mscoree.lib"; then
-                FRAME_HOME="$frametest"
-             fi
-          fi
-	    fi
-	    if test ! -f "$FRAME_HOME/lib/mscoree.lib"; then
-		as_fn_error $? "mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" "$LINENO" 5
-	    fi
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
-	# Convert to posix path with 8.3 filename restrictions ( No spaces )
-	FRAME_HOME=`cygpath -d "$FRAME_HOME"`
-	FRAME_HOME=`cygpath -u "$FRAME_HOME"`
-fi
-
-
-
-fi
-
-if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
-   ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-fi
-
-if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
-   ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-  fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-   if test "$_os" = "SunOS"; then
-      CPP=$CXXCPP
-   else
-      ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-   fi
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5 ; }
-   else
-     ac_cv_sizeof_long=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-
-SIZEOF_LONG=$ac_cv_sizeof_long
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_bigendian=unknown
-    # See if we're dealing with a universal compiler.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __APPLE_CC__
-	       not a universal capable compiler
-	     #endif
-	     typedef int dummy;
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-	# Check for potential -arch flags.  It is not universal unless
-	# there are at least two -arch flags with different values.
-	ac_arch=
-	ac_prev=
-	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-	 if test -n "$ac_prev"; then
-	   case $ac_word in
-	     i?86 | x86_64 | ppc | ppc64)
-	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-		 ac_arch=$ac_word
-	       else
-		 ac_cv_c_bigendian=universal
-		 break
-	       fi
-	       ;;
-	   esac
-	   ac_prev=
-	 elif test "x$ac_word" = "x-arch"; then
-	   ac_prev=arch
-	 fi
-       done
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if sys/param.h defines the BYTE_ORDER macro.
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-	     #include <sys/param.h>
-
-int
-main ()
-{
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-		     && LITTLE_ENDIAN)
-	      bogus endian macros
-	     #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-		#include <sys/param.h>
-
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
-		 not big endian
-		#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-	      bogus endian macros
-	     #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-
-int
-main ()
-{
-#ifndef _BIG_ENDIAN
-		 not big endian
-		#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # Compile a test program.
-      if test "$cross_compiling" = yes; then :
-  # Try to guess by grepping values from an object file.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-short int ascii_mm[] =
-		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii[] =
-		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-		int use_ascii (int i) {
-		  return ascii_mm[i] + ascii_ii[i];
-		}
-		short int ebcdic_ii[] =
-		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm[] =
-		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-		int use_ebcdic (int i) {
-		  return ebcdic_mm[i] + ebcdic_ii[i];
-		}
-		extern int foo;
-
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-	      ac_cv_c_bigendian=yes
-	    fi
-	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-	      if test "$ac_cv_c_bigendian" = unknown; then
-		ac_cv_c_bigendian=no
-	      else
-		# finding both strings is unlikely to happen, but who knows?
-		ac_cv_c_bigendian=unknown
-	      fi
-	    fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-
-	     /* Are we little or big endian?  From Harbison&Steele.  */
-	     union
-	     {
-	       long int l;
-	       char c[sizeof (long int)];
-	     } u;
-	     u.l = 1;
-	     return u.c[sizeof (long int) - 1] == 1;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_c_bigendian=no
-else
-  ac_cv_c_bigendian=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-    fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
-   yes)
-     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
-;; #(
-   no)
-      ;; #(
-   universal)
-
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-
-     ;; #(
-   *)
-     as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;;
- esac
-
-WORDS_BIGENDIAN=$ac_cv_c_bigendian
-
-
-# Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
-  enableval=$enable_largefile;
-fi
-
-if test "$enable_largefile" != no; then
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if test "${ac_cv_sys_largefile_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_sys_largefile_CC=no
-     if test "$GCC" != yes; then
-       ac_save_CC=$CC
-       while :; do
-	 # IRIX 6.2 and later do not support large files by default,
-	 # so use the C compiler's -n32 option if that helps.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-	 if ac_fn_c_try_compile "$LINENO"; then :
-  break
-fi
-rm -f core conftest.err conftest.$ac_objext
-	 CC="$CC -n32"
-	 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_largefile_CC=' -n32'; break
-fi
-rm -f core conftest.err conftest.$ac_objext
-	 break
-       done
-       CC=$ac_save_CC
-       rm -f conftest.$ac_ext
-    fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-$as_echo "$ac_cv_sys_largefile_CC" >&6; }
-  if test "$ac_cv_sys_largefile_CC" != no; then
-    CC=$CC$ac_cv_sys_largefile_CC
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _FILE_OFFSET_BITS 64
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=64; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_file_offset_bits=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
-case $ac_cv_sys_file_offset_bits in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-_ACEOF
-;;
-esac
-rm -rf conftest*
-  if test $ac_cv_sys_file_offset_bits = unknown; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if test "${ac_cv_sys_large_files+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _LARGE_FILES 1
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=1; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_large_files=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-$as_echo "$ac_cv_sys_large_files" >&6; }
-case $ac_cv_sys_large_files in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGE_FILES $ac_cv_sys_large_files
-_ACEOF
-;;
-esac
-rm -rf conftest*
-  fi
-fi
-
-if test -n "$ac_cv_sys_file_offset_bits"; then
-   LFS_CFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
-fi
-if test -n "$ac_cv_sys_large_files" && test "$ac_cv_sys_large_files" != "no"; then
-   LFS_CFLAGS="$LFS_CFLAGS -D_LARGE_FILES"
-fi
-
-
-if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then
-         VALGRIND_CFLAGS=""
-   prev_cppflags=$CPPFLAGS
-   if test -z "$VALGRIND_CFLAGS"; then
-      CPPFLAGS="-I/usr/include/valgrind"
-      ac_fn_c_check_header_mongrel "$LINENO" "valgrind.h" "ac_cv_header_valgrind_h" "$ac_includes_default"
-if test "x$ac_cv_header_valgrind_h" = x""yes; then :
-  VALGRIND_CFLAGS=$CPPFLAGS
-else
-  unset ac_cv_header_valgrind_h
-fi
-
-
-   fi
-   if test -z "$VALGRIND_CFLAGS"; then
-      CPPFLAGS="-I/usr/local/include/valgrind"
-      ac_fn_c_check_header_mongrel "$LINENO" "valgrind.h" "ac_cv_header_valgrind_h" "$ac_includes_default"
-if test "x$ac_cv_header_valgrind_h" = x""yes; then :
-  VALGRIND_CFLAGS=$CPPFLAGS
-fi
-
-
-   fi
-   if test -n "$VALGRIND_CFLAGS"; then
-      CPPFLAGS=$VALGRIND_CFLAGS
-      ac_fn_c_check_header_mongrel "$LINENO" "memcheck.h" "ac_cv_header_memcheck_h" "$ac_includes_default"
-if test "x$ac_cv_header_memcheck_h" = x""yes; then :
-
-else
-  VALGRIND_CFLAGS=""
-fi
-
-
-   fi
-   CPPFLAGS=$prev_cppflags
-fi
-
-
-if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then
-    ac_fn_c_check_header_mongrel "$LINENO" "cups/cups.h" "ac_cv_header_cups_cups_h" "$ac_includes_default"
-if test "x$ac_cv_header_cups_cups_h" = x""yes; then :
-
-else
-  as_fn_error $? "cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" "$LINENO" 5
-fi
-
-
-fi
-
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "GNU"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable pam support" >&5
-$as_echo_n "checking whether to enable pam support... " >&6; }
-  if test -z "$enable_pam" || test "$enable_pam" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    PAM=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "security/pam_appl.h" "ac_cv_header_security_pam_appl_h" "$ac_includes_default"
-if test "x$ac_cv_header_security_pam_appl_h" = x""yes; then :
-
-else
-  as_fn_error $? "pam_appl.h could not be found. libpam-dev or pam-devel missing?" "$LINENO" 5
-fi
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to link to libpam" >&5
-$as_echo_n "checking whether to link to libpam... " >&6; }
-    if test -n "$enable_pam_link" -a "$enable_pam_link" != "no"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-      PAM_LINK=YES
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
-$as_echo_n "checking for pam_start in -lpam... " >&6; }
-if test "${ac_cv_lib_pam_pam_start+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpam  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pam_start ();
-int
-main ()
-{
-return pam_start ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pam_pam_start=yes
-else
-  ac_cv_lib_pam_pam_start=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5
-$as_echo "$ac_cv_lib_pam_pam_start" >&6; }
-if test "x$ac_cv_lib_pam_pam_start" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPAM 1
-_ACEOF
-
-  LIBS="-lpam $LIBS"
-
-else
-  as_fn_error $? "libpam not found or functional" "$LINENO" 5
-fi
-
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, dynamically open it" >&5
-$as_echo "no, dynamically open it" >&6; }
-      PAM_LINK=NO
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    PAM=NO
-    PAM_LINK=NO
-
-
-    ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how many arguments getspnam_r() takes" >&5
-$as_echo_n "checking how many arguments getspnam_r() takes... " >&6; }
-
-    if test "${ac_cv_func_which_getspnam_r+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-
-
-################################################################
-
-ac_cv_func_which_getspnam_r=unknown
-
-#
-# ONE ARGUMENT (sanity check)
-#
-
-# This should fail, as there is no variant of getspnam_r() that takes
-# a single argument. If it actually compiles, then we can assume that
-# netdb.h is not declaring the function, and the compiler is thereby
-# assuming an implicit prototype. In which case, we're out of luck.
-#
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-	    #include <sys/types.h>
-	    #include <shadow.h>
-
-int
-main ()
-{
-
-	    const char *name = "myname";
-	    getspnam_r(name) /* ; */
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_func_which_getspnam_r=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-#
-# FIVE ARGUMENTS
-#
-
-if test "$ac_cv_func_which_getspnam_r" = "unknown"; then
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-	    #include <sys/types.h>
-	    #include <shadow.h>
-
-int
-main ()
-{
-
-	    char buffer[] = { '\0' };
-	    struct spwd spwdStruct;
-	    const char *name = "myname";
-	    getspnam_r(name, &spwdStruct, buffer, sizeof buffer, 0) /* ; */
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_func_which_getspnam_r=five
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-
-#
-# FOUR ARGUMENTS
-#
-
-if test "$ac_cv_func_which_getspnam_r" = "unknown"; then
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-	    #include <sys/types.h>
-	    #include <shadow.h>
-
-int
-main ()
-{
-
-	    char buffer[] = { '\0' };
-	    struct spwd spwdStruct;
-	    const char *name = "myname";
-	    getspnam_r(name, &spwdStruct, buffer, sizeof buffer) /* ; */
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_func_which_getspnam_r=four
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-
-################################################################
-
-
-fi
-
-case "$ac_cv_func_which_getspnam_r" in
-    five)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: five" >&5
-$as_echo "five" >&6; }
-    NEW_SHADOW_API=YES
-    ;;
-
-    four)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: four" >&5
-$as_echo "four" >&6; }
-    ;;
-
-    no)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot find function declaration in shadow.h" >&5
-$as_echo "cannot find function declaration in shadow.h" >&6; }
-    ;;
-
-    unknown)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't tell" >&5
-$as_echo "can't tell" >&6; }
-    ;;
-
-    *)
-    as_fn_error $? "internal error" "$LINENO" 5
-    ;;
-esac
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-  fi
-fi
-
-
-
-
-if test "$_os" = "Linux"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to link to libcrypt" >&5
-$as_echo_n "checking whether to link to libcrypt... " >&6; }
-    if test -n "$enable_crypt_link" -a "$enable_crypt_link" != "no"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-        CRYPT_LINK=YES
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
-$as_echo_n "checking for crypt in -lcrypt... " >&6; }
-if test "${ac_cv_lib_crypt_crypt+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypt  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char crypt ();
-int
-main ()
-{
-return crypt ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_crypt_crypt=yes
-else
-  ac_cv_lib_crypt_crypt=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
-$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCRYPT 1
-_ACEOF
-
-  LIBS="-lcrypt $LIBS"
-
-else
-  as_fn_error $? "libcrypt not found or functional" "$LINENO" 5
-fi
-
-    else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, dynamically open it" >&5
-$as_echo "no, dynamically open it" >&6; }
-        CRYPT_LINK=NO
-    fi
-fi
-
-
-if test -n "$with_gcc_home"; then
-   if test -z "$CXX"; then
-      CXX="$with_gcc_home/bin/g++"
-   fi
-fi
-
-if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
-   if test -e "$CC"; then
-      CXX="$CC"
-   fi
-fi
-
-if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
-   ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-  fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-
-if test "$GXX" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking the GNU C++ compiler version" >&5
-$as_echo_n "checking the GNU C++ compiler version... " >&6; }
-
-   _gpp_version=`$CXX -dumpversion`
-   _gpp_majmin=`echo $_gpp_version | $AWK -F. '{ print \$1*100+\$2 }'`
-
-   if test "$_os" = "Darwin" -a "$_gpp_majmin" -ge "401" ; then
-      if test -z "$save_CXX" -a -x "$GCC_HOME/bin/g++-4.0" ; then
-         CXX=$GCC_HOME/bin/g++-4.0
-         _gpp_majmin_2=`"$CXX" -dumpversion | $AWK -F. '{ print \$1*100+\$2 }'`
-         if test "$_gpp_majmin_2" -ge "400" -a "$_gpp_majmin_2" -lt "401" ; then
-            _gpp_majmin=$_gpp_majmin_2
-         fi
-      fi
-      if test "$_gpp_majmin" -ge "401" ; then
-         as_fn_error $? "You need to use the g++-4.0 compiler (g++ $_gpp_version won't work with the MacOSX10.4u.sdk) - set CXX accordingly" "$LINENO" 5
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: implicitly using CXX=$CXX" >&5
-$as_echo "implicitly using CXX=$CXX" >&6; }
-      fi
-   else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (g++ $_gpp_version)" >&5
-$as_echo "checked (g++ $_gpp_version)" >&6; }
-   fi
-
-   if test "$_gpp_majmin" = "304"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX has the enum bug" >&5
-$as_echo_n "checking whether $CXX has the enum bug... " >&6; }
-if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-extern "C" void abort (void);
-extern "C" void exit (int status);
-
-enum E { E0, E1, E2, E3, E4, E5 };
-
-void
-test (enum E e)
-{
-  if (e == E2 || e == E3 || e == E1)
-  exit (1);
-}
-
-int
-main (void)
-{
-  test (E4);
-  test (E5);
-  test (E0);
-  return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  as_fn_error $? "your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." "$LINENO" 5
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-   fi
-fi
-
-# Removed the special FreeBSD treatment. The problem was that with_gxx_include_path
-# often contains an i386 which is expanded as a macro. Solved in stlport.
-if test "$GXX" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for g++ include path" >&5
-$as_echo_n "checking for g++ include path... " >&6; }
-   if test -z "$with_gxx_include_path"; then
-      with_gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-      if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then
-          with_gxx_include_path="/usr/include"
-      fi
-      if test "$WITH_MINGWIN" = "yes"; then
-         with_gxx_include_path=`cygpath -d "$with_gxx_include_path"`
-         with_gxx_include_path=`cygpath -u "$with_gxx_include_path"`
-      fi
-      if echo $with_gxx_include_path | grep -q linux; then
-         # workaround for Mandriva - issue 100049
-         with_gxx_include_path=`cd $with_gxx_include_path && pwd`
-      fi
-   fi
-fi
-if test -z "$with_gxx_include_path"; then
-   with_gxx_include_path="NO_GXX_INCLUDE"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no g++ includes" >&5
-$as_echo "no g++ includes" >&6; }
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_gxx_include_path" >&5
-$as_echo "$with_gxx_include_path" >&6; }
-fi
-GXX_INCLUDE_PATH="$with_gxx_include_path"
-
-
-if test "$WITH_MINGWIN" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mingwin runtime include path" >&5
-$as_echo_n "checking for mingwin runtime include path... " >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
-#include <stddef.h>
-#include <bits/c++config.h>
-_ACEOF
-   _mingw_lib_include_path=`$CXX -E -xc++ conftest.$ac_ext | $SED -n -e '/.*1*"\(.*\)\/stddef.h".*/s//\1/p' -e '/.*1*"\(.*\)\/bits\/c++config.h".*/s//\1/p' | sort -u | xargs echo`
-   rm conftest.$ac_ext
-   if test -n "$_mingw_lib_include_path"; then
-      _temp=""
-      for a in $_mingw_lib_include_path
-         do
-            a=`cygpath -d "$a"`
-            _temp="$_temp "`cygpath -u "$a"`
-         done
-      _mingw_lib_include_path=$_temp
-   fi
-   if test -z "$_mingw_lib_include_path"; then
-      _mingw_lib_include_path="NO_LIB_INCLUDE"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no mingwin runtime includes" >&5
-$as_echo "no mingwin runtime includes" >&6; }
-   else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_mingw_lib_include_path" >&5
-$as_echo "$_mingw_lib_include_path" >&6; }
-   fi
-  MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path"
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mingwin c++ backward include path" >&5
-$as_echo_n "checking for mingwin c++ backward include path... " >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
-#include <hash_set>
-_ACEOF
-   _mingw_backward_include_path=`$CXX -E -xc++ -Wno-deprecated conftest.$ac_ext 2>&5| $SED -n -e '/.*1*"\(.*\)\/hash_set".*/s//\1/p' | sort -u | xargs echo`
-   rm conftest.$ac_ext
-   if test -n "$_mingw_backward_include_path"; then
-      _mingw_backward_include_path=`cygpath -d $_mingw_backward_include_path`
-      _mingw_backward_include_path=`cygpath -u $_mingw_backward_include_path`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_mingw_backward_include_path" >&5
-$as_echo "$_mingw_backward_include_path" >&6; }
-   else
-      _mingw_backward_include_path="NO_BACKWARD_INCLUDE"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no mingwin c++ backward includes" >&5
-$as_echo "no mingwin c++ backward includes" >&6; }
-   fi
-  MINGW_BACKWARD_INCLUDE_PATH="$_mingw_backward_include_path"
-
-  mingw_crtbegin=`$CC -print-file-name=crtbegin.o`
-  MINGW_CLIB_DIR=`dirname $mingw_crtbegin`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use dynamic libgcc" >&5
-$as_echo_n "checking whether to use dynamic libgcc... " >&6; }
-  if test -e "$MINGW_CLIB_DIR/libgcc_s.a"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic libgcc name" >&5
-$as_echo_n "checking dynamic libgcc name... " >&6; }
-    MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | sed -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | sed -e 's@_@?@g'`
-    MINGW_GCCDLL=`cd $COMPATH/bin && ls $MINGW_GCCDLL_pattern 2>/dev/null`
-    if test -n "$MINGW_GCCDLL"; then
-        MINGW_SHARED_GCCLIB=YES
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: use $MINGW_GCCDLL" >&5
-$as_echo "use $MINGW_GCCDLL" >&6; }
-    else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  fi
-  if test -e "$MINGW_CLIB_DIR/libgcc_eh.a"; then
-      MINGW_GCCLIB_EH=YES
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use dynamic libstdc++" >&5
-$as_echo_n "checking whether to use dynamic libstdc++... " >&6; }
-  MINGW_SHARED_LIBSTDCPP=
-  if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then
-    MINGW_SHARED_LIBSTDCPP=stdc++_s
-  fi
-  if test -e "$MINGW_CLIB_DIR/libstdc++.dll.a" ; then
-    MINGW_SHARED_LIBSTDCPP=stdc++.dll
-  fi
-  if test -n "$MINGW_SHARED_LIBSTDCPP" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic libstdc++ name" >&5
-$as_echo_n "checking dynamic libstdc++ name... " >&6; }
-    MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/lib$MINGW_SHARED_LIBSTDCPP.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'`
-    MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`
-    if test -n "$MINGW_GXXDLL"; then
-        MINGW_SHARED_LIBSTDCPP=-l$MINGW_SHARED_LIBSTDCPP
-        MINGW_SHARED_GXXLIB=YES
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: use $MINGW_GXXDLL" >&5
-$as_echo "use $MINGW_GXXDLL" >&6; }
-    else
-        MINGW_SHARED_LIBSTDCPP=
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  fi
-  MINGW_CLIB_DIR=`cygpath $MINGW_CLIB_DIR`
-
-
-
-
-
-
-
-fi
-
-if test "$_os" = "SunOS"; then
-      if test "$CC" = "cc"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking SunStudio C++ Compiler" >&5
-$as_echo_n "checking SunStudio C++ Compiler... " >&6; }
-      if test "$CXX" != "CC"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SunStudio C++ was not found" >&5
-$as_echo "$as_me: WARNING: SunStudio C++ was not found" >&2;}
-         echo "SunStudio C++ was not found" >> warn
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
-$as_echo "checked" >&6; }
-      fi
-   fi
-fi
-if test "$_os" = "OSF1"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking Compaq C++ compiler version" >&5
-$as_echo_n "checking Compaq C++ compiler version... " >&6; }
-      _compaqcxx_version=`$CXX -V 2>&1 | $AWK '{ print $3 }'`
-   _compaqcxx_major=`echo $_compaqcxx_version | $AWK -F. '{ print $1 }'`
-   if test "$_compaqcxx_major" != "V6"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&5
-$as_echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&2;}
-      echo "found version $_compaqc_version, use version 6 of the Compaq C++ compiler" >> warn
-   else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
-$as_echo "checked" >&6; }
-   fi
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking exception type" >&5
-$as_echo_n "checking exception type... " >&6; }
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-if test "$WITH_MINGWIN" = "yes"; then
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <iostream>
-
-extern "C" void _Unwind_SjLj_RaiseException(void) __attribute__ ((__noreturn__));
-
-
-int
-main ()
-{
-_Unwind_SjLj_RaiseException()
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  exceptions_type="sjlj"
-else
-  exceptions_type="dwarf2"
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $exceptions_type" >&5
-$as_echo "$exceptions_type" >&6; }
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-EXCEPTIONS="$exceptions_type"
-
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking what the default STL should be" >&5
-$as_echo_n "checking what the default STL should be... " >&6; }
-   DEFAULT_TO_STLPORT="no"
-   if test "$_os" = "Linux"; then
-     case "$build_cpu" in
-       i?86)
-	 case "$build_os" in k*bsd*-gnu*)
-	 	DEFAULT_TO_STLPORT="no"
-		;;
-	 *)
-         	DEFAULT_TO_STLPORT="yes"
-		;;
-	  esac
-         ;;
-       *)
-         DEFAULT_TO_STLPORT="no"
-         ;;
-     esac
-   elif test "$_os" = "SunOS"; then
-      DEFAULT_TO_STLPORT="yes"
-   elif test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
-      DEFAULT_TO_STLPORT="yes"
-   elif test "$_os" = "OS2"; then
-      DEFAULT_TO_STLPORT="yes"
-   elif test "$_os" = "FreeBSD"; then
-      DEFAULT_TO_STLPORT="yes"
-   fi
-   if test "$DEFAULT_TO_STLPORT" = "yes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: stlport" >&5
-$as_echo "stlport" >&6; }
-   else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: system" >&5
-$as_echo "system" >&6; }
-   fi
-   if test "$WITH_STLPORT" = "auto"; then
-      WITH_STLPORT=$DEFAULT_TO_STLPORT
-   fi
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for STL providing headers" >&5
-$as_echo_n "checking for STL providing headers... " >&6; }
-   STLPORT4=""
-   USE_SYSTEM_STL=""
-   if test "$WITH_STLPORT" = "yes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: using internal stlport." >&5
-$as_echo "using internal stlport." >&6; }
-      if test "$DEFAULT_TO_STLPORT" != "yes"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5
-$as_echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;}
-         echo "using stlport. Warning, breaks your ABI compatability!" >>warn
-      fi
-   elif test "$WITH_STLPORT" = "no"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: using system STL" >&5
-$as_echo "using system STL" >&6; }
-      USE_SYSTEM_STL="YES"
-      if test "$DEFAULT_TO_STLPORT" != "no"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using system STL. Warning, breaks your ABI compatability!" >&5
-$as_echo "$as_me: WARNING: using system STL. Warning, breaks your ABI compatability!" >&2;}
-         echo "using system STL. Warning, breaks your ABI compatability!" >>warn
-      fi
-   else
-      STLPORT4=$WITH_STLPORT
-      if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$STLPORT4/stlport/hash_map
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked." >&5
-$as_echo "checked." >&6; }
-else
-  as_fn_error $? "STLport headers not found." "$LINENO" 5
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-      else
-                  if test -f "$STLPORT4/stlport/hash_map"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked." >&5
-$as_echo "checked." >&6; }
-         else
-            as_fn_error $? "STLport headers not found." "$LINENO" 5
-         fi
-      fi
-      if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for STLport libraries" >&5
-$as_echo_n "checking for STLport libraries... " >&6; }
-         if test "$_os" = "SunOS"; then
-		      if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then
-			      { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
-$as_echo "checked" >&6; }
-		      elif test -f "$STLPORT4/lib/libstlport.so"; then
-			      { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
-$as_echo "checked" >&6; }
-			      STLPORT_VER=500
-		      else
-			      as_fn_error $? "STLport libraries not found" "$LINENO" 5
-		      fi
-	      elif test "$_os" = "Darwin"; then
-		      if test -f "$STLPORT4/lib/libstlport_gcc.dylib"; then
-			      { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
-$as_echo "checked" >&6; }
-		      elif test -f "$STLPORT4/lib/libstlport.dylib"; then
-			      { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
-$as_echo "checked" >&6; }
-			      STLPORT_VER=500
-		      else
-			      as_fn_error $? "STLport libraries not found" "$LINENO" 5
-		      fi
-		   else
-			   if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
-				   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
-$as_echo "checked" >&6; }
-			   elif test -f "$STLPORT4/lib/libstlport.so"; then
-				   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
-$as_echo "checked" >&6; }
-				   STLPORT_VER=500
-			   else
-				   as_fn_error $? "STLport libraries not found" "$LINENO" 5
-			   fi
-		   fi
-	   fi
-      if test "$DEFAULT_TO_STLPORT" != "yes"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5
-$as_echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;}
-         echo "using stlport. Warning, breaks your ABI compatability!" >>warn
-      fi
-   fi
-
-if test -z "$STLPORT4"; then
-  STLPORT4="NO_STLPORT4"
-fi
-if test -z "$STLPORT_VER"; then
-  STLPORT_VER=400
-fi
-
-
-
-
-if test "$GCC" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fvisibility=hidden" >&5
-$as_echo_n "checking whether $CC supports -fvisibility=hidden... " >&6; }
-   save_CFLAGS=$CFLAGS
-   CFLAGS="$CFLAGS -fvisibility=hidden"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-   HAVE_GCC_VISIBILITY_FEATURE=TRUE
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-   CFLAGS=$save_CFLAGS
-   if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   fi
-fi
-
-# ===================================================================
-# use --ccache-skip?
-# ===================================================================
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are allowed and able to use --ccache-skip" >&5
-$as_echo_n "checking whether we are allowed and able to use --ccache-skip... " >&6; }
-if test "$_os" != "Darwin" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: only used on Mac currently, skipping" >&5
-$as_echo "only used on Mac currently, skipping" >&6; }
-elif test "$enable_ccache_skip" = "no" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - diabled explicitly" >&5
-$as_echo "no - diabled explicitly" >&6; }
-elif test "$enable_ccache_skip" = "yes" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - enabled explicitly, skipping checks" >&5
-$as_echo "yes - enabled explicitly, skipping checks" >&6; }
-   USE_CCACHE=YES
-
-elif test "$enable_ccache_skip" = "auto" ; then
-   # checking for ccache presence/version
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: probing..." >&5
-$as_echo "probing..." >&6; }
-   # Extract the first word of "ccache", so it can be a program name with args.
-set dummy ccache; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CCACHE+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CCACHE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CCACHE="$CCACHE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_CCACHE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_CCACHE" && ac_cv_path_CCACHE="not_found"
-  ;;
-esac
-fi
-CCACHE=$ac_cv_path_CCACHE
-if test -n "$CCACHE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCACHE" >&5
-$as_echo "$CCACHE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-   if test "$CCACHE" = "not_found" ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: not enabling --ccache-skip (ccache not found)" >&5
-$as_echo "$as_me: not enabling --ccache-skip (ccache not found)" >&6;}
-   else
-      # check ccache version
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether version of ccache is suitable" >&5
-$as_echo_n "checking whether version of ccache is suitable... " >&6; }
-      CCACHE_VERSION=`"$CCACHE" -V | "$AWK" '/^ccache version/{print $3}'`
-      if test "$CCACHE_VERSION" = "2.4_OOo"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ccache is actually used for the build" >&5
-$as_echo_n "checking whether ccache is actually used for the build... " >&6; }
-         ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-         save_CXXFLAGS=$CXXFLAGS
-         CXXFLAGS="$CXXFLAGS --ccache-skip -O2"
-                  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  use_ccache=yes
-else
-  use_ccache=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-         if test $use_ccache = yes ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, will enable --ccache-skip" >&5
-$as_echo "yes, will enable --ccache-skip" >&6; }
-            USE_CCACHE=YES
-
-         else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, will not enable --ccache-skip" >&5
-$as_echo "no, will not enable --ccache-skip" >&6; }
-         fi
-         CXXFLAGS=$save_CXXFLAGS
-         ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-         { $as_echo "$as_me:${as_lineno-$LINENO}: ccache version $CCACHE_VERSION not accepted. See description for --enable-ccache-skip" >&5
-$as_echo "$as_me: ccache version $CCACHE_VERSION not accepted. See description for --enable-ccache-skip" >&6;}
-      fi
-   fi
-else
-   as_fn_error $? "invalid option to --enable-ccache-skip. Valid values are \"auto\", \"yes\" and \"no\"" "$LINENO" 5
-fi
-
-if test "$USE_SYSTEM_STL" = "YES"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if hash_map will be in __gnu_cxx namespace" >&5
-$as_echo_n "checking if hash_map will be in __gnu_cxx namespace... " >&6; }
-   ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ext/hash_map>
-using namespace __gnu_cxx;
-
-int
-main ()
-{
-hash_map<int, int> t; return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_cxx_have_ext_hash_map=yes
-else
-  ac_cv_cxx_have_ext_hash_map=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-   if test "$ac_cv_cxx_have_ext_hash_map" = "no"; then
-      as_fn_error $? "Can't find hash_map. Try with --with-stlport" "$LINENO" 5
-   else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_have_ext_hash_map" >&5
-$as_echo "$ac_cv_cxx_have_ext_hash_map" >&6; }
-   fi
-
-   if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if STL headers are visibility safe" >&5
-$as_echo_n "checking if STL headers are visibility safe... " >&6; }
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "visibility push" >/dev/null 2>&1; then :
-  stlvisok=yes
-else
-  stlvisok=no
-fi
-rm -f conftest*
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $stlvisok" >&5
-$as_echo "$stlvisok" >&6; }
-      if test "$stlvisok" = "no"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&5
-$as_echo "$as_me: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&2;}
-         echo "Your gcc STL headers are not visibility safe. Disabling visibility" >> warn
-         unset HAVE_GCC_VISIBILITY_FEATURE
-      fi
-   fi
-
-   if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
-      sharedlink_ldflags_save=$LDFLAGS
-      LDFLAGS="$LDFLAGS -fvisibility-inlines-hidden -fpic -shared"
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc is -fvisibility-inlines-hidden safe with STL headers" >&5
-$as_echo_n "checking if gcc is -fvisibility-inlines-hidden safe with STL headers... " >&6; }
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sstream>
-using namespace std;
-
-int
-main ()
-{
-istringstream strm( "test" ); return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  $EGREP -q  unresolvable conftest.err;
-      if test $? -eq 0; then gccvisok=no; else gccvisok=yes; fi
-else
-  gccvisok=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gccvisok" >&5
-$as_echo "$gccvisok" >&6; }
-      if test "$gccvisok" = "no"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&5
-$as_echo "$as_me: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&2;}
-         echo "Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >> warn
-         unset HAVE_GCC_VISIBILITY_FEATURE
-      fi
-
-      LDFLAGS=$sharedlink_ldflags_save
-   fi
-
-   if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)" >&5
-$as_echo_n "checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)... " >&6; }
-      cat >visibility.cxx <<_ACEOF
-#pragma GCC visibility push(hidden)
-struct __attribute__ ((visibility ("default"))) TestStruct {
-  static void Init();
-};
-__attribute__ ((visibility ("default"))) void TestFunc() {
-  TestStruct::Init();
-}
-_ACEOF
-      if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx 2>/dev/null > /dev/null; then
-         gccvisbroken=yes
-      else
-         case "$build_cpu" in
-            i?86|x86_64)
-               if $EGREP -q '@PLT' visibility.s; then
-                  gccvisbroken=no
-               else
-                  gccvisbroken=yes
-               fi
-               ;;
-            *)
-               gccvisbroken=no
-               ;;
-         esac
-      fi
-      rm -f visibility.s
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gccvisbroken" >&5
-$as_echo "$gccvisbroken" >&6; }
-      if test "$gccvisbroken" = "yes"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&5
-$as_echo "$as_me: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&2;}
-         echo "Your gcc is not -fvisibility=hidden safe. Disabling visibility" >> warn
-         unset HAVE_GCC_VISIBILITY_FEATURE
-      fi
-   fi
-
-   ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which memory allocator to use" >&5
-$as_echo_n "checking which memory allocator to use... " >&6; }
-if test "$with_alloc" = "system"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: system" >&5
-$as_echo "system" >&6; }
-    ALLOC="SYS_ALLOC";
-    for ac_func in malloc realloc calloc free
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-fi
-if test "$with_alloc" = "tcmalloc"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: tcmalloc" >&5
-$as_echo "tcmalloc" >&6; }
-    if ! echo $build_cpu | grep -E 'i[3456]86' 2>/dev/null >/dev/null; then
-        as_fn_error $? "tcmalloc only available/usable on ix86" "$LINENO" 5
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -ltcmalloc" >&5
-$as_echo_n "checking for malloc in -ltcmalloc... " >&6; }
-if test "${ac_cv_lib_tcmalloc_malloc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltcmalloc  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char malloc ();
-int
-main ()
-{
-return malloc ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_tcmalloc_malloc=yes
-else
-  ac_cv_lib_tcmalloc_malloc=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tcmalloc_malloc" >&5
-$as_echo "$ac_cv_lib_tcmalloc_malloc" >&6; }
-if test "x$ac_cv_lib_tcmalloc_malloc" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBTCMALLOC 1
-_ACEOF
-
-  LIBS="-ltcmalloc $LIBS"
-
-else
-  as_fn_error $? "tcmalloc not found or functional. Install the Google Profiling Tools" "$LINENO" 5
-fi
-
-    ALLOC="TCMALLOC";
-fi
-if test "$with_alloc" = "jemalloc"; then
-  if test "$_os" != "FreeBSD" -o "$_os" != "NetBSD"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: jemalloc" >&5
-$as_echo "jemalloc" >&6; }
-    save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -pthread"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -ljemalloc" >&5
-$as_echo_n "checking for malloc in -ljemalloc... " >&6; }
-if test "${ac_cv_lib_jemalloc_malloc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ljemalloc  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char malloc ();
-int
-main ()
-{
-return malloc ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_jemalloc_malloc=yes
-else
-  ac_cv_lib_jemalloc_malloc=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jemalloc_malloc" >&5
-$as_echo "$ac_cv_lib_jemalloc_malloc" >&6; }
-if test "x$ac_cv_lib_jemalloc_malloc" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBJEMALLOC 1
-_ACEOF
-
-  LIBS="-ljemalloc $LIBS"
-
-else
-  as_fn_error $? "jemalloc not found or functional. Install the jemalloc allocator." "$LINENO" 5
-fi
-
-    ALLOC="JEMALLOC";
-    CFLAGS=$save_CFLAGS
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: system" >&5
-$as_echo "system" >&6; }
-    ALLOC="SYS_ALLOC";
-    for ac_func in malloc realloc calloc free
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-  fi
-fi
-if test "$with_alloc" = "internal" -o -z "$with_alloc"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to add custom build version" >&5
-$as_echo_n "checking whether to add custom build version... " >&6; }
-if test "z$with_build_version" != "z"; then
-   BUILD_VER_STRING=$with_build_version
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $BUILD_VER_STRING" >&5
-$as_echo "yes, $BUILD_VER_STRING" >&6; }
-else
-   BUILD_VER_STRING=
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with Java support" >&5
-$as_echo_n "checking whether to build with Java support... " >&6; }
-if test "$WITH_JAVA" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   SOLAR_JAVA="TRUE"
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   SOLAR_JAVA=""
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: building without java will mean some features will not be available" >&5
-$as_echo "$as_me: WARNING: building without java will mean some features will not be available" >&2;}
-   echo "building without java will mean some features will not be available" >>warn
-fi
-
-
-if test "$_os" = "Linux" && test "$build_cpu" = "powerpc"; then
-   # IBMs JDK needs this...
-   JITC_PROCESSOR_TYPE=6
-   export JITC_PROCESSOR_TYPE
-fi
-
-if test "$_os" = "WINNT"; then
-   if test -z "$with_jdk_home"; then
-      _jdk_home=`./oowintool --jdk-home`
-       if test -d "$_jdk_home"; then
-          with_jdk_home="$_jdk_home"
-       fi
-   else
-      with_jdk_home=`cygpath -u "$with_jdk_home"`
-   fi
-fi
-
-if test "$SOLAR_JAVA" != ""; then
-   JAVA_HOME=; export JAVA_HOME
-   if test -z "$with_jdk_home"; then
-      # Extract the first word of "$WITH_JAVA", so it can be a program name with args.
-set dummy $WITH_JAVA; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVAINTERPRETER+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $JAVAINTERPRETER in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_JAVAINTERPRETER="$JAVAINTERPRETER" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_JAVAINTERPRETER="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-JAVAINTERPRETER=$ac_cv_path_JAVAINTERPRETER
-if test -n "$JAVAINTERPRETER"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAINTERPRETER" >&5
-$as_echo "$JAVAINTERPRETER" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-   else
-      _java_path="$with_jdk_home/bin/$WITH_JAVA"
-            if test -x "$_java_path"; then
-         JAVAINTERPRETER=$_java_path
-      else
-         as_fn_error $? "$_java_path not found set with_jdk_home" "$LINENO" 5
-      fi
-   fi
-   if test "$_os" = "WINNT"; then
-      if test x`echo "$JAVAINTERPRETER" | grep -i '\.exe$'` = x; then
-          JAVAINTERPRETER="${JAVAINTERPRETER}.exe"
-      fi
-      JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"`
-      JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"`
-   elif test "$_os" = "Darwin"; then
-                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to pass -d32 to Java interpreter" >&5
-$as_echo_n "checking whether to pass -d32 to Java interpreter... " >&6; }
-      if "$JAVAINTERPRETER" -d32 >&5 2>&5; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-         JAVAIFLAGS=-d32
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      fi
-   fi
-fi
-
-if test "$SOLAR_JAVA" != ""; then
-   _gij_longver=0
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking the installed JDK" >&5
-$as_echo_n "checking the installed JDK... " >&6; }
-   if test -n "$JAVAINTERPRETER"; then
-            if test `$JAVAINTERPRETER -version 2>&1 | grep -c "Kaffe"` -gt 0; then
-         as_fn_error $? "No valid check available. Please check the block for your desired java in configure.in" "$LINENO" 5
-#        dnl Kaffe specific tests
-#        KAFFE_VER=`$JAVAINTERPRETER -version 2>&1 | $EGREP "  Version:" | $SED -r "s/.*  Version: ([[0-9\.]]*).*/\1/"`
-#        if test -z "$KAFFE_VER"; then
-#          AC_MSG_ERROR([looks like Kaffe but version detection failed])
-#        fi
-#        _kaffe_ver=`echo "$KAFFE_VER" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
-#        if test "$_kaffe_ver" -lt 10100; then
-#           AC_MSG_ERROR([Kaffe is too old ($KAFFE_VER - $_kaffe_ver), you need at least 1.1.0])
-#        fi
-#        JDK=kaffe
-#
-#        dnl TODO: define some project exclusion variables
-#
-#        AC_MSG_RESULT([checked (Kaffe $KAFFE_VER)])
-#        AC_MSG_WARN([EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile])
-#        echo "EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile" >>warn
-#        JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
-      elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then
-        JDK=gcj
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (gcj)" >&5
-$as_echo "checked (gcj)" >&6; }
-        _gij_version=`$JAVAINTERPRETER --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
-        _gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-
-      elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "BEA"` -gt 0; then
-         as_fn_error $? "No valid check available. Please check the block for your desired java in configure.in" "$LINENO" 5
-#        JDK=bea
-#
-#        dnl BEA JDK specific tests
-#        _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
-#        _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
-#
-#        if test "$_jdk_ver" -lt 10500; then
-#          AC_MSG_ERROR([JDK is too old, you need at least BEA JDK 1.5.0])
-#        fi
-#
-#        AC_MSG_RESULT([checked (BEA JDK $_jdk)])
-#
-#        if test "$with_jdk_home" = ""; then
-#             AC_MSG_ERROR([In order to successfully build OpenOffice.org using the BEA JDK,
-#you must use the "--with-jdk-home" configure option explicitly])
-#        fi
-#
-#        AC_MSG_WARN([A bug in certain BEA JREs can prevent you from successfully compiling some modules])
-#        echo "A bug in certain BEA JREs can prevent you from successfully compiling some modules" >>warn
-#
-#        JAVA_HOME=$with_jdk_home
-#
-      elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "IBM"` -gt 0; then
-        JDK=ibm
-
-                _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[-A-Za-z]*//`
-        _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
-
-        if test "$_jdk_ver" -lt 10500; then
-             as_fn_error $? "IBM JDK is too old, you need at least 1.5" "$LINENO" 5
-        fi
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (IBM JDK $_jdk)" >&5
-$as_echo "checked (IBM JDK $_jdk)" >&6; }
-
-        if test "$with_jdk_home" = ""; then
-             as_fn_error $? "In order to successfully build OpenOffice.org using the IBM JDK,
-you must use the \"--with-jdk-home\" configure option explicitly" "$LINENO" 5
-        fi
-
-        JAVA_HOME=$with_jdk_home
-
-      else
-        JDK=sun
-
-                _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[-A-Za-z]*//`
-        _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
-
-        if test "$_jdk_ver" -lt 10500; then
-             as_fn_error $? "JDK is too old, you need at least 1.5" "$LINENO" 5
-        fi
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (JDK $_jdk)" >&5
-$as_echo "checked (JDK $_jdk)" >&6; }
-        JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
-        if test "$_os" = "WINNT"; then
-          JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[eE][xX][eE]$,,"`
-        fi
-        if test "$_os" = "OS2"; then
-          JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[eE][xX][eE]$,,"`
-        fi
-      fi
-   else
-      as_fn_error $? "JAVA not found. You need at least jdk-1.5, or gcj-4" "$LINENO" 5
-   fi
-else
-      JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
-fi
-
-if test "$SOLAR_JAVA" != ""; then
-    if test "$JDK" = "gcj"; then
-        javacompiler=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
-    else
-        javacompiler="javac"
-    fi
-    if test "$_os" = "OS2"; then
-      if test x`echo "$javacompiler" | grep -i '\.exe$'` = x; then
-          javacompiler="${javacompiler}.exe"
-      fi
-    fi
-    if test -z "$with_jdk_home"; then
-        # Extract the first word of "$javacompiler", so it can be a program name with args.
-set dummy $javacompiler; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVACOMPILER+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $JAVACOMPILER in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_JAVACOMPILER="$JAVACOMPILER" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_JAVACOMPILER="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-JAVACOMPILER=$ac_cv_path_JAVACOMPILER
-if test -n "$JAVACOMPILER"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVACOMPILER" >&5
-$as_echo "$JAVACOMPILER" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    else
-        _javac_path="$with_jdk_home/bin/$javacompiler"
-                if test -x "$_javac_path"; then
-            JAVACOMPILER=$_javac_path
-        fi
-    fi
-    if test -z "$JAVACOMPILER"; then
-      as_fn_error $? "$javacompiler not found set with_jdk_home" "$LINENO" 5
-    fi
-    if test "$_os" = "WINNT"; then
-       if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then
-          JAVACOMPILER="${JAVACOMPILER}.exe"
-       fi
-       JAVACOMPILER=`cygpath -d "$JAVACOMPILER"`
-       JAVACOMPILER=`cygpath -u "$JAVACOMPILER"`
-    fi
-    if test "$_os" = "OS2"; then
-       if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then
-          JAVACOMPILER="${JAVACOMPILER}.exe"
-       fi
-    fi
-
-    if test `$JAVACOMPILER -version 2>&1 | grep -c "Eclipse Java Compiler"` -gt 0; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking re-checking JDK" >&5
-$as_echo_n "checking re-checking JDK... " >&6; }
-        JDK=gcj
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (ecj)" >&5
-$as_echo "checked (ecj)" >&6; }
-        #TODO: what's to do here? some switch to do 1.5 compiling?
-        JAVAFLAGS="-source 1.5 -target 1.5"
-        _gij_longver="40200"
-    fi
-fi
-
-JAVACISGCJ=""
-if test "$SOLAR_JAVA" != ""; then
-    if test `$JAVACOMPILER --version 2>&1 | grep -c "GCC"` -gt 0; then
-        JAVACISGCJ="yes"
-    fi
-fi
-
-
-if test "$SOLAR_JAVA" != ""; then
-    if test -z "$with_jdk_home"; then
-        # Extract the first word of "javadoc", so it can be a program name with args.
-set dummy javadoc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVADOC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $JAVADOC in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_JAVADOC="$JAVADOC" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-JAVADOC=$ac_cv_path_JAVADOC
-if test -n "$JAVADOC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVADOC" >&5
-$as_echo "$JAVADOC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    else
-        _javadoc_path="$with_jdk_home/bin/javadoc"
-        if test "$_os" = "OS2"; then
-          if test x`echo "$_javadoc_path" | grep -i '\.exe$'` = x; then
-              _javadoc_path="${_javadoc_path}.exe"
-          fi
-        fi
-                if test -x "$_javadoc_path"; then
-            JAVADOC=$_javadoc_path
-        else
-            # Extract the first word of "javadoc", so it can be a program name with args.
-set dummy javadoc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVADOC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $JAVADOC in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_JAVADOC="$JAVADOC" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-JAVADOC=$ac_cv_path_JAVADOC
-if test -n "$JAVADOC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVADOC" >&5
-$as_echo "$JAVADOC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-        fi
-    fi
-    if test -z "$JAVADOC"; then
-      as_fn_error $? "$_javadoc_path not found set with_jdk_home" "$LINENO" 5
-    fi
-    if test "$_os" = "WINNT"; then
-        if test x`echo "$JAVADOC" | grep -i '\.exe$'` = x; then
-            JAVADOC="${JAVADOC}.exe"
-        fi
-        JAVADOC=`cygpath -d "$JAVADOC"`
-        JAVADOC=`cygpath -u "$JAVADOC"`
-    fi
-    if test "$_os" = "OS2"; then
-        if test x`echo "$JAVADOC" | grep -i '\.exe$'` = x; then
-            JAVADOC="${JAVADOC}.exe"
-        fi
-    fi
-fi
-
-if test "$SOLAR_JAVA" != ""; then
-        if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then
-      if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
-        cat > findhome.java <<_ACEOF
-import java.io.File;
-
-class findhome
-{
-    public static void main(String args[])
-    {
-        String jrelocation = System.getProperty("java.home");
-        File jre = new File(jrelocation);
-        System.out.println(jre.getParent());
-    }
-}
-_ACEOF
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if javac works" >&5
-$as_echo_n "checking if javac works... " >&6; }
-        javac_cmd="$JAVACOMPILER findhome.java 1>&2"
-        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$javac_cmd\""; } >&5
-  (eval $javac_cmd) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-        if test $? = 0 && test -f ./findhome.class ; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: javac works" >&5
-$as_echo "javac works" >&6; }
-        else
-          echo "configure: javac test failed" >&5
-          cat findhome.java >&5
-          as_fn_error $? "javac does not work - java projects will not build!" "$LINENO" 5
-        fi
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gij knows its java.home" >&5
-$as_echo_n "checking if gij knows its java.home... " >&6; }
-        JAVA_HOME=`$JAVAINTERPRETER findhome`
-        if test $? = 0 && test "$JAVA_HOME" != "" ; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVA_HOME" >&5
-$as_echo "$JAVA_HOME" >&6; }
-        else
-          echo "configure: java test failed" >&5
-          cat findhome.java >&5
-          as_fn_error $? "gij does not know its java.home - use --with-jdk-home" "$LINENO" 5
-        fi
-      else
-        JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$WITH_JAVA,,p"`
-      fi
-    fi
-
-        if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then
-      # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
-      if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
-         javac_link_f=`readlink -f "$JAVACOMPILER" 2>/dev/null`
-         if test $? == 0 && test "$JAVACOMPILER" != "$javac_link_f"; then
-          # try to recover first by looking whether we have a alternatives
-          # system as in Debian or newer SuSEs where following /usr/bin/javac
-          # over /etc/alternatives/javac leads to the right bindir where we
-          # just need to strip a bit away to get a valid JAVA_HOME
-          # Solaris 11 is even worse, because target is relative, so use -f
-            JAVA_HOME="$javac_link_f"
-         elif readlink $JAVACOMPILER >/dev/null 2>/dev/null; then
-          # Darwin readlink(1) is so primitive it doesn't even support -f
-          # maybe only one level of symlink (e.g. on Mac)
-            JAVA_HOME=`readlink $JAVACOMPILER`
-         else
-          # else warn
-          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&5
-$as_echo "$as_me: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&2;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&5
-$as_echo "$as_me: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&2;}
-          echo "JAVA_HOME is set to /usr - this is very likely to be incorrect" >> warn
-          echo "if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >> warn
-          fi
-                  if test "$JAVA_HOME" != "/usr"; then
-            if test "$_os" = "Darwin"; then
-                              JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/Current/Commands/javac$,/CurrentJDK/Home,)
-                              JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/CurrentJDK/Commands/javac$,/CurrentJDK/Home,)
-            else
-               JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/bin/javac$,,)
-            fi
-         fi
-      fi
-      # now check if $JAVA_HOME is really valid
-      if test "$_os" = "Darwin"; then
-         if test ! -f "$JAVA_HOME/lib/jvm.cfg" -a "x$with_jdk_home" = "x"; then
-            JAVA_HOME_OK="NO"
-         fi
-      elif test ! -d "$JAVA_HOME/jre" -a "x$with_jdk_home" = "x"; then
-         JAVA_HOME_OK="NO"
-      fi
-      if test "$JAVA_HOME_OK" = "NO"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&5
-$as_echo "$as_me: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&2;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&5
-$as_echo "$as_me: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&2;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&5
-$as_echo "$as_me: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&2;}
-         echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn
-         echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
-         echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
-#         if test "$JDK" = "gcj"; then
-#             echo "e.g. install java-1.4.2-gcj-compat-devel and use --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn
-#         fi
-      fi
-    fi
-fi
-
-AWTLIB=
-if test "$SOLAR_JAVA" != ""; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jawt lib name" >&5
-$as_echo_n "checking for jawt lib name... " >&6; }
-   if test "$JDK" = "gcj"; then
-      save_CFLAGS=$CFLAGS
-      save_LDFLAGS=$LDFLAGS
-      CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-      LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
-      exec 6>/dev/null # no output
-      ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default"
-if test "x$ac_cv_header_jni_h" = x""yes; then :
-
-else
-  as_fn_error $? "jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" "$LINENO" 5
-fi
-
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAWT_GetAWT in -lgcjawt" >&5
-$as_echo_n "checking for JAWT_GetAWT in -lgcjawt... " >&6; }
-if test "${ac_cv_lib_gcjawt_JAWT_GetAWT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgcjawt  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char JAWT_GetAWT ();
-int
-main ()
-{
-return JAWT_GetAWT ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_gcjawt_JAWT_GetAWT=yes
-else
-  ac_cv_lib_gcjawt_JAWT_GetAWT=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gcjawt_JAWT_GetAWT" >&5
-$as_echo "$ac_cv_lib_gcjawt_JAWT_GetAWT" >&6; }
-if test "x$ac_cv_lib_gcjawt_JAWT_GetAWT" = x""yes; then :
-   AWTLIB="-lgcjawt -lgcj"
-fi
-
-      exec 6>&1 # output on again
-      CFLAGS=$save_CFLAGS
-      LDFLAGS=$save_LDFLAGS
-   fi
-   # IBM SDK 1.5.0-sr5 includes libjawt.so with unresolved symbols.
-   # A workaround is to link also against libpmawt.so
-   if test "$JDK" = "ibm" ; then
-      save_CFLAGS=$CFLAGS
-      save_LDFLAGS=$LDFLAGS
-      save_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-      CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-      LDFLAGS="$LDFLAGS -L$JAVA_HOME/jre/bin"
-      LD_LIBRARY_PATH=$JAVA_HOME/jre/bin:$JAVA_HOME/jre/bin/classic:$JAVA_HOME/jre/bin/xawt:$LD_LIBRARY_PATH
-      export LD_LIBRARY_PATH
-      exec 6>/dev/null # no output
-      ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default"
-if test "x$ac_cv_header_jni_h" = x""yes; then :
-
-else
-  as_fn_error $? "jni.h could not be found." "$LINENO" 5
-fi
-
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAWT_GetAWT in -ljawt" >&5
-$as_echo_n "checking for JAWT_GetAWT in -ljawt... " >&6; }
-if test "${ac_cv_lib_jawt_JAWT_GetAWT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ljawt  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char JAWT_GetAWT ();
-int
-main ()
-{
-return JAWT_GetAWT ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_jawt_JAWT_GetAWT=yes
-else
-  ac_cv_lib_jawt_JAWT_GetAWT=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jawt_JAWT_GetAWT" >&5
-$as_echo "$ac_cv_lib_jawt_JAWT_GetAWT" >&6; }
-if test "x$ac_cv_lib_jawt_JAWT_GetAWT" = x""yes; then :
-   AWTLIB="-ljawt"
-fi
-
-      if test -z "$AWTLIB"; then
-         LDFLAGS="$LDFLAGS -L$JAVA_HOME/jre/bin/xawt -ljawt"
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAWT_GetAWT in -lmawt" >&5
-$as_echo_n "checking for JAWT_GetAWT in -lmawt... " >&6; }
-if test "${ac_cv_lib_mawt_JAWT_GetAWT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmawt  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char JAWT_GetAWT ();
-int
-main ()
-{
-return JAWT_GetAWT ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_mawt_JAWT_GetAWT=yes
-else
-  ac_cv_lib_mawt_JAWT_GetAWT=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mawt_JAWT_GetAWT" >&5
-$as_echo "$ac_cv_lib_mawt_JAWT_GetAWT" >&6; }
-if test "x$ac_cv_lib_mawt_JAWT_GetAWT" = x""yes; then :
-   AWTLIB="-L$JAVA_HOME/jre/bin/xawt -ljawt -lmawt"
-fi
-
-      fi
-      exec 6>&1 # output on again
-      CFLAGS=$save_CFLAGS
-      LDFLAGS=$save_LDFLAGS
-      LD_LIBRARY_PATH=$save_LD_LIBRARY_PATH
-   fi
-   if test -z "$AWTLIB"; then
-      AWTLIB=-ljawt
-   fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWTLIB" >&5
-$as_echo "$AWTLIB" >&6; }
-
-fi
-
-if test "$SOLAR_JAVA" != ""; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable gcj aot compilation" >&5
-$as_echo_n "checking whether to enable gcj aot compilation... " >&6; }
-  if test -n "$enable_gcjaot" && test "$enable_gcjaot" != "no"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-     if test `echo $WITH_JAVA | grep -c "gij"` -eq 0; then
-        gcjaot="gcj"
-     else
-        gcjaot=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g"`
-     fi
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcjaot" >&5
-$as_echo "$gcjaot" >&6; }
-     if test -n "$with_jdk_home"; then
-        _javac_path="$with_jdk_home/bin/$gcjaot"
-                if test -x "$_javac_path"; then
-           JAVAAOTCOMPILER=$_javac_path
-        fi
-     fi
-     if test -z "$JAVAAOTCOMPILER"; then
-        # Extract the first word of "$gcjaot", so it can be a program name with args.
-set dummy $gcjaot; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVAAOTCOMPILER+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $JAVAAOTCOMPILER in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_JAVAAOTCOMPILER="$JAVAAOTCOMPILER" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_JAVAAOTCOMPILER="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-JAVAAOTCOMPILER=$ac_cv_path_JAVAAOTCOMPILER
-if test -n "$JAVAAOTCOMPILER"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAAOTCOMPILER" >&5
-$as_echo "$JAVAAOTCOMPILER" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-     fi
-     if test -z "$JAVAAOTCOMPILER"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $gcjaot not found, set with_jdk_home" >&5
-$as_echo "$as_me: WARNING: $gcjaot not found, set with_jdk_home" >&2;}
-     fi
-  else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  fi
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-# Extract the first word of "dmake", so it can be a program name with args.
-set dummy dmake; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DMAKE+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $DMAKE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_DMAKE="$DMAKE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_DMAKE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_DMAKE" && ac_cv_path_DMAKE="no"
-  ;;
-esac
-fi
-DMAKE=$ac_cv_path_DMAKE
-if test -n "$DMAKE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DMAKE" >&5
-$as_echo "$DMAKE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test "$DMAKE" = "no"; then
-    BUILD_DMAKE=YES
-    echo "dmake will be built on ./bootstrap"
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the found dmake is the right dmake" >&5
-$as_echo_n "checking whether the found dmake is the right dmake... " >&6; }
-    # we need to find out whether that dmake we found is "our" dmake
-    # or the dmake from Sun's SunStudio Compiler which is something
-    # different
-    # This test _should_ work because the one accepts -V (ours) and one
-    # (the other) not...
-    $DMAKE -V 2>/dev/null | grep 'dmake .* Version .*' >/dev/null
-    if test $? -eq 0; then
-       BUILD_DMAKE=NO
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking the dmake version" >&5
-$as_echo_n "checking the dmake version... " >&6; }
-       DMAKE_VERSION=`$DMAKE -V | $AWK '$3 == "Version" {print $4}'`
-       if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK, >= 4.11" >&5
-$as_echo "OK, >= 4.11" >&6; }
-       elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \
-	    test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "11"; then
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK, >= 4.11" >&5
-$as_echo "OK, >= 4.11" >&6; }
-       else
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: too old. >= 4.11 is needed" >&5
-$as_echo "too old. >= 4.11 is needed" >&6; }
-	 echo "A newer dmake will be built on ./bootstrap"
-	 BUILD_DMAKE=YES
-       fi
-    else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-       echo "dmake will be built on ./bootstrap"
-       BUILD_DMAKE=YES
-    fi
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable EPM for packing" >&5
-$as_echo_n "checking whether to enable EPM for packing... " >&6; }
-if test "$enable_epm" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            if test "$_os" != "WINNT"; then
-      if test -n "$with_epm"; then
-	      EPM=$with_epm
-      else
-         # Extract the first word of "epm", so it can be a program name with args.
-set dummy epm; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_EPM+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $EPM in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_EPM="$EPM" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_EPM="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_EPM" && ac_cv_path_EPM="no"
-  ;;
-esac
-fi
-EPM=$ac_cv_path_EPM
-if test -n "$EPM"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EPM" >&5
-$as_echo "$EPM" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-      fi
-      if test "$EPM" = "no" || test "$EPM" = "internal"; then
-         echo "EPM will be built."
-         BUILD_EPM=YES
-         BUILD_TYPE="$BUILD_TYPE EPM"
-      else
-         # Gentoo has some epm which is something different...
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the found epm is the right epm" >&5
-$as_echo_n "checking whether the found epm is the right epm... " >&6; }
-         if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-         else
-            as_fn_error $? "no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" "$LINENO" 5
-         fi
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking epm version" >&5
-$as_echo_n "checking epm version... " >&6; }
-         EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//`
-	 if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \
-	       test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.' -f2`" -ge "7"; then
-           { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK, >= 3.7" >&5
-$as_echo "OK, >= 3.7" >&6; }
-           BUILD_EPM=NO
-	        if test "$_os" = "Darwin"; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking which PackageMaker EPM thinks to use" >&5
-$as_echo_n "checking which PackageMaker EPM thinks to use... " >&6; }
-        	      _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1`
-        	      if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then
-          		      as_fn_error $? "$_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" "$LINENO" 5
-        	      elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then
-          		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_pm, ok" >&5
-$as_echo "$_pm, ok" >&6; }
-        	      else # we never should get here, but go safe
-			          as_fn_error $? "$_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" "$LINENO" 5
-		          fi
-	       fi
-	 else
-           { $as_echo "$as_me:${as_lineno-$LINENO}: result: too old. epm >= 3.7 is required." >&5
-$as_echo "too old. epm >= 3.7 is required." >&6; }
-           echo "EPM will be built."
-           BUILD_EPM=YES
-           BUILD_TYPE="$BUILD_TYPE EPM"
-	 fi
-      fi
-   fi
-
-   # test which package format to use
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking which package format to use" >&5
-$as_echo_n "checking which package format to use... " >&6; }
-
-   # defaults
-   case "$_os" in
-	OS2)
-		PKGFORMAT=native
-		;;
-	Darwin)
-		PKGFORMAT=dmg
-		;;
-	SunOS)
-		PKGFORMAT=pkg
-		;;
-	Linux)
-      # if building on Debian, default should be deb...
-      if test -e /etc/debian_version; then
-         PKGFORMAT=deb
-      else
-         PKGFORMAT=rpm
-      fi
-		;;
-	AIX)
-		PKGFORMAT=aix
-		;;
-	*BSD)
-		PKGFORMAT=bsd
-		;;
-	OSF1)
-		PKGFORMAT=setld
-		;;
-    WINNT)
-        PKGFORMAT=msi
-        ;;
-	# we never should get here since we check the arciecture/os at the beginning,
-	# but go sure...
-	*)
-		as_fn_error $? "unknown system" "$LINENO" 5
-   esac
-   if test -n "$with_package_format"; then
-	for i in $with_package_format; do
-		case "$i" in
-			aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable | archive | dmg | installed | msi)
-			;;
-		*)
-			as_fn_error $? "unsupported format $i. Supported by EPM are:
-aix - AIX software distribution
-bsd - FreeBSD, NetBSD, or OpenBSD software distribution
-depot or swinstall - HP-UX software distribution
-deb - Debian software distribution
-inst or tardist - IRIX software distribution
-osx - MacOS X software distribution
-pkg - Solaris software distribution
-rpm - RedHat software distribution
-setld - Tru64 (setld) software distribution
-native - \"Native\" software distribution for the platform
-portable - Portable software distribution
-OOo additionally supports:
-archive - .tar.gz or .zip
-dmg - Mac OS X .dmg
-installed - installation tree
-msi - Windows .msi
-			" "$LINENO" 5
-			;;
-		esac
-	done
-	PKGFORMAT="$with_package_format"
-   fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGFORMAT" >&5
-$as_echo "$PKGFORMAT" >&6; }
-   if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rpm" >&5
-$as_echo_n "checking for rpm... " >&6; }
-      for a in "$RPM" rpmbuild rpm; do
-         $a --usage >/dev/null 2> /dev/null
-         if test $? -eq 0; then
-            RPM=$a
-            break
-         else
-            $a --version >/dev/null 2> /dev/null
-            if test $? -eq 0; then
-               RPM=$a
-               break
-            fi
-         fi
-       done
-       if test -z "$RPM" ; then
-          as_fn_error $? "not found" "$LINENO" 5
-       elif "$RPM" --usage 2>&1 | $EGREP -- -bb >/dev/null; then
-          RPM_PATH=`which $RPM`
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RPM_PATH" >&5
-$as_echo "$RPM_PATH" >&6; }
-       else
-          as_fn_error $? "cannot build packages. Try installing rpmbuild." "$LINENO" 5
-       fi
-   fi
-   if echo "$PKGFORMAT" | $EGREP deb 2>&1 >/dev/null; then
-      # Extract the first word of "dpkg", so it can be a program name with args.
-set dummy dpkg; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DPKG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $DPKG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_DPKG="$DPKG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_DPKG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_DPKG" && ac_cv_path_DPKG="no"
-  ;;
-esac
-fi
-DPKG=$ac_cv_path_DPKG
-if test -n "$DPKG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DPKG" >&5
-$as_echo "$DPKG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-      if test "$DPKG" = "no"; then
-         as_fn_error $? "dpkg needed for deb creation. Install dpkg." "$LINENO" 5
-      fi
-   fi
-   if echo "PKGFORMAT" | $EGREP osx 2>&1 >/dev/null; then
-      if test "$_os" = "Darwin"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PackageMaker availability" >&5
-$as_echo_n "checking for PackageMaker availability... " >&6; }
-         if ! test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then
-            as_fn_error $? "not installed. Please install Apples Dev Tools" "$LINENO" 5
-         else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-         fi
-      else
-         as_fn_error $? "PackageMaker needed to build OSX packages and you are not on OSX..." "$LINENO" 5
-       fi
-   fi
-   if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
-      echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
-      	if test "$EPM" != "no" && test "$EPM" != "internal"; then
-           if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether epm is patched for OOos needs" >&5
-$as_echo_n "checking whether epm is patched for OOos needs... " >&6; }
-               if grep "Patched for OpenOffice.org" $EPM >/dev/null 2>/dev/null; then
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-               else
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                  if echo "$PKGFORMAT" | grep -q rpm; then
-                      _pt="rpm"
-                      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the rpms will need to be installed with --nodeps" >&5
-$as_echo "$as_me: WARNING: the rpms will need to be installed with --nodeps" >&2;}
-                      echo "the rpms will need to be installed with --nodeps" >> warn
-                  else
-                      _pt="pkg"
-                  fi
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the ${_pt}s will not be relocateable" >&5
-$as_echo "$as_me: WARNING: the ${_pt}s will not be relocateable" >&2;}
-                  echo "the ${_pt}s will not be relocateable" >> warn
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: if you want to make sure installation without --nodeps and
-                  relocation will work, you need to patch your epm with the
-                  patch in epm/epm-3.7.patch or build with
-                  --with-epm=internal which will build a suitable epm" >&5
-$as_echo "$as_me: WARNING: if you want to make sure installation without --nodeps and
-                  relocation will work, you need to patch your epm with the
-                  patch in epm/epm-3.7.patch or build with
-                  --with-epm=internal which will build a suitable epm" >&2;}
-               fi
-           fi
-        fi
-   fi
-   if echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
-      # Extract the first word of "pkgmk", so it can be a program name with args.
-set dummy pkgmk; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKGMK+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKGMK in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKGMK="$PKGMK" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKGMK="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKGMK" && ac_cv_path_PKGMK="no"
-  ;;
-esac
-fi
-PKGMK=$ac_cv_path_PKGMK
-if test -n "$PKGMK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGMK" >&5
-$as_echo "$PKGMK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-      if test "$PKGMK" = "no"; then
-         as_fn_error $? "pkgmk needed for Solaris pkg creation. Install it." "$LINENO" 5
-      fi
-   fi
-
-
-
-
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   EPM=NO
-   PKGFORMAT=native
-fi
-
-
-
-# Extract the first word of "gperf", so it can be a program name with args.
-set dummy gperf; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GPERF+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GPERF in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GPERF="$GPERF" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_GPERF="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-GPERF=$ac_cv_path_GPERF
-if test -n "$GPERF"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPERF" >&5
-$as_echo "$GPERF" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$GPERF"; then
-	as_fn_error $? "gperf not found but needed. Install it." "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gperf version" >&5
-$as_echo_n "checking gperf version... " >&6; }
-if test "`$GPERF --version | $EGREP ^GNU\ gperf | $AWK '{ print $3 }' | cut -d. -f1`" -ge "3"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
-else
-	as_fn_error $? "too old, you need at least 3.0.0" "$LINENO" 5
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the stax" >&5
-$as_echo_n "checking whether to build the stax... " >&6; }
-if test -f "./stax/download/jsr173_1.0_api.jar"; then
-   BUILD_STAX=NO
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, will use the prebuilt stax/download/jsr173_1.0_api.jar" >&5
-$as_echo "no, will use the prebuilt stax/download/jsr173_1.0_api.jar" >&6; }
-else
-   BUILD_STAX=YES
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the ODK" >&5
-$as_echo_n "checking whether to build the ODK... " >&6; }
-if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   if test "$WITH_JAVA" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for external/unowinreg/unowinreg.dll" >&5
-$as_echo_n "checking for external/unowinreg/unowinreg.dll... " >&6; }
-   if ! test -f "./external/unowinreg/unowinreg.dll"; then
-      HAVE_UNOWINREG_DLL=no
-   else
-      HAVE_UNOWINREG_DLL=yes
-   fi
-   if test "$HAVE_UNOWINREG_DLL" = "yes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
-      BUILD_UNOWINREG=NO
-   else
-      if test "$_os" = "WINNT"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found, will be built" >&5
-$as_echo "not found, will be built" >&6; }
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: not found, will be cross-built using mingw32" >&5
-$as_echo "$as_me: WARNING: not found, will be cross-built using mingw32" >&2;}
-      fi
-      BUILD_UNOWINREG=YES
-   fi
-   if test "$_os" != "WINNT" && test "$BUILD_UNOWINREG" = "YES"; then
-      if test -z "$WITH_MINGWIN" || test "$WITH_MINGWIN" = "0"; then
-         as_fn_error $? "for rebuilding unowinreg.dll you need the mingw32 C++ compiler.
-         Specify mingw32 g++ executable name with --with-mingwin.
-         Or use prebuilt one from http://tools.openoffice.org/unowinreg_prebuild/680/ and
-         put it into external/unowinreg" "$LINENO" 5
-      fi
-      if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
-         if ! test -x "$WITH_MINGWIN"; then MINGWCXX=false; else MINGWCXX=`basename $WITH_MINGWIN`; fi
-      else
-         if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}$WITH_MINGWIN", so it can be a program name with args.
-set dummy ${ac_tool_prefix}$WITH_MINGWIN; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_MINGWCXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MINGWCXX"; then
-  ac_cv_prog_MINGWCXX="$MINGWCXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_MINGWCXX="${ac_tool_prefix}$WITH_MINGWIN"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-MINGWCXX=$ac_cv_prog_MINGWCXX
-if test -n "$MINGWCXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MINGWCXX" >&5
-$as_echo "$MINGWCXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_MINGWCXX"; then
-  ac_ct_MINGWCXX=$MINGWCXX
-  # Extract the first word of "$WITH_MINGWIN", so it can be a program name with args.
-set dummy $WITH_MINGWIN; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_MINGWCXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_MINGWCXX"; then
-  ac_cv_prog_ac_ct_MINGWCXX="$ac_ct_MINGWCXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_MINGWCXX="$WITH_MINGWIN"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_MINGWCXX=$ac_cv_prog_ac_ct_MINGWCXX
-if test -n "$ac_ct_MINGWCXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MINGWCXX" >&5
-$as_echo "$ac_ct_MINGWCXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_MINGWCXX" = x; then
-    MINGWCXX="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    MINGWCXX=$ac_ct_MINGWCXX
-  fi
-else
-  MINGWCXX="$ac_cv_prog_MINGWCXX"
-fi
-
-      fi
-      if test "$MINGWCXX" = "false"; then
-         as_fn_error $? "specified MinGW32 C++ cross-compiler not found. Install it or correct name." "$LINENO" 5
-      fi
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the MinGW32 cross C++ compiler" >&5
-$as_echo_n "checking whether we are using the MinGW32 cross C++ compiler... " >&6; }
-      if ! echo "`$MINGWCXX -dumpmachine`" | grep -q mingw32; then
-         as_fn_error $? "no" "$LINENO" 5
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-      fi
-      if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
-         if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`"; then MINGWSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/)); fi
-      else
-         if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`", so it can be a program name with args.
-set dummy ${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_MINGWSTRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MINGWSTRIP"; then
-  ac_cv_prog_MINGWSTRIP="$MINGWSTRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_MINGWSTRIP="${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-MINGWSTRIP=$ac_cv_prog_MINGWSTRIP
-if test -n "$MINGWSTRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MINGWSTRIP" >&5
-$as_echo "$MINGWSTRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_MINGWSTRIP"; then
-  ac_ct_MINGWSTRIP=$MINGWSTRIP
-  # Extract the first word of "`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`", so it can be a program name with args.
-set dummy `echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_MINGWSTRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_MINGWSTRIP"; then
-  ac_cv_prog_ac_ct_MINGWSTRIP="$ac_ct_MINGWSTRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_MINGWSTRIP="`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_MINGWSTRIP=$ac_cv_prog_ac_ct_MINGWSTRIP
-if test -n "$ac_ct_MINGWSTRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MINGWSTRIP" >&5
-$as_echo "$ac_ct_MINGWSTRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_MINGWSTRIP" = x; then
-    MINGWSTRIP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    MINGWSTRIP=$ac_ct_MINGWSTRIP
-  fi
-else
-  MINGWSTRIP="$ac_cv_prog_MINGWSTRIP"
-fi
-
-      fi
-      if test "$MINGWSTRIP" = "false"; then
-         as_fn_error $? "MinGW32 binutils needed. Install them." "$LINENO" 5
-      fi
-      ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-      save_CXX=$CXX
-      save_CXXCPP=$CXXCPP
-      CXX=$MINGWCXX
-      CXXCPP="$MINGWCXX -E"
-      save_CXXFLAGS=$CXXFLAGS
-      save_CPPFLAGS=$CPPFLAGS
-      CXXFLAGS="$CXXFLAGS -I$JAVA_HOME/include"
-      CPPFLAGS="$CPPFLAGS -I$JAVA_HOME/include"
-      # LIBS contains -lcrypt etc due to teh AC_CHECK_LIBS which obviously
-      # do not make sense here (and 'd make the check fail)
-      save_LIBS=$LIBS
-      LIBS=""
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lkernel32" >&5
-$as_echo_n "checking for main in -lkernel32... " >&6; }
-if test "${ac_cv_lib_kernel32_main+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lkernel32  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_kernel32_main=yes
-else
-  ac_cv_lib_kernel32_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kernel32_main" >&5
-$as_echo "$ac_cv_lib_kernel32_main" >&6; }
-if test "x$ac_cv_lib_kernel32_main" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBKERNEL32 1
-_ACEOF
-
-  LIBS="-lkernel32 $LIBS"
-
-fi
-ac_cv_lib_kernel32=ac_cv_lib_kernel32_main
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ladvapi32" >&5
-$as_echo_n "checking for main in -ladvapi32... " >&6; }
-if test "${ac_cv_lib_advapi32_main+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ladvapi32  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_advapi32_main=yes
-else
-  ac_cv_lib_advapi32_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_advapi32_main" >&5
-$as_echo "$ac_cv_lib_advapi32_main" >&6; }
-if test "x$ac_cv_lib_advapi32_main" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBADVAPI32 1
-_ACEOF
-
-  LIBS="-ladvapi32 $LIBS"
-
-fi
-ac_cv_lib_advapi32=ac_cv_lib_advapi32_main
-
-      ac_fn_cxx_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default"
-if test "x$ac_cv_header_windows_h" = x""yes; then :
-
-else
-  as_fn_error $? "windows.h missing" "$LINENO" 5
-fi
-
-
-      CXXFLAGS=$save_CXXFLAGS
-      CPPFLAGS=$save_CPPFLAGS
-      CXX=$save_CXX
-      CXXCPP=$save_CXXCPP
-      LIBS=$save_LIBS
-      ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-      fi
-   fi
-   BUILD_TYPE="$BUILD_TYPE ODK"
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   BUILD_UNOWINREG=NO
-fi
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to provide libstdc++/libgcc_s in the installset" >&5
-$as_echo_n "checking whether to provide libstdc++/libgcc_s in the installset... " >&6; }
-if test -n "$with_system_stdlibs" -o -n "$with_system_libs" && \
-   test "$with_system_stdlibs" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   SYSTEM_STDLIBS=YES
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   SYSTEM_STDLIBS=NO
-fi
-
-
-if test "$_os" = "Darwin" && test "$with_system_zlib" != "no"; then
-   with_system_zlib=yes
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which zlib to use" >&5
-$as_echo_n "checking which zlib to use... " >&6; }
-if test -n "$with_system_zlib" -o -n "$with_system_libs" && \
-	test "$with_system_zlib" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-    SYSTEM_ZLIB=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = x""yes; then :
-
-else
-  as_fn_error $? "zlib.h not found. install zlib" "$LINENO" 5
-fi
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5
-$as_echo_n "checking for deflate in -lz... " >&6; }
-if test "${ac_cv_lib_z_deflate+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char deflate ();
-int
-main ()
-{
-return deflate ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_z_deflate=yes
-else
-  ac_cv_lib_z_deflate=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5
-$as_echo "$ac_cv_lib_z_deflate" >&6; }
-if test "x$ac_cv_lib_z_deflate" = x""yes; then :
-   ZLIB=-lz
-else
-  as_fn_error $? "zlib not found or functional" "$LINENO" 5
-fi
-
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_ZLIB=NO
-    BUILD_TYPE="$BUILD_TYPE ZLIB"
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which jpeg to use" >&5
-$as_echo_n "checking which jpeg to use... " >&6; }
-if test -n "$with_system_jpeg" -o -n "$with_system_libs" && \
-	test "$with_system_jpeg" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-    SYSTEM_JPEG=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
-if test "x$ac_cv_header_jpeglib_h" = x""yes; then :
-
-else
-  as_fn_error $? "jpeg.h not found. install libjpeg" "$LINENO" 5
-fi
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_resync_to_restart in -ljpeg" >&5
-$as_echo_n "checking for jpeg_resync_to_restart in -ljpeg... " >&6; }
-if test "${ac_cv_lib_jpeg_jpeg_resync_to_restart+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ljpeg  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char jpeg_resync_to_restart ();
-int
-main ()
-{
-return jpeg_resync_to_restart ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_jpeg_jpeg_resync_to_restart=yes
-else
-  ac_cv_lib_jpeg_jpeg_resync_to_restart=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_resync_to_restart" >&5
-$as_echo "$ac_cv_lib_jpeg_jpeg_resync_to_restart" >&6; }
-if test "x$ac_cv_lib_jpeg_jpeg_resync_to_restart" = x""yes; then :
-   JPEG3RDLIB=-ljpeg
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking jpeg library not found or fuctional" >&5
-$as_echo_n "checking jpeg library not found or fuctional... " >&6; }
-fi
-
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_JPEG=NO
-    BUILD_TYPE="$BUILD_TYPE JPEG"
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which expat to use" >&5
-$as_echo_n "checking which expat to use... " >&6; }
-if test -n "$with_system_expat" -o -n "$with_system_libs" && \
-	test "$with_system_expat" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-    SYSTEM_EXPAT=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default"
-if test "x$ac_cv_header_expat_h" = x""yes; then :
-
-else
-  as_fn_error $? "expat.h not found. install expat" "$LINENO" 5
-fi
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5
-$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
-if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lexpat  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XML_ParserCreate ();
-int
-main ()
-{
-return XML_ParserCreate ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_expat_XML_ParserCreate=yes
-else
-  ac_cv_lib_expat_XML_ParserCreate=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
-$as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
-if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBEXPAT 1
-_ACEOF
-
-  LIBS="-lexpat $LIBS"
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: expat library not found or functional." >&5
-$as_echo "expat library not found or functional." >&6; }
-fi
-
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_EXPAT=NO
-    BUILD_TYPE="$BUILD_TYPE EXPAT"
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libwpd to use" >&5
-$as_echo_n "checking which libwpd to use... " >&6; }
-if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \
-        test "$with_system_libwpd" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-    SYSTEM_LIBWPD=YES
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwpd-0.8 " >&5
-$as_echo_n "checking for libwpd-0.8 ... " >&6; }
-
-        if $PKG_CONFIG --exists "libwpd-0.8 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBWPD_CFLAGS" >&5
-$as_echo_n "checking LIBWPD_CFLAGS... " >&6; }
-            LIBWPD_CFLAGS=`$PKG_CONFIG --cflags "libwpd-0.8 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBWPD_CFLAGS" >&5
-$as_echo "$LIBWPD_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBWPD_LIBS" >&5
-$as_echo_n "checking LIBWPD_LIBS... " >&6; }
-            LIBWPD_LIBS=`$PKG_CONFIG --libs "libwpd-0.8 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBWPD_LIBS" >&5
-$as_echo "$LIBWPD_LIBS" >&6; }
-        else
-            LIBWPD_CFLAGS=""
-            LIBWPD_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            LIBWPD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpd-0.8 "`
-            echo $LIBWPD_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_LIBWPD=NO
-    BUILD_TYPE="$BUILD_TYPE LIBWPD"
-fi
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which cppunit to use" >&5
-$as_echo_n "checking which cppunit to use... " >&6; }
-if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
-        test "$with_system_cppunit" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-    SYSTEM_CPPUNIT=YES
-    # might work for earlier, too but go sure:
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cppunit >= 1.12.0 " >&5
-$as_echo_n "checking for cppunit >= 1.12.0 ... " >&6; }
-
-        if $PKG_CONFIG --exists "cppunit >= 1.12.0 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking CPPUNIT_CFLAGS" >&5
-$as_echo_n "checking CPPUNIT_CFLAGS... " >&6; }
-            CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags "cppunit >= 1.12.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_CFLAGS" >&5
-$as_echo "$CPPUNIT_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking CPPUNIT_LIBS" >&5
-$as_echo_n "checking CPPUNIT_LIBS... " >&6; }
-            CPPUNIT_LIBS=`$PKG_CONFIG --libs "cppunit >= 1.12.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_LIBS" >&5
-$as_echo "$CPPUNIT_LIBS" >&6; }
-        else
-            CPPUNIT_CFLAGS=""
-            CPPUNIT_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cppunit >= 1.12.0 "`
-            echo $CPPUNIT_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (cppunit >= 1.12.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_CPPUNIT=NO
-    BUILD_TYPE="$BUILD_TYPE CPPUNIT"
-fi
-
-
-
-
-if test  "$test_freetype" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether freetype is available" >&5
-$as_echo_n "checking whether freetype is available... " >&6; }
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2 >= 2.0 " >&5
-$as_echo_n "checking for freetype2 >= 2.0 ... " >&6; }
-
-        if $PKG_CONFIG --exists "freetype2 >= 2.0 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking FREETYPE_CFLAGS" >&5
-$as_echo_n "checking FREETYPE_CFLAGS... " >&6; }
-            FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 2.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_CFLAGS" >&5
-$as_echo "$FREETYPE_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking FREETYPE_LIBS" >&5
-$as_echo_n "checking FREETYPE_LIBS... " >&6; }
-            FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 >= 2.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIBS" >&5
-$as_echo "$FREETYPE_LIBS" >&6; }
-        else
-            FREETYPE_CFLAGS=""
-            FREETYPE_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "freetype2 >= 2.0 "`
-            echo $FREETYPE_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-fi
-
-
-
-if test  "$test_freetype" = "yes"; then
-    save_CPPFLAGS="$CPPFLAGS"
-    save_LDFLAGS="$LDFLAGS"
-    save_LIBS="$LIBS"
-    CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
-    LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_GlyphSlot_Embolden in -lfreetype" >&5
-$as_echo_n "checking for FT_GlyphSlot_Embolden in -lfreetype... " >&6; }
-if test "${ac_cv_lib_freetype_FT_GlyphSlot_Embolden+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfreetype  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char FT_GlyphSlot_Embolden ();
-int
-main ()
-{
-return FT_GlyphSlot_Embolden ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_freetype_FT_GlyphSlot_Embolden=yes
-else
-  ac_cv_lib_freetype_FT_GlyphSlot_Embolden=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&5
-$as_echo "$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&6; }
-if test "x$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" = x""yes; then :
-  USE_FT_EMBOLDEN="YES"
-else
-  USE_FT_EMBOLDEN="NO"
-fi
-
-    LDFLAGS="$save_LDFLAGS"
-    CPPFLAGS="$save_CPPFLAGS"
-    LIBS="$save_LIBS"
-fi
-
-
-if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \
-   test "$with_system_libxslt" != "no"; then
-    if test -z "$with_system_libxml" -a -z "$with_system_libs" || \
-      test "$with_system_libxml" = "no"; then
-      # somehow AC_MSG_WARN won't work...
-       echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml"
-       echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" >> warn
-       with_system_libxml=yes
-    fi
-fi
-if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
-   test "$with_system_libxml" != "no"; then
-    if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \
-      test "$with_system_libxslt" = "no"; then
-      # somehow AC_MSG_WARN won't work...
-       echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt"
-       echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt" >> warn
-       with_system_libxslt=yes
-    fi
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libxslt to use" >&5
-$as_echo_n "checking which libxslt to use... " >&6; }
-if test -n "$with_system_libxslt" -o -n "$with_system_libs" -o \
-       "$_os" = "Darwin" && \
-   test "$with_system_libxslt" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-   SYSTEM_LIBXSLT=YES
-
-   if test "$_os" = "Darwin"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXSLT_CFLAGS" >&5
-$as_echo_n "checking LIBXSLT_CFLAGS... " >&6; }
-   LIBXSLT_CFLAGS=`xslt-config --cflags`
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXSLT_CFLAGS" >&5
-$as_echo "$LIBXSLT_CFLAGS" >&6; }
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXSLT_LIBS" >&5
-$as_echo_n "checking LIBXSLT_LIBS... " >&6; }
-   LIBXSLT_LIBS=`xslt-config --libs`
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXSLT_LIBS" >&5
-$as_echo "$LIBXSLT_LIBS" >&6; }
-
-
- else
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxslt" >&5
-$as_echo_n "checking for libxslt... " >&6; }
-
-        if $PKG_CONFIG --exists "libxslt" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXSLT_CFLAGS" >&5
-$as_echo_n "checking LIBXSLT_CFLAGS... " >&6; }
-            LIBXSLT_CFLAGS=`$PKG_CONFIG --cflags "libxslt"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXSLT_CFLAGS" >&5
-$as_echo "$LIBXSLT_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXSLT_LIBS" >&5
-$as_echo_n "checking LIBXSLT_LIBS... " >&6; }
-            LIBXSLT_LIBS=`$PKG_CONFIG --libs "libxslt"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXSLT_LIBS" >&5
-$as_echo "$LIBXSLT_LIBS" >&6; }
-        else
-            LIBXSLT_CFLAGS=""
-            LIBXSLT_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            LIBXSLT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxslt"`
-            echo $LIBXSLT_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
- fi
-
-
-      # Extract the first word of "xsltproc", so it can be a program name with args.
-set dummy xsltproc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XSLTPROC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $XSLTPROC in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_XSLTPROC" && ac_cv_path_XSLTPROC="no"
-  ;;
-esac
-fi
-XSLTPROC=$ac_cv_path_XSLTPROC
-if test -n "$XSLTPROC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
-$as_echo "$XSLTPROC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-   if test "$XSLTPROC" = "no"; then
-      as_fn_error $? "xsltproc is required" "$LINENO" 5
-   fi
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-   SYSTEM_LIBXSLT=NO
-   BUILD_TYPE="$BUILD_TYPE LIBXSLT"
-fi
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libxml to use" >&5
-$as_echo_n "checking which libxml to use... " >&6; }
-if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \
-            "$_os" = "Darwin" && \
-	test "$with_system_libxml" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-    SYSTEM_LIBXML=YES
-    if test "$_os" = "Darwin"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML_CFLAGS" >&5
-$as_echo_n "checking LIBXML_CFLAGS... " >&6; }
-   LIBXML_CFLAGS=`xml2-config --cflags`
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML_CFLAGS" >&5
-$as_echo "$LIBXML_CFLAGS" >&6; }
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML_LIBS" >&5
-$as_echo_n "checking LIBXML_LIBS... " >&6; }
-   LIBXML_LIBS=`xml2-config --libs`
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML_LIBS" >&5
-$as_echo "$LIBXML_LIBS" >&6; }
-
-
- else
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.0" >&5
-$as_echo_n "checking for libxml-2.0 >= 2.0... " >&6; }
-
-        if $PKG_CONFIG --exists "libxml-2.0 >= 2.0" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML_CFLAGS" >&5
-$as_echo_n "checking LIBXML_CFLAGS... " >&6; }
-            LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML_CFLAGS" >&5
-$as_echo "$LIBXML_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML_LIBS" >&5
-$as_echo_n "checking LIBXML_LIBS... " >&6; }
-            LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML_LIBS" >&5
-$as_echo "$LIBXML_LIBS" >&6; }
-        else
-            LIBXML_CFLAGS=""
-            LIBXML_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            LIBXML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 >= 2.0"`
-            echo $LIBXML_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
- fi
-
-    BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_LIBXML=NO
-    BUILD_TYPE="$BUILD_TYPE LIBXML2 LIBXMLSEC"
-fi
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which python to use" >&5
-$as_echo_n "checking which python to use... " >&6; }
-if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
-   with_system_python=yes
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: compiling against MacOSX10.4u.sdk (python version 2.3)" >&5
-$as_echo "compiling against MacOSX10.4u.sdk (python version 2.3)" >&6; }
-   PYTHON_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3"
-   PYTHON_LIBS="-framework Python"
-elif test -n "$with_system_python" -o -n "$with_system_libs" && \
-	test "$with_system_python" != "no"; then
-   with_system_python=yes
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-
-
-
-
-        if test -n "$PYTHON"; then
-      # If the user set $PYTHON, use it and don't search something else.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.2" >&5
-$as_echo_n "checking whether $PYTHON version >= 2.2... " >&6; }
-      prog="import sys, string
-# split strings by '.' and convert to numeric.  Append some zeros
-# because we need at least 4 digits for the hex conversion.
-minver = map(int, string.split('2.2', '.')) + [0, 0, 0]
-minverhex = 0
-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
-sys.exit(sys.hexversion < minverhex)"
-  if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
-   ($PYTHON -c "$prog") >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  as_fn_error $? "too old" "$LINENO" 5
-fi
-      am_display_PYTHON=$PYTHON
-    else
-      # Otherwise, try each interpreter until we find one that satisfies
-      # VERSION.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.2" >&5
-$as_echo_n "checking for a Python interpreter with version >= 2.2... " >&6; }
-if test "${am_cv_pathless_PYTHON+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	for am_cv_pathless_PYTHON in python python2 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
-	  test "$am_cv_pathless_PYTHON" = none && break
-	  prog="import sys, string
-# split strings by '.' and convert to numeric.  Append some zeros
-# because we need at least 4 digits for the hex conversion.
-minver = map(int, string.split('2.2', '.')) + [0, 0, 0]
-minverhex = 0
-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
-sys.exit(sys.hexversion < minverhex)"
-  if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5
-   ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then :
-  break
-fi
-	done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
-$as_echo "$am_cv_pathless_PYTHON" >&6; }
-      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
-      if test "$am_cv_pathless_PYTHON" = none; then
-	PYTHON=:
-      else
-        # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
-set dummy $am_cv_pathless_PYTHON; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PYTHON+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PYTHON in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PYTHON=$ac_cv_path_PYTHON
-if test -n "$PYTHON"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
-$as_echo "$PYTHON" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-      fi
-      am_display_PYTHON=$am_cv_pathless_PYTHON
-    fi
-
-
-  if test "$PYTHON" = :; then
-      as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5
-  else
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
-$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
-if test "${am_cv_python_version+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
-$as_echo "$am_cv_python_version" >&6; }
-  PYTHON_VERSION=$am_cv_python_version
-
-
-
-  PYTHON_PREFIX='${prefix}'
-
-  PYTHON_EXEC_PREFIX='${exec_prefix}'
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
-$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
-if test "${am_cv_python_platform+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
-$as_echo "$am_cv_python_platform" >&6; }
-  PYTHON_PLATFORM=$am_cv_python_platform
-
-
-
-
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
-$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
-if test "${am_cv_python_pythondir+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
-     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
-$as_echo "$am_cv_python_pythondir" >&6; }
-  pythondir=$am_cv_python_pythondir
-
-
-
-  pkgpythondir=\${pythondir}/$PACKAGE
-
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
-$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
-if test "${am_cv_python_pyexecdir+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
-     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
-$as_echo "$am_cv_python_pyexecdir" >&6; }
-  pyexecdir=$am_cv_python_pyexecdir
-
-
-
-  pkgpyexecdir=\${pyexecdir}/$PACKAGE
-
-
-
-  fi
-
-
-
-   python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`
-   python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"`
-   PYTHON_CFLAGS="-I$python_include"
-   PYTHON_LIBS="-lpython$python_version"
-fi
-if test "$with_system_python" = "yes" ; then
-   SYSTEM_PYTHON=YES
-      save_CPPFLAGS="$CPPFLAGS"
-   CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
-   ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default"
-if test "x$ac_cv_header_Python_h" = x""yes; then :
-
-else
-  as_fn_error $? "Python headers not found" "$LINENO" 5
-fi
-
-
-   CPPFLAGS="$save_CPPFLAGS"
-else
-   SYSTEM_PYTHON=NO
-   BUILD_TYPE="$BUILD_TYPE PYTHON"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-   # Embedded python dies without Home set
-   if test "z$HOME" = "z"; then
-      export HOME="";
-   fi
-   # bz2 tarball and bzip2 is not standard
-   if test -z "$BZIP2"; then
-	# Extract the first word of "bzip2", so it can be a program name with args.
-set dummy bzip2; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_BZIP2+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $BZIP2 in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_BZIP2="$BZIP2" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_BZIP2="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-BZIP2=$ac_cv_path_BZIP2
-if test -n "$BZIP2"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZIP2" >&5
-$as_echo "$BZIP2" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-	if test -z "$BZIP2"; then
-   		as_fn_error $? "the internal Python module has a .tar.bz2. You need bzip2" "$LINENO" 5
-   	fi
-   fi
-fi
-
-
-
-HOME=`echo $HOME | sed 's:\\\\:/:g'`
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which db to use" >&5
-$as_echo_n "checking which db to use... " >&6; }
-if test -n "$with_system_db" -o -n "$with_system_libs" && \
-	test "$with_system_db" != "no"; then
-    SYSTEM_DB=YES
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-    ac_fn_c_check_header_compile "$LINENO" "db.h" "ac_cv_header_db_h" "
-
-"
-if test "x$ac_cv_header_db_h" = x""yes; then :
-   DB_INCLUDES=/usr/include
-else
-
-             CFLAGS=-I/usr/include/db4
-             ac_fn_c_check_header_compile "$LINENO" "db4/db.h" "ac_cv_header_db4_db_h" "+
-"
-if test "x$ac_cv_header_db4_db_h" = x""yes; then :
-   DB_INCLUDES=/usr/include/db4
-else
-   as_fn_error $? "no. install the db4 libraries" "$LINENO" 5
-fi
-
-
-
-fi
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether db is at least 4.1" >&5
-$as_echo_n "checking whether db is at least 4.1... " >&6; }
-    if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <db.h>
-
-int main(int argc, char **argv) {
-       if(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) return 0;
-       else return 1;
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  as_fn_error $? "no. you need at least db 4.1" "$LINENO" 5
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldb" >&5
-$as_echo_n "checking for main in -ldb... " >&6; }
-if test "${ac_cv_lib_db_main+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldb  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_db_main=yes
-else
-  ac_cv_lib_db_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_db_main" >&5
-$as_echo "$ac_cv_lib_db_main" >&6; }
-if test "x$ac_cv_lib_db_main" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDB 1
-_ACEOF
-
-  LIBS="-ldb $LIBS"
-
-else
-  as_fn_error $? "db not installed or functional" "$LINENO" 5
-fi
-ac_cv_lib_db=ac_cv_lib_db_main
-
-    SCPDEFS="$SCPDEFS -DSYSTEM_DB"
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_DB=NO
-    BUILD_TYPE="$BUILD_TYPE BERKELEYDB"
-fi
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which lucene to use" >&5
-$as_echo_n "checking which lucene to use... " >&6; }
-if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
-       test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-        SYSTEM_LUCENE=YES
-        if test -z $LUCENE_CORE_JAR; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene-core-2.3.jar" >&5
-$as_echo_n "checking for /usr/share/java/lucene-core-2.3.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_lucene_core_2_3_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/lucene-core-2.3.jar"; then
-  ac_cv_file__usr_share_java_lucene_core_2_3_jar=yes
-else
-  ac_cv_file__usr_share_java_lucene_core_2_3_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_lucene_core_2_3_jar" = x""yes; then :
-   LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar
-else
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene-core.jar" >&5
-$as_echo_n "checking for /usr/share/java/lucene-core.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_lucene_core_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/lucene-core.jar"; then
-  ac_cv_file__usr_share_java_lucene_core_jar=yes
-else
-  ac_cv_file__usr_share_java_lucene_core_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_core_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_lucene_core_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_lucene_core_jar" = x""yes; then :
-   LUCENE_CORE_JAR=/usr/share/java/lucene-core.jar
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene.jar" >&5
-$as_echo_n "checking for /usr/share/java/lucene.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_lucene_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/lucene.jar"; then
-  ac_cv_file__usr_share_java_lucene_jar=yes
-else
-  ac_cv_file__usr_share_java_lucene_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_lucene_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_lucene_jar" = x""yes; then :
-   LUCENE_CORE_JAR=/usr/share/java/lucene.jar
-else
-   as_fn_error $? "lucene-core.jar replacement not found" "$LINENO" 5
-
-fi
-
-
-
-fi
-
-
-
-fi
-
-        else
-          as_ac_File=`$as_echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LUCENE_CORE_JAR" >&5
-$as_echo_n "checking for $LUCENE_CORE_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$LUCENE_CORE_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "lucene-core.jar not found." "$LINENO" 5
-fi
-
-        fi
-
-        if test -z $LUCENE_ANALYZERS_JAR; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene-analyzers-2.3.jar" >&5
-$as_echo_n "checking for /usr/share/java/lucene-analyzers-2.3.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/lucene-analyzers-2.3.jar"; then
-  ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar=yes
-else
-  ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" = x""yes; then :
-   LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers-2.3.jar
-else
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar" >&5
-$as_echo_n "checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/lucene-contrib/lucene-analyzers.jar"; then
-  ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar=yes
-else
-  ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" = x""yes; then :
-   LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-contrib/lucene-analyzers.jar
-else
-   as_fn_error $? "lucene-analyzers.jar replacement not found." "$LINENO" 5
-
-fi
-
-
-
-fi
-
-        else
-          as_ac_File=`$as_echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LUCENE_CORE_JAR" >&5
-$as_echo_n "checking for $LUCENE_CORE_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$LUCENE_CORE_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-   as_fn_error $? "lucene-analyzers.jar not found." "$LINENO" 5
-fi
-
-        fi
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lucene is version 2.x" >&5
-$as_echo_n "checking whether lucene is version 2.x... " >&6; }
-        export LUCENE_CORE_JAR
-        if $PERL -e 'use Archive::Zip;
-            my $file = "$ENV{'LUCENE_CORE_JAR'}";
-            my $zip = Archive::Zip->new( $file );
-            my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
-            if ( $mf =~ m/Specification-Version: 2.*/ ) {
-                exit 0;
-            } else {
-                exit 1;
-            }'; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-         else
-            as_fn_error $? "no, you need lucene 2" "$LINENO" 5
-         fi
-
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_LUCENE=NO
-    BUILD_TYPE="$BUILD_TYPE LUCENE"
-fi
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the MySQL Connector extension" >&5
-$as_echo_n "checking whether to build the MySQL Connector extension... " >&6; }
-if test -n "$enable_mysql_connector" -a "$enable_mysql_connector" != "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  ENABLE_MYSQLC=YES
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysqlc module" >&5
-$as_echo_n "checking for mysqlc module... " >&6; }
-  if test -d mysqlc; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
-  else
-   as_fn_error $? "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
-  fi
-  BUILD_TYPE="$BUILD_TYPE MYSQLC"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  ENABLE_MYSQLC=NO
-fi
-
-
-if test "$ENABLE_MYSQLC" = "YES"; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql pre-requisites" >&5
-$as_echo_n "checking for mysql pre-requisites... " >&6; }
-if test -n "$with_system_mysql" -o -n "$with_system_libs" && \
-       test "$with_system_mysql" != "no" && test "$with_system_libs" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: external MySQL" >&5
-$as_echo "external MySQL" >&6; }
-	SYSTEM_MYSQL=YES
-	# Extract the first word of "mysql_config", so it can be a program name with args.
-set dummy mysql_config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MYSQLCONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MYSQLCONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MYSQLCONFIG="$MYSQLCONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MYSQLCONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MYSQLCONFIG=$ac_cv_path_MYSQLCONFIG
-if test -n "$MYSQLCONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQLCONFIG" >&5
-$as_echo "$MYSQLCONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking MySQL version" >&5
-$as_echo_n "checking MySQL version... " >&6; }
-	MYSQL_VERSION=`$MYSQLCONFIG --version`
-	MYSQL_MAJOR=`$MYSQLCONFIG --version | cut -d"." -f1`
-	if test "$MYSQL_MAJOR" -ge "5"; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
-	else
-		as_fn_error $? "too old, use 5.0.x or 5.1.x" "$LINENO" 5
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL Client library" >&5
-$as_echo_n "checking for MySQL Client library... " >&6; }
-	MYSQL_INC=`$MYSQLCONFIG --include`
-	MYSQL_LIB=`$MYSQLCONFIG --libs`
-	MYSQL_DEFINES=`$MYSQLCONFIG --cflags | sed -e s,$MYSQL_INC,,`
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: includes $MYSQL_INC, libraries $MYSQL_LIB" >&5
-$as_echo "includes $MYSQL_INC, libraries $MYSQL_LIB" >&6; }
-else
-    SYSTEM_MYSQL=NO
-    if test -n "$with_libmysql_path"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external Connector/C (libmysql)" >&5
-$as_echo "external Connector/C (libmysql)" >&6; }
-        LIBMYSQL=libmysql.so
-        if test "$_os" = "Darwin"; then
-            LIBMYSQL=libmysql.dylib
-        elif test "$_os" = "WINNT"; then
-            LIBMYSQL=libmysql.dll
-        fi
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBMYSQL" >&5
-$as_echo_n "checking for $LIBMYSQL... " >&6; }
-        if test -e "$with_libmysql_path/lib/$LIBMYSQL"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: found." >&5
-$as_echo "found." >&6; }
-            LIBMYSQL_PATH=$with_libmysql_path
-        else
-            as_fn_error $? "not found. Please specify proper path in --with-libmysql-path." "$LINENO" 5
-        fi
-    else
-        as_fn_error $? "not given. Please specify either --with-system-mysql or --with-libmysql-path" "$LINENO" 5
-    fi
-fi
-
-
-
-
-
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-# FIXME!
-# who thought this too-generic cppconn dir was a good idea?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking MySQL Connector/C++" >&5
-$as_echo_n "checking MySQL Connector/C++... " >&6; }
-if test -n "$with_system_mysql_cppconn" -o -n "$with_system_libs" && \
-		test "$with_system_mysql_cppconn" != "no" && test "$with_system_libs" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-	SYSTEM_MYSQL_CPPCONN=YES
-        ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-	ac_fn_cxx_check_header_mongrel "$LINENO" "mysql_driver.h" "ac_cv_header_mysql_driver_h" "$ac_includes_default"
-if test "x$ac_cv_header_mysql_driver_h" = x""yes; then :
-
-else
-  as_fn_error $? "mysql_driver.h not found. install MySQL C++ Connectivity" "$LINENO" 5
-fi
-
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmysqlcppconn" >&5
-$as_echo_n "checking for main in -lmysqlcppconn... " >&6; }
-if test "${ac_cv_lib_mysqlcppconn_main+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmysqlcppconn  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_mysqlcppconn_main=yes
-else
-  ac_cv_lib_mysqlcppconn_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mysqlcppconn_main" >&5
-$as_echo "$ac_cv_lib_mysqlcppconn_main" >&6; }
-if test "x$ac_cv_lib_mysqlcppconn_main" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBMYSQLCPPCONN 1
-_ACEOF
-
-  LIBS="-lmysqlcppconn $LIBS"
-
-else
-  as_fn_error $? "MySQL C++ Connectivity lib not found or functional" "$LINENO" 5
-fi
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking version" >&5
-$as_echo_n "checking version... " >&6; }
-      if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <mysql_driver.h>
-
-int main(int argc, char **argv) {
-	sql::Driver *driver;
-	driver = get_driver_instance();
-	if (driver->getMajorVersion() > 1 || \
-	   (driver->getMajorVersion() == 1 && driver->getMinorVersion() > 0) || \
-	   (driver->getMajorVersion() == 1 && driver->getMinorVersion() == 0 && driver->getPatchVersion() >= 6))
-        return 0;
-      else
-        return 1;
-}
-
-_ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
-else
-  as_fn_error $? "not suitable, we need >= 1.0.6" "$LINENO" 5
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-        ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysqlcppconn module" >&5
-$as_echo_n "checking for mysqlcppconn module... " >&6; }
-        if test -d mysqlcppconn; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
-        else
-          as_fn_error $? "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
-        fi
-	BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN"
-	SYSTEM_MYSQL_CPPCONN=NO
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which hsqldb to use" >&5
-$as_echo_n "checking which hsqldb to use... " >&6; }
-if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \
-       test "$with_system_hsqldb" != "no" && test "$with_system_jars" != "no"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-        SYSTEM_HSQLDB=YES
-        if test -z $HSQLDB_JAR; then
-               HSQLDB_JAR=/usr/share/java/hsqldb.jar
-        fi
-        as_ac_File=`$as_echo "ac_cv_file_$HSQLDB_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $HSQLDB_JAR" >&5
-$as_echo_n "checking for $HSQLDB_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$HSQLDB_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "hsqldb.jar not found." "$LINENO" 5
-fi
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether hsqldb is 1.8.0.x" >&5
-$as_echo_n "checking whether hsqldb is 1.8.0.x... " >&6; }
-        export HSQLDB_JAR
-        if $PERL -e 'use Archive::Zip;
-            my $file = "$ENV{'HSQLDB_JAR'}";
-            my $zip = Archive::Zip->new( $file );
-            my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
-            if ( $mf =~ m/Specification-Version: 1.8.*/ ) {
-               push @l, split(/\n/, $mf);
-               foreach my $line (@l) {
-                  if ($line =~ m/Specification-Version:/) {
-                      ($t, $version) = split (/:/,$line);
-                      $version =~ s/^\s//;
-                      ($a, $b, $c, $d) = split (/\./,$version);
-                      if ($c == "0" && $d > "8")  {
-                          exit 0;
-                      } else {
-                          exit 1;
-                      }
-                  }
-               }
-            } else {
-                exit 1;
-            }'; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-         else
-            as_fn_error $? "no, you need hsqldb >= 1.8.0.9 but < 1.8.1" "$LINENO" 5
-         fi
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_HSQLDB=NO
-    BUILD_TYPE="$BUILD_TYPE HSQLDB"
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which beanshell to use" >&5
-$as_echo_n "checking which beanshell to use... " >&6; }
-if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \
-       test "$with_system_beanshell" != "no" && test "$with_system_jars" != "no"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-        SYSTEM_BSH=YES
-        if test -z $BSH_JAR; then
-               BSH_JAR=/usr/share/java/bsh.jar
-        fi
-        as_ac_File=`$as_echo "ac_cv_file_$BSH_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $BSH_JAR" >&5
-$as_echo_n "checking for $BSH_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$BSH_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "bsh.jar not found." "$LINENO" 5
-fi
-
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_BSH=NO
-    BUILD_TYPE="$BUILD_TYPE BSH"
-fi
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which saxon to use" >&5
-$as_echo_n "checking which saxon to use... " >&6; }
-if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
-       test "$with_system_saxon" != "no" && test "$with_system_jars" != "no"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-        SYSTEM_SAXON=YES
-        if test -z $SAXON_JAR; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/saxon9.jar" >&5
-$as_echo_n "checking for /usr/share/java/saxon9.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/saxon9.jar"; then
-  ac_cv_file__usr_share_java_saxon9_jar=yes
-else
-  ac_cv_file__usr_share_java_saxon9_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_saxon9_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_saxon9_jar" = x""yes; then :
-   SAXON_JAR=/usr/share/java/saxon9.jar
-else
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/saxon.jar" >&5
-$as_echo_n "checking for /usr/share/java/saxon.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_saxon_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/saxon.jar"; then
-  ac_cv_file__usr_share_java_saxon_jar=yes
-else
-  ac_cv_file__usr_share_java_saxon_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_saxon_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_saxon_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_saxon_jar" = x""yes; then :
-   SAXON_JAR=/usr/share/java/saxon.jar
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/saxon9.jar" >&5
-$as_echo_n "checking for /usr/share/java/saxon9.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/saxon9.jar"; then
-  ac_cv_file__usr_share_java_saxon9_jar=yes
-else
-  ac_cv_file__usr_share_java_saxon9_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_saxon9_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_saxon9_jar" = x""yes; then :
-   SAXON_JAR=/usr/share/java/saxon9.jar
-else
-   as_fn_error $? "saxon.jar replacement not found" "$LINENO" 5
-
-fi
-
-
-
-fi
-
-
-
-fi
-
-        else
-          as_ac_File=`$as_echo "ac_cv_file_$SAXON_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SAXON_JAR" >&5
-$as_echo_n "checking for $SAXON_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$SAXON_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "saxon.jar replacement not found." "$LINENO" 5
-fi
-
-        fi
-        if test -n "$SERIALIZER_JAR"; then
-          as_ac_File=`$as_echo "ac_cv_file_$SERIALIZER_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SERIALIZER_JAR" >&5
-$as_echo_n "checking for $SERIALIZER_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$SERIALIZER_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "serializer.jar not found." "$LINENO" 5
-fi
-
-
-        fi
-
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if saxon works" >&5
-$as_echo_n "checking if saxon works... " >&6; }
-        cat > saxontest.java <<_ACEOF
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.stream.StreamSource;
-import java.io.*;
-
-import net.sf.saxon.FeatureKeys;
-
-class saxontest {
-    public static void main(String[] args) {
-      System.setProperty("javax.xml.transform.TransformerFactory",
-        "net.sf.saxon.TransformerFactoryImpl");
-      try {
-        TransformerFactory tfactory = TransformerFactory.newInstance();
-	// some external saxons (Debian, Ubuntu, ...) have this disabled
-	// per default
-	tfactory.setAttribute(FeatureKeys.ALLOW_EXTERNAL_FUNCTIONS, new Boolean(true));
-        System.out.println("TransformerFactory is" +
-          tfactory.getClass().getName());
-        Transformer transformer = tfactory.newTransformer(
-          new StreamSource(new File(args[0])));
-      } catch(Exception e){
-        e.printStackTrace(System.err);
-        System.exit(-1);
-      }
-      System.exit(0);
-    }
-}
-
-_ACEOF
-        cat > saxontest.xsl<<_ACEOF
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:template match="/">
-  <xsl:value-of select="math:sqrt(1)" xmlns:math="java:java.lang.Math"/>
- </xsl:template>
-</xsl:stylesheet>
-
-_ACEOF
-        javac_cmd="$JAVACOMPILER -cp $SAXON_JAR saxontest.java 1>&2"
-        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$javac_cmd\""; } >&5
-  (eval $javac_cmd) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-        if test $? = 0 && test -f ./saxontest.class ; then
-            java_cmd="$JAVAINTERPRETER -cp $SAXON_JAR:. saxontest saxontest.xsl 1>&2"
-            { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$java_cmd\""; } >&5
-  (eval $java_cmd) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-            if test $? = 0; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            else
-              cat saxontest.java >&5
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-              as_fn_error $? "Non-functional saxon jar, e.g. crippled saxon-he instead of saxonb" "$LINENO" 5
-            fi
-        else
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-          cat saxontest.java >&5
-          as_fn_error $? "saxontest could not be compiled, non-functional saxon jar" "$LINENO" 5
-        fi
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_SAXON=NO
-    NEED_SAXON=TRUE
-fi
-
-
-
-if test -n "$NEED_SAXON"; then
-   BUILD_TYPE="$BUILD_TYPE SAXON"
-fi
-
-if test "$_os" = "Darwin" && test "$with_system_curl" != "no"; then
-   with_system_curl=yes
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which curl to use" >&5
-$as_echo_n "checking which curl to use... " >&6; }
-if test -n "$with_system_curl" -o -n "$with_system_libs" && \
-	test "$with_system_curl" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-   SYSTEM_CURL=YES
-
-   # Extract the first word of "curl-config", so it can be a program name with args.
-set dummy curl-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CURLCONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CURLCONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CURLCONFIG="$CURLCONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_CURLCONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CURLCONFIG=$ac_cv_path_CURLCONFIG
-if test -n "$CURLCONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURLCONFIG" >&5
-$as_echo "$CURLCONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-   if test -z "$CURLCONFIG"; then
-      as_fn_error $? "install curl to run this script" "$LINENO" 5
-   fi
-
-   # check curl version
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether curl is >= 7.13.1" >&5
-$as_echo_n "checking whether curl is >= 7.13.1... " >&6; }
-   if test "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $1 }'`" -gt "7" -a \
-	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "13" -a \
-	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "1"; then
-      as_fn_error $? "no, you need at least curl 7.13,1" "$LINENO" 5
-   else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   fi
-   CURL_LIBS=`$CURLCONFIG --libs`
-   CURL_CFLAGS=`$CURLCONFIG --cflags`
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-   SYSTEM_CURL=NO
-   BUILD_TYPE="$BUILD_TYPE CURL"
-fi
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which mdds to use" >&5
-$as_echo_n "checking which mdds to use... " >&6; }
-if test -n "$with_system_mdds" -o -n "$with_system_headers" && \
-	test "$with_system_mdds" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-    SYSTEM_MDDS=YES
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-    ac_fn_cxx_check_header_mongrel "$LINENO" "mdds/flat_segment_tree.hpp" "ac_cv_header_mdds_flat_segment_tree_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_mdds_flat_segment_tree_hpp" = x""yes; then :
-
-else
-  as_fn_error $? "mdds/flat_segment_tree.hpp not found. install mdds" "$LINENO" 5
-fi
-
-
-    ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-   BUILD_TYPE="$BUILD_TYPE MDDS"
-   SYSTEM_MDDS=NO
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which boost to use" >&5
-$as_echo_n "checking which boost to use... " >&6; }
-if test -n "$with_system_boost" -o -n "$with_system_headers" && \
-	test "$with_system_boost" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-   SYSTEM_BOOST=YES
-   ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-   ac_fn_cxx_check_header_mongrel "$LINENO" "boost/shared_ptr.hpp" "ac_cv_header_boost_shared_ptr_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_shared_ptr_hpp" = x""yes; then :
-
-else
-  as_fn_error $? "boost/shared_ptr.hpp not found. install boost" "$LINENO" 5
-fi
-
-
-   ac_fn_cxx_check_header_mongrel "$LINENO" "boost/spirit/include/classic_core.hpp" "ac_cv_header_boost_spirit_include_classic_core_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_spirit_include_classic_core_hpp" = x""yes; then :
-
-else
-  as_fn_error $? "boost/spirit/include/classic_core.hpp not found. install boost >= 1.36" "$LINENO" 5
-fi
-
-
-   ac_fn_cxx_check_header_mongrel "$LINENO" "boost/function.hpp" "ac_cv_header_boost_function_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_function_hpp" = x""yes; then :
-
-else
-  as_fn_error $? "boost/function.hpp not found. install boost" "$LINENO" 5
-fi
-
-
-
-   save_CXXFLAGS=$CXXFLAGS
-   CXXFLAGS="$CXXFLAGS -fno-exceptions"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether boost/function.hpp compiles with -fno-exceptions" >&5
-$as_echo_n "checking whether boost/function.hpp compiles with -fno-exceptions... " >&6; }
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <boost/function.hpp>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_cxx_boost_no_exceptons_broken=no
-else
-  ac_cv_cxx_boost_no_exceptons_broken=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-   if test "$ac_cv_cxx_boost_no_exceptons_broken" = "yes"; then
-	as_fn_error $? "no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131" "$LINENO" 5
-   else
-  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   fi
-   CXXFLAGS=$save_CXXFLAGS
-   ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-   BUILD_TYPE="$BUILD_TYPE BOOST"
-   SYSTEM_BOOST=NO
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which vigra to use" >&5
-$as_echo_n "checking which vigra to use... " >&6; }
-if test -n "$with_system_vigra" -o -n "$with_system_headers" && \
-	test "$with_system_vigra" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-   SYSTEM_VIGRA=YES
-   ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-   ac_fn_cxx_check_header_mongrel "$LINENO" "vigra/copyimage.hxx" "ac_cv_header_vigra_copyimage_hxx" "$ac_includes_default"
-if test "x$ac_cv_header_vigra_copyimage_hxx" = x""yes; then :
-
-else
-  as_fn_error $? "vigra/copyimage.hxx not found. install vigra" "$LINENO" 5
-fi
-
-
-   ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-   BUILD_TYPE="$BUILD_TYPE VIGRA"
-   SYSTEM_VIGRA=NO
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which odbc headers to use" >&5
-$as_echo_n "checking which odbc headers to use... " >&6; }
-if test -n "$with_system_odbc_headers" -o -n "$with_system_headers" && \
-	test "$with_system_odbc_headers" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-   SYSTEM_ODBC_HEADERS=YES
-
-   ac_fn_c_check_header_mongrel "$LINENO" "sqlext.h" "ac_cv_header_sqlext_h" "$ac_includes_default"
-if test "x$ac_cv_header_sqlext_h" = x""yes; then :
-
-else
-  as_fn_error $? "odbc not found. install odbc" "$LINENO" 5
-fi
-
-
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-   SYSTEM_ODBC_HEADERS=NO
-   BUILD_TYPE="$BUILD_TYPE UNIXODBC"
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable build of Mozilla/Mozilla NSS-using components" >&5
-$as_echo_n "checking whether to enable build of Mozilla/Mozilla NSS-using components... " >&6; }
-if test "$enable_mozilla" = "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   WITH_MOZILLA=NO
-   ENABLE_NSS_MODULE=NO
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   WITH_MOZILLA=YES
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Mozilla addressbook connectivity" >&5
-$as_echo_n "checking whether to build Mozilla addressbook connectivity... " >&6; }
-if test "$enable_mozilla" = "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-elif test "$with_system_mozilla" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, not possible with system-mozilla" >&5
-$as_echo "no, not possible with system-mozilla" >&6; }
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build XML Security support" >&5
-$as_echo_n "checking whether to build XML Security support... " >&6; }
-if test "$enable_mozilla" = "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, since Mozilla (NSS) disabled but needed" >&5
-$as_echo "no, since Mozilla (NSS) disabled but needed" >&6; }
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build LDAP configuration backend" >&5
-$as_echo_n "checking whether to build LDAP configuration backend... " >&6; }
-if test -z "$enable_ldap" || test "$enable_ldap" = "yes"; then
-   if test "$enable_mozilla" = "yes" || test "$with_openldap" = "yes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-      WITH_LDAP=YES
-   else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no. Either Mozilla or OpenLDAP needed" >&5
-$as_echo "no. Either Mozilla or OpenLDAP needed" >&6; }
-      WITH_LDAP=NO
-   fi
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   WITH_LDAP=NO
-fi
-
-if test "$WITH_LDAP" = "YES"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking which LDAP SDK to use" >&5
-$as_echo_n "checking which LDAP SDK to use... " >&6; }
-   if test -n "$with_openldap" && test "$with_openldap" != "no"; then
-  	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenLDAP" >&5
-$as_echo "OpenLDAP" >&6; }
-	   WITH_OPENLDAP=YES
-	   for ac_header in ldap.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default"
-if test "x$ac_cv_header_ldap_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LDAP_H 1
-_ACEOF
-
-else
-  as_fn_error $? "ldap.h not found. install openldap libs" "$LINENO" 5
-fi
-
-done
-
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_simple_bind_s in -lldap" >&5
-$as_echo_n "checking for ldap_simple_bind_s in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_ldap_simple_bind_s+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldap  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ldap_simple_bind_s ();
-int
-main ()
-{
-return ldap_simple_bind_s ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ldap_ldap_simple_bind_s=yes
-else
-  ac_cv_lib_ldap_ldap_simple_bind_s=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_simple_bind_s" >&5
-$as_echo "$ac_cv_lib_ldap_ldap_simple_bind_s" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_simple_bind_s" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBLDAP 1
-_ACEOF
-
-  LIBS="-lldap $LIBS"
-
-else
-  as_fn_error $? "openldap lib not found or functional" "$LINENO" 5
-fi
-
-	   # rumours say that OpenLDAP doesn't have that function. I looked and
-	   # it has it. Test for it to be sure
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_set_option in -lldap" >&5
-$as_echo_n "checking for ldap_set_option in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_ldap_set_option+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldap  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ldap_set_option ();
-int
-main ()
-{
-return ldap_set_option ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ldap_ldap_set_option=yes
-else
-  ac_cv_lib_ldap_ldap_set_option=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_set_option" >&5
-$as_echo "$ac_cv_lib_ldap_ldap_set_option" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_set_option" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBLDAP 1
-_ACEOF
-
-  LIBS="-lldap $LIBS"
-
-else
-  as_fn_error $? "openldap lib not found or functional" "$LINENO" 5
-fi
-
-   else
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: Netscape/Mozilla" >&5
-$as_echo "Netscape/Mozilla" >&6; }
-	   # TODO. Actually do a sanity check and check for
-	   # LDAP_OPT_SIZELIMIT and LDAP_X_OPT_CONNECT_TIMEOUT
-	   WITH_OPENLDAP=NO
-   fi
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which mozilla to use" >&5
-$as_echo_n "checking which mozilla to use... " >&6; }
-if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-    SYSTEM_MOZILLA=YES
-    ENABLE_NSS_MODULE=NO
-    enable_nss_module=no
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking which Mozilla flavour to use" >&5
-$as_echo_n "checking which Mozilla flavour to use... " >&6; }
-    if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then
-      MOZ_FLAVOUR=libxul
-    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
-      MOZ_FLAVOUR=xulrunner
-    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "seamonkey"; then
-      MOZ_FLAVOUR=seamonkey
-    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "firefox"; then
-      MOZ_FLAVOUR=firefox
-    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then
-      MOZ_FLAVOUR=mozilla
-    else
-      MOZ_FLAVOUR=libxul
-    fi
-    tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst(<STDIN>);'`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tmp" >&5
-$as_echo "$tmp" >&6; }
-
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nss" >&5
-$as_echo_n "checking for nss... " >&6; }
-
-        if $PKG_CONFIG --exists "nss" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSS_CFLAGS" >&5
-$as_echo_n "checking MOZ_NSS_CFLAGS... " >&6; }
-            MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSS_CFLAGS" >&5
-$as_echo "$MOZ_NSS_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSS_LIBS" >&5
-$as_echo_n "checking MOZ_NSS_LIBS... " >&6; }
-            MOZ_NSS_LIBS=`$PKG_CONFIG --libs "nss"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSS_LIBS" >&5
-$as_echo "$MOZ_NSS_LIBS" >&6; }
-        else
-            MOZ_NSS_CFLAGS=""
-            MOZ_NSS_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            MOZ_NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nss"`
-
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     STANDALONENSS="TRUE"
-  else
-     STANDALONENSS=""
-  fi
-
-    if test -z "$STANDALONENSS"; then
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MOZ_FLAVOUR-nss " >&5
-$as_echo_n "checking for $MOZ_FLAVOUR-nss ... " >&6; }
-
-        if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nss " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSS_CFLAGS" >&5
-$as_echo_n "checking MOZ_NSS_CFLAGS... " >&6; }
-            MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nss "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSS_CFLAGS" >&5
-$as_echo "$MOZ_NSS_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSS_LIBS" >&5
-$as_echo_n "checking MOZ_NSS_LIBS... " >&6; }
-            MOZ_NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nss "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSS_LIBS" >&5
-$as_echo "$MOZ_NSS_LIBS" >&6; }
-        else
-            MOZ_NSS_CFLAGS=""
-            MOZ_NSS_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            MOZ_NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nss "`
-            echo $MOZ_NSS_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-    else
-        NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`"
-
-    fi
-
-    if $PKG_CONFIG --exists nspr ; then
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nspr " >&5
-$as_echo_n "checking for nspr ... " >&6; }
-
-        if $PKG_CONFIG --exists "nspr " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSPR_CFLAGS" >&5
-$as_echo_n "checking MOZ_NSPR_CFLAGS... " >&6; }
-            MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSPR_CFLAGS" >&5
-$as_echo "$MOZ_NSPR_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSPR_LIBS" >&5
-$as_echo_n "checking MOZ_NSPR_LIBS... " >&6; }
-            MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "nspr "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSPR_LIBS" >&5
-$as_echo "$MOZ_NSPR_LIBS" >&6; }
-        else
-            MOZ_NSPR_CFLAGS=""
-            MOZ_NSPR_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            MOZ_NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr "`
-            echo $MOZ_NSPR_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-      NSPR_LIB="-L`$PKG_CONFIG --variable=libdir nspr`"
-
-    else
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MOZ_FLAVOUR-nspr " >&5
-$as_echo_n "checking for $MOZ_FLAVOUR-nspr ... " >&6; }
-
-        if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nspr " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSPR_CFLAGS" >&5
-$as_echo_n "checking MOZ_NSPR_CFLAGS... " >&6; }
-            MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSPR_CFLAGS" >&5
-$as_echo "$MOZ_NSPR_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSPR_LIBS" >&5
-$as_echo_n "checking MOZ_NSPR_LIBS... " >&6; }
-            MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSPR_LIBS" >&5
-$as_echo "$MOZ_NSPR_LIBS" >&6; }
-        else
-            MOZ_NSPR_CFLAGS=""
-            MOZ_NSPR_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            MOZ_NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nspr "`
-            echo $MOZ_NSPR_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-    fi
-
-    if test "$MOZ_FLAVOUR" != "libxul"; then
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MOZ_FLAVOUR-xpcom" >&5
-$as_echo_n "checking for $MOZ_FLAVOUR-xpcom... " >&6; }
-
-        if $PKG_CONFIG --exists "$MOZ_FLAVOUR-xpcom" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZILLAXPCOM_CFLAGS" >&5
-$as_echo_n "checking MOZILLAXPCOM_CFLAGS... " >&6; }
-            MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-xpcom"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLAXPCOM_CFLAGS" >&5
-$as_echo "$MOZILLAXPCOM_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZILLAXPCOM_LIBS" >&5
-$as_echo_n "checking MOZILLAXPCOM_LIBS... " >&6; }
-            MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-xpcom"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLAXPCOM_LIBS" >&5
-$as_echo "$MOZILLAXPCOM_LIBS" >&6; }
-        else
-            MOZILLAXPCOM_CFLAGS=""
-            MOZILLAXPCOM_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            MOZILLAXPCOM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZ_FLAVOUR-xpcom"`
-
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     HASXPCOM="TRUE"
-  else
-     HASXPCOM=""
-  fi
-
-      MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
-      MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
-    fi
-
-    if test -z "$HASXPCOM"; then
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxul " >&5
-$as_echo_n "checking for libxul ... " >&6; }
-
-        if $PKG_CONFIG --exists "libxul " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZILLAXPCOM_CFLAGS" >&5
-$as_echo_n "checking MOZILLAXPCOM_CFLAGS... " >&6; }
-            MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "libxul "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLAXPCOM_CFLAGS" >&5
-$as_echo "$MOZILLAXPCOM_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZILLAXPCOM_LIBS" >&5
-$as_echo_n "checking MOZILLAXPCOM_LIBS... " >&6; }
-            MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "libxul "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLAXPCOM_LIBS" >&5
-$as_echo "$MOZILLAXPCOM_LIBS" >&6; }
-        else
-            MOZILLAXPCOM_CFLAGS=""
-            MOZILLAXPCOM_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            MOZILLAXPCOM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxul "`
-            echo $MOZILLAXPCOM_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-      MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
-      MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul`
-      if ! test -e "$MOZ_LIB/libxul.so"; then
-         MOZ_LIB=`$PKG_CONFIG --variable=sdkdir libxul`
-         if test -e "$MOZ_LIB/sdk/lib/libxul.so"; then
-            MOZ_LIB="$MOZ_LIB/sdk/lib"
-         fi
-      fi
-    fi
-
-    save_CPPFLAGS="$CPPFLAGS"
-    save_LDFLAGS="$LDFLAGS"
-    save_LIBS="$LIBS"
-    CPPFLAGS="$CPPFLAGS $MOZ_NSS_CFLAGS"
-    LDFLAGS="$LDFLAGS $MOZ_NSS_LIBS"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PK11_GetCertFromPrivateKey in -lnss3" >&5
-$as_echo_n "checking for PK11_GetCertFromPrivateKey in -lnss3... " >&6; }
-if test "${ac_cv_lib_nss3_PK11_GetCertFromPrivateKey+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnss3  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char PK11_GetCertFromPrivateKey ();
-int
-main ()
-{
-return PK11_GetCertFromPrivateKey ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=yes
-else
-  ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&5
-$as_echo "$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&6; }
-if test "x$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBNSS3 1
-_ACEOF
-
-  LIBS="-lnss3 $LIBS"
-
-else
-  as_fn_error $? "PK11_GetCertFromPrivateKey missing but needed.
-See https://bugzilla.mozilla.org/show_bug.cgi?id=262274.
-Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5)" "$LINENO" 5
-fi
-
-    LDFLAGS="$save_LDFLAGS"
-    CPPFLAGS="$save_CPPFLAGS"
-    LIBS="$save_LIBS"
-
-    MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
-    if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $tmp was compiled with --enable-ldap" >&5
-$as_echo_n "checking whether $tmp was compiled with --enable-ldap... " >&6; }
-      if test -d "$MOZ_INC/ldap"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-         MOZ_LDAP_CFLAGS="-I$MOZ_INC"
-      else
-        as_fn_error $? "no.
-Could not find LDAP header include files in $MOZ_INC/ldap.
-Please recompile $tmp with --enable-ldap or use --with-openldap." "$LINENO" 5
-      fi
-    fi
-
-    #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
-    #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
-    if test "$MOZ_FLAVOUR" = "libxul"; then
-        MOZ_FLAVOUR="mozilla"
-    fi
-
-elif test "$enable_mozilla" = "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-    WITH_MOZILLA=NO
-    ENABLE_NSS_MODULE=NO
-    enable_nss_module=no
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_MOZILLA=NO
-    BUILD_TYPE="$BUILD_TYPE MOZ"
-if test -z "$with_mozilla_version"; then
-   MOZILLA_VERSION=
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking which mozilla version to build" >&5
-$as_echo_n "checking which mozilla version to build... " >&6; }
-   MOZILLA_VERSION=$with_mozilla_version
-   enable_build_mozilla=1
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLA_VERSION" >&5
-$as_echo "$MOZILLA_VERSION" >&6; }
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for toolkit mozilla should use" >&5
-$as_echo_n "checking for toolkit mozilla should use... " >&6; }
-if test -z "$with_mozilla_toolkit"; then
-   if test "$_os" != "WINNT" ; then
-      if test "$_os" = "Darwin" ; then
-         MOZILLA_TOOLKIT=mac
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: mac" >&5
-$as_echo "mac" >&6; }
-      else
-         MOZILLA_TOOLKIT=gtk2
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk2" >&5
-$as_echo "gtk2" >&6; }
-      fi
-   fi
-else
-   MOZILLA_TOOLKIT=$with_mozilla_toolkit
-   enable_build_mozilla=1
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLA_TOOLKIT" >&5
-$as_echo "$MOZILLA_TOOLKIT" >&6; }
-fi
-#if test "$_os" = "Darwin" && test "$MOZILLA_TOOLKIT" != "gtk2"; then
-#   #only gtk2 toolkit supported - xlib or cocoa nees glib1 and libIDL1 - the latter is not
-#   #available using fink, mac (carbon) doesn't work because xcode installs conflicting headers
-#   AC_MSG_ERROR([Only gtk2 toolkit supported on Mac, sorry.])
-#fi
-
-
-
-# default to enabling build mozilla
-if test "$enable_build_mozilla" != "no"; then
-      enable_build_mozilla=yes
-else
-      enable_build_mozilla=
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Mozilla/SeaMonkey" >&5
-$as_echo_n "checking whether to build Mozilla/SeaMonkey... " >&6; }
-if test -n "$enable_build_mozilla"; then
-   BUILD_MOZAB="TRUE"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-   BUILD_MOZAB=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build provided NSS module" >&5
-$as_echo_n "checking whether to build provided NSS module... " >&6; }
-if test "$enable_nss_module" != "no"; then
-   ENABLE_NSS_MODULE="YES"
-   BUILD_TYPE="$BUILD_TYPE NSS"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   if test "$_os" = "WINNT"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mozilla build tooling" >&5
-$as_echo_n "checking for Mozilla build tooling... " >&6; }
-      if test -z "$MOZILLABUILD" ; then
-as_fn_error $? "Mozilla build tooling not found.
-Use the --with-mozilla-build option after installling the tools obtained
-from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32" "$LINENO" 5
-      else
-         if test \( "$WITH_MINGWIN" = "yes" \) ; then
-            if test ! -d "$MOZILLABUILD" ; then
-as_fn_error $? "Mozilla build tooling incomplete!" "$LINENO" 5
-            else
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-            fi
-         else
-            if test ! -d "$MOZILLABUILD/moztools" \
-               -o ! -d "$MOZILLABUILD/msys" ; then
-as_fn_error $? "Mozilla build tooling incomplete!" "$LINENO" 5
-            else
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-            fi
-         fi
-      fi
-   fi
-else
-   ENABLE_NSS_MODULE="NO"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-if test "$BUILD_MOZAB" = "TRUE"; then
-  if test "$_os" = "WINNT"; then
-    if test "$WITH_MINGWIN" != "yes"; then
-      # compiling with MSVC. Only supported platform here is MSVS2005 at the moment.
-      if test "$MSVSVER" != "2005"; then
-        as_fn_error $? "Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." "$LINENO" 5
-      fi
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&5
-$as_echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&2;}
-      echo "Building SeaMonkey with mingwin is not tested, and likely to break." >> warn
-    fi
-  fi
-
-   if test -z "$MOZILLA_VERSION"; then
-      MOZILLA_VERSION=1.1.14
-   fi
-   MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source"
-   MOZILLA_FETCH_FILE=`grep $MOZILLA_SOURCE_VERSION ooo.lst`
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mozilla sources" >&5
-$as_echo_n "checking for mozilla sources... " >&6; }
-   if test -z "$MOZILLA_FETCH_FILE"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-      HAVE_MOZILLA_TARBALL=n
-   else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MOZILLA_FETCH_FILE" >&5
-$as_echo_n "checking for $MOZILLA_FETCH_FILE... " >&6; }
-      if test ! -e "$TARFILE_LOCATION/$MOZILLA_FETCH_FILE"; then
-         if test -z "$DO_FETCH"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: will be fetched" >&5
-$as_echo "will be fetched" >&6; }
-            HAVE_MOZILLA_TARBALL=y
-         else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-            HAVE_MOZILLA_TARBALL=n
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
-         HAVE_MOZILLA_TARBALL=y
-      fi
-   fi
-   if test "$HAVE_MOZILLA_TARBALL" != "y"; then
-      as_fn_error $? "Mozilla/SeaMonkey source archive not found.
-Use \"./fetch_tarballs.sh ooo.lst\" to download." "$LINENO" 5
-   fi
-   if test "$_os" = "WINNT"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for moztools binaries" >&5
-$as_echo_n "checking for moztools binaries... " >&6; }
-      if test ! -e "$TARFILE_LOCATION/vc8-moztools.zip" ; then
-        as_fn_error $? "The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip
-(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" "$LINENO" 5
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-      fi
-   elif test "$_os" = "Darwin"; then
-      if test "$MOZILLA_TOOLKIT" = "gtk2"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mozilla can be built..." >&5
-$as_echo "$as_me: checking whether mozilla can be built..." >&6;}
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" >&5
-$as_echo_n "checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8... " >&6; }
-
-        if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZGTK2_CFLAGS" >&5
-$as_echo_n "checking MOZGTK2_CFLAGS... " >&6; }
-            MOZGTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZGTK2_CFLAGS" >&5
-$as_echo "$MOZGTK2_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZGTK2_LIBS" >&5
-$as_echo_n "checking MOZGTK2_LIBS... " >&6; }
-            MOZGTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZGTK2_LIBS" >&5
-$as_echo "$MOZGTK2_LIBS" >&6; }
-        else
-            MOZGTK2_CFLAGS=""
-            MOZGTK2_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            MOZGTK2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8"`
-
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: OK - can build mozilla" >&5
-$as_echo "$as_me: OK - can build mozilla" >&6;}
-  else
-     as_fn_error $? "Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" "$LINENO" 5
-  fi
-
-      else
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libIDL-2.0 >= 0.6.3" >&5
-$as_echo_n "checking for libIDL-2.0 >= 0.6.3... " >&6; }
-
-        if $PKG_CONFIG --exists "libIDL-2.0 >= 0.6.3" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5
-$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; }
-            MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.6.3"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5
-$as_echo "$MOZLIBREQ_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5
-$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; }
-            MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.6.3"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5
-$as_echo "$MOZLIBREQ_LIBS" >&6; }
-        else
-            MOZLIBREQ_CFLAGS=""
-            MOZLIBREQ_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            MOZLIBREQ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libIDL-2.0 >= 0.6.3"`
-
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     MOZIDL="TRUE"
-  else
-     MOZIDL=""
-  fi
-
-         if test -z "$MOZIDL"; then
-            as_fn_error $? "libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit." "$LINENO" 5
-         fi
-      fi
-   else
-      # Generic Unix/Linux section
-      if test "$MOZILLA_TOOLKIT" = "gtk2"; then
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0" >&5
-$as_echo_n "checking for gtk+-2.0... " >&6; }
-
-        if $PKG_CONFIG --exists "gtk+-2.0" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5
-$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; }
-            MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5
-$as_echo "$MOZLIBREQ_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5
-$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; }
-            MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5
-$as_echo "$MOZLIBREQ_LIBS" >&6; }
-        else
-            MOZLIBREQ_CFLAGS=""
-            MOZLIBREQ_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            MOZLIBREQ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"`
-
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     MOZGTK="TRUE"
-  else
-     MOZGTK=""
-  fi
-
-         if test -z "$MOZGTK"; then
-            as_fn_error $? "GTK2 is needed to build mozilla." "$LINENO" 5
-         fi
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libIDL-2.0 >= 0.8.0" >&5
-$as_echo_n "checking for libIDL-2.0 >= 0.8.0... " >&6; }
-
-        if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5
-$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; }
-            MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5
-$as_echo "$MOZLIBREQ_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5
-$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; }
-            MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.8.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5
-$as_echo "$MOZLIBREQ_LIBS" >&6; }
-        else
-            MOZLIBREQ_CFLAGS=""
-            MOZLIBREQ_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            MOZLIBREQ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libIDL-2.0 >= 0.8.0"`
-
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     MOZIDL="TRUE"
-  else
-     MOZIDL=""
-  fi
-
-         if test -z "$MOZIDL"; then
-            as_fn_error $? "libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." "$LINENO" 5
-         fi
-      else
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+ >= 1.2.3" >&5
-$as_echo_n "checking for gtk+ >= 1.2.3... " >&6; }
-
-        if $PKG_CONFIG --exists "gtk+ >= 1.2.3" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5
-$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; }
-            MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "gtk+ >= 1.2.3"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5
-$as_echo "$MOZLIBREQ_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5
-$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; }
-            MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "gtk+ >= 1.2.3"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5
-$as_echo "$MOZLIBREQ_LIBS" >&6; }
-        else
-            MOZLIBREQ_CFLAGS=""
-            MOZLIBREQ_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            MOZLIBREQ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+ >= 1.2.3"`
-
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     MOZGTK="TRUE"
-  else
-     MOZGTK=""
-  fi
-
-         if test -z "$MOZGTK"; then
-            as_fn_error $? "gtk 1.2 is needed when not using GTK2 to build mozilla." "$LINENO" 5
-         fi
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libidl >= 0.6.3 libidl <= 0.6.8" >&5
-$as_echo_n "checking for libidl >= 0.6.3 libidl <= 0.6.8... " >&6; }
-
-        if $PKG_CONFIG --exists "libidl >= 0.6.3 libidl <= 0.6.8" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5
-$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; }
-            MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libidl >= 0.6.3 libidl <= 0.6.8"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5
-$as_echo "$MOZLIBREQ_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5
-$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; }
-            MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libidl >= 0.6.3 libidl <= 0.6.8"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5
-$as_echo "$MOZLIBREQ_LIBS" >&6; }
-        else
-            MOZLIBREQ_CFLAGS=""
-            MOZLIBREQ_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            MOZLIBREQ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libidl >= 0.6.3 libidl <= 0.6.8"`
-
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     MOZIDL="TRUE"
-  else
-     MOZIDL=""
-  fi
-
-         if test -z "$MOZIDL"; then
-            as_fn_error $? "libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." "$LINENO" 5
-         fi
-      fi
-   fi
-fi
-
-
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which sane header to use" >&5
-$as_echo_n "checking which sane header to use... " >&6; }
-if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \
-	test "$with_system_sane_header" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-   SYSTEM_SANE_HEADER=YES
-   ac_fn_c_check_header_mongrel "$LINENO" "sane/sane.h" "ac_cv_header_sane_sane_h" "$ac_includes_default"
-if test "x$ac_cv_header_sane_sane_h" = x""yes; then :
-
-else
-  as_fn_error $? "sane not found. install sane" "$LINENO" 5
-fi
-
-
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-   SYSTEM_SANE_HEADER=NO
-   BUILD_TYPE="$BUILD_TYPE SANE"
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which icu to use" >&5
-$as_echo_n "checking which icu to use... " >&6; }
-if test -n "$with_system_icu" -o -n "$with_system_libs" && \
-	test "$with_system_icu" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-   SYSTEM_ICU=YES
-   ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unicode/rbbi.h" >&5
-$as_echo_n "checking for unicode/rbbi.h... " >&6; }
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-unicode/rbbi.h
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked." >&5
-$as_echo "checked." >&6; }
-else
-  as_fn_error $? "icu headers not found." "$LINENO" 5
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-   ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-   # Extract the first word of "genbrk", so it can be a program name with args.
-set dummy genbrk; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SYSTEM_GENBRK+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $SYSTEM_GENBRK in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_SYSTEM_GENBRK="$SYSTEM_GENBRK" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:/usr/sbin:/sbin"
-for as_dir in $as_dummy
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_SYSTEM_GENBRK="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-SYSTEM_GENBRK=$ac_cv_path_SYSTEM_GENBRK
-if test -n "$SYSTEM_GENBRK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_GENBRK" >&5
-$as_echo "$SYSTEM_GENBRK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-   if test -z "$SYSTEM_GENBRK"; then
-      as_fn_error $? "\\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" "$LINENO" 5
-   fi
-   # Extract the first word of "genccode", so it can be a program name with args.
-set dummy genccode; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SYSTEM_GENCCODE+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $SYSTEM_GENCCODE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_SYSTEM_GENCCODE="$SYSTEM_GENCCODE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:/usr/sbin:/sbin"
-for as_dir in $as_dummy
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_SYSTEM_GENCCODE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-SYSTEM_GENCCODE=$ac_cv_path_SYSTEM_GENCCODE
-if test -n "$SYSTEM_GENCCODE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_GENCCODE" >&5
-$as_echo "$SYSTEM_GENCCODE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-   if test -z "$SYSTEM_GENCCODE"; then
-      as_fn_error $? "\\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" "$LINENO" 5
-   fi
-   # Extract the first word of "gencmn", so it can be a program name with args.
-set dummy gencmn; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SYSTEM_GENCMN+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $SYSTEM_GENCMN in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_SYSTEM_GENCMN="$SYSTEM_GENCMN" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:/usr/sbin:/sbin"
-for as_dir in $as_dummy
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_SYSTEM_GENCMN="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-SYSTEM_GENCMN=$ac_cv_path_SYSTEM_GENCMN
-if test -n "$SYSTEM_GENCMN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_GENCMN" >&5
-$as_echo "$SYSTEM_GENCMN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-   if test -z "$SYSTEM_GENCMN"; then
-      as_fn_error $? "\\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" "$LINENO" 5
-   fi
-
-   # Extract the first word of "icu-config", so it can be a program name with args.
-set dummy icu-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ICUCONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ICUCONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ICUCONFIG="$ICUCONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ICUCONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ICUCONFIG=$ac_cv_path_ICUCONFIG
-if test -n "$ICUCONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ICUCONFIG" >&5
-$as_echo "$ICUCONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking ICU version" >&5
-$as_echo_n "checking ICU version... " >&6; }
-   ICU_VERSION=`$ICUCONFIG --version`
-   ICU_MAJOR=`$ICUCONFIG --version | cut -d"." -f1`
-   ICU_MINOR=`$ICUCONFIG --version | cut -d"." -f2`
-   ICU_MICRO=`$ICUCONFIG --version | cut -d"." -f3`
-
-   if test "$ICU_MAJOR" -ge "4"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
-   else
-      as_fn_error $? "not suitable, only >= 4.0 supported currently" "$LINENO" 5
-   fi
-
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_ICU=NO
-    BUILD_TYPE="$BUILD_TYPE ICU"
-fi
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable graphite support" >&5
-$as_echo_n "checking whether to enable graphite support... " >&6; }
-if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" = "z" -o "$enable_graphite" != "no" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    ENABLE_GRAPHITE="TRUE"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking which graphite to use" >&5
-$as_echo_n "checking which graphite to use... " >&6; }
-    if test -n "$with_system_graphite" -o -n "$with_system_libs" && \
-        test "$with_system_graphite" != "no"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-        SYSTEM_GRAPHITE=YES
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for silgraphite " >&5
-$as_echo_n "checking for silgraphite ... " >&6; }
-
-        if $PKG_CONFIG --exists "silgraphite " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GRAPHITE_CFLAGS" >&5
-$as_echo_n "checking GRAPHITE_CFLAGS... " >&6; }
-            GRAPHITE_CFLAGS=`$PKG_CONFIG --cflags "silgraphite "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GRAPHITE_CFLAGS" >&5
-$as_echo "$GRAPHITE_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GRAPHITE_LIBS" >&5
-$as_echo_n "checking GRAPHITE_LIBS... " >&6; }
-            GRAPHITE_LIBS=`$PKG_CONFIG --libs "silgraphite "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GRAPHITE_LIBS" >&5
-$as_echo "$GRAPHITE_LIBS" >&6; }
-        else
-            GRAPHITE_CFLAGS=""
-            GRAPHITE_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            GRAPHITE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "silgraphite "`
-            echo $GRAPHITE_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (silgraphite ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-    else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-        SYSTEM_GRAPHITE=NO
-        BUILD_TYPE="$BUILD_TYPE GRAPHITE"
-    fi
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-
-
-if test  "$_os" = "Darwin"; then
-   if test "x$with_x" = "xyes"; then
-      as_fn_error $? "X11 build is no longer supported on MacOSX, please use the native aqua build" "$LINENO" 5
-   else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /System/Library/Frameworks/AppKit.framework" >&5
-$as_echo_n "checking for /System/Library/Frameworks/AppKit.framework... " >&6; }
-      if test -d "/System/Library/Frameworks/AppKit.framework/"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-         x_includes="no_x_includes"
-         x_libraries="no_x_libraries"
-                  enable_gtk=no
-         enable_cups=no
-         ENABLE_CUPS=""
-
-      else
-         as_fn_error $? "No AppKit.framewrok found" "$LINENO" 5
-      fi
-   fi
-fi
-
-if test "$_os" = "Darwin" -a "x$x_includes" = "xno_x_includes"; then
-   echo "Do Nothing for _os = Darwin"
-      :
-elif test "$_os" = "OS2" ; then
-   echo "Do Nothing for _os = OS2. Don't check for X11."
-      :
-elif test "$_os" != "WINNT" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
-$as_echo_n "checking for X... " >&6; }
-
-
-# Check whether --with-x was given.
-if test "${with_x+set}" = set; then :
-  withval=$with_x;
-fi
-
-# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
-if test "x$with_x" = xno; then
-  # The user explicitly disabled X.
-  have_x=disabled
-else
-  case $x_includes,$x_libraries in #(
-    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
-    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  # One or both of the vars are not set, and there is no cached value.
-ac_x_includes=no ac_x_libraries=no
-rm -f -r conftest.dir
-if mkdir conftest.dir; then
-  cd conftest.dir
-  cat >Imakefile <<'_ACEOF'
-incroot:
-	@echo incroot='${INCROOT}'
-usrlibdir:
-	@echo usrlibdir='${USRLIBDIR}'
-libdir:
-	@echo libdir='${LIBDIR}'
-_ACEOF
-  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-    for ac_var in incroot usrlibdir libdir; do
-      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
-    done
-    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl dylib la dll; do
-      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
-	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
-	ac_im_usrlibdir=$ac_im_libdir; break
-      fi
-    done
-    # Screen out bogus values from the imake configuration.  They are
-    # bogus both because they are the default anyway, and because
-    # using them would break gcc on systems where it needs fixed includes.
-    case $ac_im_incroot in
-	/usr/include) ac_x_includes= ;;
-	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-    esac
-    case $ac_im_usrlibdir in
-	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
-	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-    esac
-  fi
-  cd ..
-  rm -f -r conftest.dir
-fi
-
-# Standard set of common directories for X headers.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-ac_x_header_dirs='
-/usr/X11/include
-/usr/X11R7/include
-/usr/X11R6/include
-/usr/X11R5/include
-/usr/X11R4/include
-
-/usr/include/X11
-/usr/include/X11R7
-/usr/include/X11R6
-/usr/include/X11R5
-/usr/include/X11R4
-
-/usr/local/X11/include
-/usr/local/X11R7/include
-/usr/local/X11R6/include
-/usr/local/X11R5/include
-/usr/local/X11R4/include
-
-/usr/local/include/X11
-/usr/local/include/X11R7
-/usr/local/include/X11R6
-/usr/local/include/X11R5
-/usr/local/include/X11R4
-
-/usr/X386/include
-/usr/x386/include
-/usr/XFree86/include/X11
-
-/usr/include
-/usr/local/include
-/usr/unsupported/include
-/usr/athena/include
-/usr/local/x11r5/include
-/usr/lpp/Xamples/include
-
-/usr/openwin/include
-/usr/openwin/share/include'
-
-if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Xlib.h.
-  # First, try using that file with no special directory specified.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # We can compile using X headers with no special include directory.
-ac_x_includes=
-else
-  for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Xlib.h"; then
-    ac_x_includes=$ac_dir
-    break
-  fi
-done
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-fi # $ac_x_includes = no
-
-if test "$ac_x_libraries" = no; then
-  # Check for the libraries.
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS=$LIBS
-  LIBS="-lX11 $LIBS"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-int
-main ()
-{
-XrmInitialize ()
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  LIBS=$ac_save_LIBS
-# We can link X programs with no special library path.
-ac_x_libraries=
-else
-  LIBS=$ac_save_LIBS
-for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
-do
-  # Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl dylib la dll; do
-    if test -r "$ac_dir/libX11.$ac_extension"; then
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi # $ac_x_libraries = no
-
-case $ac_x_includes,$ac_x_libraries in #(
-  no,* | *,no | *\'*)
-    # Didn't find X, or a directory has "'" in its name.
-    ac_cv_have_x="have_x=no";; #(
-  *)
-    # Record where we found X for the cache.
-    ac_cv_have_x="have_x=yes\
-	ac_x_includes='$ac_x_includes'\
-	ac_x_libraries='$ac_x_libraries'"
-esac
-fi
-;; #(
-    *) have_x=yes;;
-  esac
-  eval "$ac_cv_have_x"
-fi # $with_x != no
-
-if test "$have_x" != yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
-$as_echo "$have_x" >&6; }
-  no_x=yes
-else
-  # If each of the values was on the command line, it overrides each guess.
-  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
-  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
-  # Update the cache value to reflect the command line values.
-  ac_cv_have_x="have_x=yes\
-	ac_x_includes='$x_includes'\
-	ac_x_libraries='$x_libraries'"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
-$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
-fi
-
-   if test "$no_x" = yes; then
-  # Not all programs may use this symbol, but it does not hurt to define it.
-
-$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
-
-  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-else
-  if test -n "$x_includes"; then
-    X_CFLAGS="$X_CFLAGS -I$x_includes"
-  fi
-
-  # It would also be nice to do this for all -L options, not just this one.
-  if test -n "$x_libraries"; then
-    X_LIBS="$X_LIBS -L$x_libraries"
-    # For Solaris; some versions of Sun CC require a space after -R and
-    # others require no space.  Words are not sufficient . . . .
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
-$as_echo_n "checking whether -R must be followed by a space... " >&6; }
-    ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-    ac_xsave_c_werror_flag=$ac_c_werror_flag
-    ac_c_werror_flag=yes
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-       X_LIBS="$X_LIBS -R$x_libraries"
-else
-  LIBS="$ac_xsave_LIBS -R $x_libraries"
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	  X_LIBS="$X_LIBS -R $x_libraries"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
-$as_echo "neither works" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    ac_c_werror_flag=$ac_xsave_c_werror_flag
-    LIBS=$ac_xsave_LIBS
-  fi
-
-  # Check for system-dependent libraries X programs must link with.
-  # Do this before checking for the system-independent R6 libraries
-  # (-lICE), since we may need -lsocket or whatever for X linking.
-
-  if test "$ISC" = yes; then
-    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
-  else
-    # Martyn Johnson says this is needed for Ultrix, if the X
-    # libraries were built with DECnet support.  And Karl Berry says
-    # the Alpha needs dnet_stub (dnet does not exist).
-    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XOpenDisplay ();
-int
-main ()
-{
-return XOpenDisplay ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
-$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dnet_ntoa ();
-int
-main ()
-{
-return dnet_ntoa ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dnet_dnet_ntoa=yes
-else
-  ac_cv_lib_dnet_dnet_ntoa=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-fi
-
-    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
-$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet_stub  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dnet_ntoa ();
-int
-main ()
-{
-return dnet_ntoa ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dnet_stub_dnet_ntoa=yes
-else
-  ac_cv_lib_dnet_stub_dnet_ntoa=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-fi
-
-    fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LIBS="$ac_xsave_LIBS"
-
-    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-    # to get the SysV transport functions.
-    # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
-    # needs -lnsl.
-    # The nsl library prevents programs from opening the X display
-    # on Irix 5.2, according to T.E. Dickey.
-    # The functions gethostbyname, getservbyname, and inet_addr are
-    # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-
-fi
-
-    if test $ac_cv_func_gethostbyname = no; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-int
-main ()
-{
-return gethostbyname ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_nsl_gethostbyname=yes
-else
-  ac_cv_lib_nsl_gethostbyname=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
-fi
-
-      if test $ac_cv_lib_nsl_gethostbyname = no; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
-$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbsd  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-int
-main ()
-{
-return gethostbyname ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_bsd_gethostbyname=yes
-else
-  ac_cv_lib_bsd_gethostbyname=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
-$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
-fi
-
-      fi
-    fi
-
-    # lieder@skyler.mavd.honeywell.com says without -lsocket,
-    # socket/setsockopt and other routines are undefined under SCO ODT
-    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
-    # on later versions), says Simon Leinen: it contains gethostby*
-    # variants that don't use the name server (or something).  -lsocket
-    # must be given before -lnsl if both are needed.  We assume that
-    # if connect needs -lnsl, so does gethostbyname.
-    ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-if test "x$ac_cv_func_connect" = x""yes; then :
-
-fi
-
-    if test $ac_cv_func_connect = no; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
-$as_echo_n "checking for connect in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char connect ();
-int
-main ()
-{
-return connect ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_socket_connect=yes
-else
-  ac_cv_lib_socket_connect=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
-$as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = x""yes; then :
-  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-fi
-
-    fi
-
-    # Guillermo Gomez says -lposix is necessary on A/UX.
-    ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
-if test "x$ac_cv_func_remove" = x""yes; then :
-
-fi
-
-    if test $ac_cv_func_remove = no; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
-$as_echo_n "checking for remove in -lposix... " >&6; }
-if test "${ac_cv_lib_posix_remove+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lposix  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char remove ();
-int
-main ()
-{
-return remove ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_posix_remove=yes
-else
-  ac_cv_lib_posix_remove=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
-$as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test "x$ac_cv_lib_posix_remove" = x""yes; then :
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-fi
-
-    fi
-
-    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-if test "x$ac_cv_func_shmat" = x""yes; then :
-
-fi
-
-    if test $ac_cv_func_shmat = no; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
-$as_echo_n "checking for shmat in -lipc... " >&6; }
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lipc  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shmat ();
-int
-main ()
-{
-return shmat ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ipc_shmat=yes
-else
-  ac_cv_lib_ipc_shmat=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
-$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-fi
-
-    fi
-  fi
-
-  # Check for libraries that X11R6 Xt/Xaw programs need.
-  ac_save_LDFLAGS=$LDFLAGS
-  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-  # check for ICE first), but we must link in the order -lSM -lICE or
-  # we get undefined symbols.  So assume we have SM if we have ICE.
-  # These have to be linked with before -lX11, unlike the other
-  # libraries we check for below, so use a different variable.
-  # John Interrante, Karl Berry
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
-$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char IceConnectionNumber ();
-int
-main ()
-{
-return IceConnectionNumber ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ICE_IceConnectionNumber=yes
-else
-  ac_cv_lib_ICE_IceConnectionNumber=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
-  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
-fi
-
-  LDFLAGS=$ac_save_LDFLAGS
-
-fi
-
-   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-
-   if test "x$x_includes" = "x"; then
-     x_includes="default_x_includes"
-   fi
-   if test "x$x_libraries" = "x"; then
-     x_libraries="default_x_libraries"
-   fi
-      if test -z "$x_libraries"; then
-      as_fn_error $? "No X libraries found" "$LINENO" 5  # Exit
-   fi
-   if test -z "$x_includes"; then
-      as_fn_error $? "No X includes found" "$LINENO" 5  # Exit
-   fi
-   CFLAGS=$X_CFLAGS
-   LDFLAGS="$X_LDFLAGS $X_LIBS"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5
-$as_echo_n "checking for XOpenDisplay in -lX11... " >&6; }
-if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lX11  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XOpenDisplay ();
-int
-main ()
-{
-return XOpenDisplay ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_X11_XOpenDisplay=yes
-else
-  ac_cv_lib_X11_XOpenDisplay=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-$as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; }
-if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then :
-  x_libs="-lX11 $X_EXTRA_LIBS"
-else
-  as_fn_error $? "X Development libraries not found" "$LINENO" 5
-fi
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauDisposeAuth in -lXau" >&5
-$as_echo_n "checking for XauDisposeAuth in -lXau... " >&6; }
-if test "${ac_cv_lib_Xau_XauDisposeAuth+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXau  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XauDisposeAuth ();
-int
-main ()
-{
-return XauDisposeAuth ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_Xau_XauDisposeAuth=yes
-else
-  ac_cv_lib_Xau_XauDisposeAuth=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xau_XauDisposeAuth" >&5
-$as_echo "$ac_cv_lib_Xau_XauDisposeAuth" >&6; }
-if test "x$ac_cv_lib_Xau_XauDisposeAuth" = x""yes; then :
-  XAU_LIBS="-lXau"
-fi
-
-else
-   x_includes="no_x_includes"
-   x_libraries="no_x_libraries"
-fi
-if test -z "$x_includes"; then
-   x_includes="no_x_includes"
-fi
-if test -z "$x_libraries"; then
-   x_libraries="no_x_libraries"
-fi
-if test "$x_includes" = "default_x_includes"; then
-   XINC="/usr/include"
-else
-   XINC="$x_includes"
-fi
-
-if test "$x_libraries" = "default_x_libraries"; then
-   XLIB=`$PKG_CONFIG --variable=libdir x11`
-   if test "x$XLIB" = x; then
-         XLIB="/usr/lib"
-   fi
-else
-   XLIB="$x_libraries"
-fi
-
-
-
-if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use Xaw" >&5
-$as_echo_n "checking whether to use Xaw... " >&6; }
-   if test "$enable_Xaw" = "no"; then
-       DISABLE_XAW=TRUE
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-       for ac_header in X11/Composite.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "X11/Composite.h" "ac_cv_header_X11_Composite_h" "#include <X11/Intrinsic.h>
-"
-if test "x$ac_cv_header_X11_Composite_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_X11_COMPOSITE_H 1
-_ACEOF
-
-else
-  as_fn_error $? "Xt include headers not found" "$LINENO" 5
-fi
-
-done
-
-   else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-       for ac_header in X11/Xaw/Label.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "X11/Xaw/Label.h" "ac_cv_header_X11_Xaw_Label_h" "#include <X11/Intrinsic.h>
-"
-if test "x$ac_cv_header_X11_Xaw_Label_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_X11_XAW_LABEL_H 1
-_ACEOF
-
-else
-  as_fn_error $? "Xaw include headers not found" "$LINENO" 5
-fi
-
-done
-
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXaw" >&5
-$as_echo_n "checking for main in -lXaw... " >&6; }
-if test "${ac_cv_lib_Xaw_main+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXaw  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_Xaw_main=yes
-else
-  ac_cv_lib_Xaw_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xaw_main" >&5
-$as_echo "$ac_cv_lib_Xaw_main" >&6; }
-if test "x$ac_cv_lib_Xaw_main" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBXAW 1
-_ACEOF
-
-  LIBS="-lXaw $LIBS"
-
-else
-  as_fn_error $? "Xaw library not found or functional" "$LINENO" 5
-fi
-
-   fi
-fi
-
-
-
-
-if test "$ENABLE_FONTCONFIG" = "TRUE" ; then
-    ac_fn_c_check_header_mongrel "$LINENO" "fontconfig/fontconfig.h" "ac_cv_header_fontconfig_fontconfig_h" "$ac_includes_default"
-if test "x$ac_cv_header_fontconfig_fontconfig_h" = x""yes; then :
-
-else
-  as_fn_error $? "fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" "$LINENO" 5
-fi
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fontconfig is >= 2.2.0" >&5
-$as_echo_n "checking whether fontconfig is >= 2.2.0... " >&6; }
-    if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <fontconfig/fontconfig.h>
-
-int main(int argc, char **argv) {
-	if(FC_MAJOR > 2 || (FC_MAJOR == 2 && FC_MINOR >= 2)) return 0;
-	else return 1;
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  as_fn_error $? "no, fontconfig >= 2.2.0 needed" "$LINENO" 5
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to link to Xrender" >&5
-$as_echo_n "checking whether to link to Xrender... " >&6; }
-if test -n "$enable_xrender_link" -a "$enable_xrender_link" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   XRENDER_LINK=YES
-   with_system_xrender_headers=yes
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, dynamically open it" >&5
-$as_echo "no, dynamically open it" >&6; }
-   XRENDER_LINK=NO
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which Xrender headers to use" >&5
-$as_echo_n "checking which Xrender headers to use... " >&6; }
-if test -n "$with_system_xrender_headers" -o -n "$with_system_headers" && \
-	test "$with_system_xrender_headers" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-   SYSTEM_XRENDER_HEADERS=YES
-   ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/Xrender.h" "ac_cv_header_X11_extensions_Xrender_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_extensions_Xrender_h" = x""yes; then :
-
-else
-  as_fn_error $? "Xrender not found. install X" "$LINENO" 5
-fi
-
-
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-   SYSTEM_XRENDER_HEADERS=NO
-   BUILD_TYPE="$BUILD_TYPE X11_EXTENSIONS"
-fi
-if test "$XRENDER_LINK" = "YES"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRenderQueryVersion in -lXrender" >&5
-$as_echo_n "checking for XRenderQueryVersion in -lXrender... " >&6; }
-if test "${ac_cv_lib_Xrender_XRenderQueryVersion+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXrender  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XRenderQueryVersion ();
-int
-main ()
-{
-return XRenderQueryVersion ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_Xrender_XRenderQueryVersion=yes
-else
-  ac_cv_lib_Xrender_XRenderQueryVersion=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderQueryVersion" >&5
-$as_echo "$ac_cv_lib_Xrender_XRenderQueryVersion" >&6; }
-if test "x$ac_cv_lib_Xrender_XRenderQueryVersion" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBXRENDER 1
-_ACEOF
-
-  LIBS="-lXrender $LIBS"
-
-else
-  as_fn_error $? "libXrender not found or functional" "$LINENO" 5
-fi
-
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable RandR support" >&5
-$as_echo_n "checking whether to enable RandR support... " >&6; }
-if test "$test_randr" = "yes" -a \( "$enable_randr" = "yes" -o "$enable_randr" = "TRUE" \) ; then
-   if test -z "$enable_randr_link" -o "$enable_randr_link" = "no"; then
-	  XRANDR_DLOPEN="TRUE"
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: resorting to dlopen libXrandr at runtime" >&5
-$as_echo "resorting to dlopen libXrandr at runtime" >&6; }
-   else
-	  XRANDR_DLOPEN="FALSE"
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xrandr >= 1.2" >&5
-$as_echo_n "checking for xrandr >= 1.2... " >&6; }
-
-        if $PKG_CONFIG --exists "xrandr >= 1.2" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking XRANDR_CFLAGS" >&5
-$as_echo_n "checking XRANDR_CFLAGS... " >&6; }
-            XRANDR_CFLAGS=`$PKG_CONFIG --cflags "xrandr >= 1.2"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XRANDR_CFLAGS" >&5
-$as_echo "$XRANDR_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking XRANDR_LIBS" >&5
-$as_echo_n "checking XRANDR_LIBS... " >&6; }
-            XRANDR_LIBS=`$PKG_CONFIG --libs "xrandr >= 1.2"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XRANDR_LIBS" >&5
-$as_echo "$XRANDR_LIBS" >&6; }
-        else
-            XRANDR_CFLAGS=""
-            XRANDR_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            XRANDR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xrandr >= 1.2"`
-
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     ENABLE_RANDR="TRUE"
-  else
-     ENABLE_RANDR=""
-  fi
-
-      if test "$ENABLE_RANDR" != "TRUE"; then
-         ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/Xrandr.h" "ac_cv_header_X11_extensions_Xrandr_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_extensions_Xrandr_h" = x""yes; then :
-
-else
-  as_fn_error $? "X11/extensions/Xrandr.h could not be found. X11 dev missing?" "$LINENO" 5
-fi
-
-
-         XRANDR_CFLAGS=" "
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRRQueryExtension in -lXrandr" >&5
-$as_echo_n "checking for XRRQueryExtension in -lXrandr... " >&6; }
-if test "${ac_cv_lib_Xrandr_XRRQueryExtension+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXrandr  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XRRQueryExtension ();
-int
-main ()
-{
-return XRRQueryExtension ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_Xrandr_XRRQueryExtension=yes
-else
-  ac_cv_lib_Xrandr_XRRQueryExtension=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrandr_XRRQueryExtension" >&5
-$as_echo "$ac_cv_lib_Xrandr_XRRQueryExtension" >&6; }
-if test "x$ac_cv_lib_Xrandr_XRRQueryExtension" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBXRANDR 1
-_ACEOF
-
-  LIBS="-lXrandr $LIBS"
-
-else
-   as_fn_error $? "libXrandr not found or functional" "$LINENO" 5
-fi
-
-         XRANDR_LIBS="-lXrandr "
-         ENABLE_RANDR="TRUE"
-	     { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling RandR support" >&5
-$as_echo "enabling RandR support" >&6; }
-      fi
-   fi
-else
-   ENABLE_RANDR=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use neon" >&5
-$as_echo_n "checking whether to use neon... " >&6; }
-if test "$enable_neon" = "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    DISABLE_NEON=TRUE
-
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which neon to use" >&5
-$as_echo_n "checking which neon to use... " >&6; }
-if test -n "$with_system_neon" -o -n "$with_system_libs" && \
-	test "$with_system_neon" != "no"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for neon >= 0.26.0" >&5
-$as_echo_n "checking for neon >= 0.26.0... " >&6; }
-
-        if $PKG_CONFIG --exists "neon >= 0.26.0" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking NEON_CFLAGS" >&5
-$as_echo_n "checking NEON_CFLAGS... " >&6; }
-            NEON_CFLAGS=`$PKG_CONFIG --cflags "neon >= 0.26.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NEON_CFLAGS" >&5
-$as_echo "$NEON_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking NEON_LIBS" >&5
-$as_echo_n "checking NEON_LIBS... " >&6; }
-            NEON_LIBS=`$PKG_CONFIG --libs "neon >= 0.26.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NEON_LIBS" >&5
-$as_echo "$NEON_LIBS" >&6; }
-        else
-            NEON_CFLAGS=""
-            NEON_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            NEON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "neon >= 0.26.0"`
-
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "you need neon >= 0.26.x for system-neon" "$LINENO" 5
-  fi
-
-        NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
-        NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
-        SYSTEM_NEON=YES
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_NEON=NO
-    NEON_LIBS=-lneon
-    NEON_CFLAGS=
-    BUILD_TYPE="$BUILD_TYPE NEON"
-fi
-
-
-
-
-fi
-
-if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
-   with_system_openssl=yes
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libssl to use" >&5
-$as_echo_n "checking which libssl to use... " >&6; }
-if test -n "$with_system_openssl" -o -n "$with_system_libs" && \
-        test "$with_system_openssl" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-    # Mac OS builds should get out without extra stuff is the Mac porters'
-    # wish. And pkg-config is although Xcode ships a .pc for openssl
-    if test "$_os" = "Darwin"; then
-        OPENSSL_CFLAGS=
-        OPENSSL_LIBS="-lssl -lcrypto"
-    else
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl " >&5
-$as_echo_n "checking for openssl ... " >&6; }
-
-        if $PKG_CONFIG --exists "openssl " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking OPENSSL_CFLAGS" >&5
-$as_echo_n "checking OPENSSL_CFLAGS... " >&6; }
-            OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL_CFLAGS" >&5
-$as_echo "$OPENSSL_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking OPENSSL_LIBS" >&5
-$as_echo_n "checking OPENSSL_LIBS... " >&6; }
-            OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL_LIBS" >&5
-$as_echo "$OPENSSL_LIBS" >&6; }
-        else
-            OPENSSL_CFLAGS=""
-            OPENSSL_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl "`
-            echo $OPENSSL_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-    fi
-    SYSTEM_OPENSSL=YES
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_OPENSSL=NO
-    BUILD_TYPE="$BUILD_TYPE OPENSSL"
-fi
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable agg" >&5
-$as_echo_n "checking whether to enable agg... " >&6; }
-if test "$with_agg" = "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  ENABLE_AGG=YES
-
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking which AGG to use" >&5
-$as_echo_n "checking which AGG to use... " >&6; }
-  if test -n "$with_system_agg" -o -n "$with_system_libs" && \
-     test "$with_system_agg" != "no"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libagg >= 2.3" >&5
-$as_echo_n "checking for libagg >= 2.3... " >&6; }
-
-        if $PKG_CONFIG --exists "libagg >= 2.3" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking AGG_CFLAGS" >&5
-$as_echo_n "checking AGG_CFLAGS... " >&6; }
-            AGG_CFLAGS=`$PKG_CONFIG --cflags "libagg >= 2.3"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AGG_CFLAGS" >&5
-$as_echo "$AGG_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking AGG_LIBS" >&5
-$as_echo_n "checking AGG_LIBS... " >&6; }
-            AGG_LIBS=`$PKG_CONFIG --libs "libagg >= 2.3"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AGG_LIBS" >&5
-$as_echo "$AGG_LIBS" >&6; }
-        else
-            AGG_CFLAGS=""
-            AGG_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            AGG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libagg >= 2.3"`
-            echo $AGG_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking agg version" >&5
-$as_echo_n "checking agg version... " >&6; }
-         # workaround; if AGG_CFLAGS is empty (broken libagg.pc in 2.3), add /usr/include/agg2 anyway
-         # (/usr/include gets stripped from pkg-config output)
-         if test -z "$AGG_CFLAGS" || test "$AGG_CFLAGS" = " "; then
-            AGG_INCDIR="`$PKG_CONFIG --variable includedir libagg`/agg2"
-         else
-            AGG_INCDIR="`echo $AGG_CFLAGS | $SED -e s/-I//`"
-         fi
-	 if $PKG_CONFIG --modversion libagg | grep -q 2.3 || \
-	 	$PKG_CONFIG --modversion libagg | grep -q 2.4; then
-            # 2.4's libagg.pc.in still contains 2.3 :/
-            if $EGREP -q "Version 2.4" `echo $AGG_INCDIR`/agg_basics.h; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.4" >&5
-$as_echo "2.4" >&6; }
-               AGG_VERSION=2400
-            else
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.3" >&5
-$as_echo "2.3" >&6; }
-               AGG_VERSION=2300
-            fi
-            SYSTEM_AGG=YES
-	 else
-	    as_fn_error $? "only agg 2.3 and 2.4 are supported" "$LINENO" 5
-	 fi
-  else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-         SYSTEM_AGG=NO
-         AGG_VERSION=2300
-         BUILD_TYPE="$BUILD_TYPE AGG"
-  fi
-
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which redland library to use" >&5
-$as_echo_n "checking which redland library to use... " >&6; }
-if test -n "$with_system_redland" -o -n "$with_system_libs" && \
-	test "$with_system_redland" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-	SYSTEM_REDLAND=YES
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for redland >= 1.0.8" >&5
-$as_echo_n "checking for redland >= 1.0.8... " >&6; }
-
-        if $PKG_CONFIG --exists "redland >= 1.0.8" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking REDLAND_CFLAGS" >&5
-$as_echo_n "checking REDLAND_CFLAGS... " >&6; }
-            REDLAND_CFLAGS=`$PKG_CONFIG --cflags "redland >= 1.0.8"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $REDLAND_CFLAGS" >&5
-$as_echo "$REDLAND_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking REDLAND_LIBS" >&5
-$as_echo_n "checking REDLAND_LIBS... " >&6; }
-            REDLAND_LIBS=`$PKG_CONFIG --libs "redland >= 1.0.8"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $REDLAND_LIBS" >&5
-$as_echo "$REDLAND_LIBS" >&6; }
-        else
-            REDLAND_CFLAGS=""
-            REDLAND_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            REDLAND_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "redland >= 1.0.8"`
-            echo $REDLAND_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (redland >= 1.0.8) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-	BUILD_TYPE="$BUILD_TYPE REDLAND"
-	SYSTEM_REDLAND=NO
-fi
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libhunspell to use" >&5
-$as_echo_n "checking which libhunspell to use... " >&6; }
-if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \
-	test "$with_system_hunspell" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-    SYSTEM_HUNSPELL=YES
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hunspell" >&5
-$as_echo_n "checking for hunspell... " >&6; }
-
-        if $PKG_CONFIG --exists "hunspell" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking HUNSPELL_CFLAGS" >&5
-$as_echo_n "checking HUNSPELL_CFLAGS... " >&6; }
-            HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HUNSPELL_CFLAGS" >&5
-$as_echo "$HUNSPELL_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking HUNSPELL_LIBS" >&5
-$as_echo_n "checking HUNSPELL_LIBS... " >&6; }
-            HUNSPELL_LIBS=`$PKG_CONFIG --libs "hunspell"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HUNSPELL_LIBS" >&5
-$as_echo "$HUNSPELL_LIBS" >&6; }
-        else
-            HUNSPELL_CFLAGS=""
-            HUNSPELL_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            HUNSPELL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hunspell"`
-
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     HUNSPELL_PC="TRUE"
-  else
-     HUNSPELL_PC=""
-  fi
-
-    if test "$HUNSPELL_PC" != "TRUE"; then
-      ac_fn_cxx_check_header_mongrel "$LINENO" "hunspell.hxx" "ac_cv_header_hunspell_hxx" "$ac_includes_default"
-if test "x$ac_cv_header_hunspell_hxx" = x""yes; then :
-
-else
-
-      ac_fn_cxx_check_header_mongrel "$LINENO" "hunspell/hunspell.hxx" "ac_cv_header_hunspell_hunspell_hxx" "$ac_includes_default"
-if test "x$ac_cv_header_hunspell_hunspell_hxx" = x""yes; then :
-   HUNSPELL_CFLAGS=-I/usr/include/hunspell
-else
-  as_fn_error $? "hunspell headers not found." "$LINENO" 5
-fi
-
-
-
-fi
-
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lhunspell" >&5
-$as_echo_n "checking for main in -lhunspell... " >&6; }
-if test "${ac_cv_lib_hunspell_main+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lhunspell  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_hunspell_main=yes
-else
-  ac_cv_lib_hunspell_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hunspell_main" >&5
-$as_echo "$ac_cv_lib_hunspell_main" >&6; }
-if test "x$ac_cv_lib_hunspell_main" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBHUNSPELL 1
-_ACEOF
-
-  LIBS="-lhunspell $LIBS"
-
-else
-   as_fn_error $? "hunspell library not found." "$LINENO" 5
-fi
-
-      HUNSPELL_LIBS=-lhunspell
-     fi
-    ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_HUNSPELL=NO
-    BUILD_TYPE="$BUILD_TYPE HUNSPELL"
-fi
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which altlinuxhyph to use" >&5
-$as_echo_n "checking which altlinuxhyph to use... " >&6; }
-if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \
-	test "$with_system_altlinuxhyph" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-    SYSTEM_HYPH=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "hyphen.h" "ac_cv_header_hyphen_h" "$ac_includes_default"
-if test "x$ac_cv_header_hyphen_h" = x""yes; then :
-
-else
-   as_fn_error $? "altlinuxhyph headers not found." "$LINENO" 5
-fi
-
-
-    ac_fn_c_check_member "$LINENO" "struct _HyphenDict" "cset" "ac_cv_member_struct__HyphenDict_cset" "#include <hyphen.h>
-"
-if test "x$ac_cv_member_struct__HyphenDict_cset" = x""yes; then :
-
-else
-   as_fn_error $? "no. You are sure you have altlinuyhyph headers?" "$LINENO" 5
-fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hnj_hyphen_hyphenate2 in -lhyphen" >&5
-$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhyphen... " >&6; }
-if test "${ac_cv_lib_hyphen_hnj_hyphen_hyphenate2+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lhyphen  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char hnj_hyphen_hyphenate2 ();
-int
-main ()
-{
-return hnj_hyphen_hyphenate2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=yes
-else
-  ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&5
-$as_echo "$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&6; }
-if test "x$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" = x""yes; then :
-  HYPHEN_LIB=-lhyphen
-else
-   as_fn_error $? "altlinuxhyph library not found or too old." "$LINENO" 5
-fi
-
-    if test -z "$HYPHEN_LIB"; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hnj_hyphen_hyphenate2 in -lhyph" >&5
-$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhyph... " >&6; }
-if test "${ac_cv_lib_hyph_hnj_hyphen_hyphenate2+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lhyph  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char hnj_hyphen_hyphenate2 ();
-int
-main ()
-{
-return hnj_hyphen_hyphenate2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_hyph_hnj_hyphen_hyphenate2=yes
-else
-  ac_cv_lib_hyph_hnj_hyphen_hyphenate2=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&5
-$as_echo "$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&6; }
-if test "x$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" = x""yes; then :
-  HYPHEN_LIB=-lhyph
-else
-   as_fn_error $? "altlinuxhyph library not found or too old." "$LINENO" 5
-fi
-
-    fi
-    if test -z "$HYPHEN_LIB"; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hnj_hyphen_hyphenate2 in -lhnj" >&5
-$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhnj... " >&6; }
-if test "${ac_cv_lib_hnj_hnj_hyphen_hyphenate2+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lhnj  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char hnj_hyphen_hyphenate2 ();
-int
-main ()
-{
-return hnj_hyphen_hyphenate2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_hnj_hnj_hyphen_hyphenate2=yes
-else
-  ac_cv_lib_hnj_hnj_hyphen_hyphenate2=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&5
-$as_echo "$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&6; }
-if test "x$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" = x""yes; then :
-  HYPHEN_LIB=-lhnj
-else
-   as_fn_error $? "altlinuxhyph library not found or too old." "$LINENO" 5
-fi
-
-    fi
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_HYPH=NO
-    BUILD_TYPE="$BUILD_TYPE HYPHEN"
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which mythes to use" >&5
-$as_echo_n "checking which mythes to use... " >&6; }
-if test -n "$with_system_mythes" && test "$with_system_mythes" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-    SYSTEM_MYTHES=YES
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mythes" >&5
-$as_echo_n "checking for mythes... " >&6; }
-
-        if $PKG_CONFIG --exists "mythes" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MYTHES_CFLAGS" >&5
-$as_echo_n "checking MYTHES_CFLAGS... " >&6; }
-            MYTHES_CFLAGS=`$PKG_CONFIG --cflags "mythes"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYTHES_CFLAGS" >&5
-$as_echo "$MYTHES_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MYTHES_LIBS" >&5
-$as_echo_n "checking MYTHES_LIBS... " >&6; }
-            MYTHES_LIBS=`$PKG_CONFIG --libs "mythes"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYTHES_LIBS" >&5
-$as_echo "$MYTHES_LIBS" >&6; }
-        else
-            MYTHES_CFLAGS=""
-            MYTHES_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            MYTHES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mythes"`
-
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     MYTHES_PKGCONFIG=yes
-  else
-     MYTHES_PKGCONFIG=no
-  fi
-
-    if test "$MYTHES_PKGCONFIG" = "no"; then
-        ac_fn_cxx_check_header_mongrel "$LINENO" "mythes.hxx" "ac_cv_header_mythes_hxx" "$ac_includes_default"
-if test "x$ac_cv_header_mythes_hxx" = x""yes; then :
-
-else
-   as_fn_error $? "mythes.hxx headers not found." "$LINENO" 5
-fi
-
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmythes-1.2" >&5
-$as_echo_n "checking for main in -lmythes-1.2... " >&6; }
-if test "${ac_cv_lib_mythes_1_2_main+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmythes-1.2  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_mythes_1_2_main=yes
-else
-  ac_cv_lib_mythes_1_2_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mythes_1_2_main" >&5
-$as_echo "$ac_cv_lib_mythes_1_2_main" >&6; }
-if test "x$ac_cv_lib_mythes_1_2_main" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBMYTHES_1_2 1
-_ACEOF
-
-  LIBS="-lmythes-1.2 $LIBS"
-
-else
-   MYTHES_FOUND=no
-fi
-
- 	if test "$MYTHES_FOUND" = "no"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmythes" >&5
-$as_echo_n "checking for main in -lmythes... " >&6; }
-if test "${ac_cv_lib_mythes_main+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmythes  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_mythes_main=yes
-else
-  ac_cv_lib_mythes_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mythes_main" >&5
-$as_echo "$ac_cv_lib_mythes_main" >&6; }
-if test "x$ac_cv_lib_mythes_main" = x""yes; then :
-  MYTHES_FOUND=yes
-else
-   MYTHES_FOUND=no
-fi
-
-	fi
-	if test "$MYTHES_FOUND" = "no"; then
-		as_fn_error $? "mythes library not found!." "$LINENO" 5
-	fi
-    fi
-    ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_MYTHES=NO
-    BUILD_TYPE="$BUILD_TYPE MYTHES"
-fi
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which lpsolve to use" >&5
-$as_echo_n "checking which lpsolve to use... " >&6; }
-if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
-	test "$with_system_lpsolve" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-    SYSTEM_LPSOLVE=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "lpsolve/lp_lib.h" "ac_cv_header_lpsolve_lp_lib_h" "$ac_includes_default"
-if test "x$ac_cv_header_lpsolve_lp_lib_h" = x""yes; then :
-
-else
-   as_fn_error $? "lpsolve headers not found." "$LINENO" 5
-fi
-
-
-    # some systems need this. Like Ubuntu....
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5
-$as_echo_n "checking for floor in -lm... " >&6; }
-if test "${ac_cv_lib_m_floor+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char floor ();
-int
-main ()
-{
-return floor ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_floor=yes
-else
-  ac_cv_lib_m_floor=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5
-$as_echo "$ac_cv_lib_m_floor" >&6; }
-if test "x$ac_cv_lib_m_floor" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
-
-  LIBS="-lm $LIBS"
-
-fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
-
-  LIBS="-ldl $LIBS"
-
-fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for make_lp in -llpsolve55" >&5
-$as_echo_n "checking for make_lp in -llpsolve55... " >&6; }
-if test "${ac_cv_lib_lpsolve55_make_lp+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-llpsolve55  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char make_lp ();
-int
-main ()
-{
-return make_lp ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_lpsolve55_make_lp=yes
-else
-  ac_cv_lib_lpsolve55_make_lp=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lpsolve55_make_lp" >&5
-$as_echo "$ac_cv_lib_lpsolve55_make_lp" >&6; }
-if test "x$ac_cv_lib_lpsolve55_make_lp" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBLPSOLVE55 1
-_ACEOF
-
-  LIBS="-llpsolve55 $LIBS"
-
-else
-   as_fn_error $? "lpsolve library not found or too old." "$LINENO" 5
-fi
-
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_LPSOLVE=NO
-    BUILD_TYPE="$BUILD_TYPE LPSOLVE"
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libtextcat to use" >&5
-$as_echo_n "checking which libtextcat to use... " >&6; }
-if test -n "$with_system_libtextcat" && test "$with_system_libtextcat" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-    SYSTEM_LIBTEXTCAT=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "libtextcat/textcat.h" "ac_cv_header_libtextcat_textcat_h" "$ac_includes_default"
-if test "x$ac_cv_header_libtextcat_textcat_h" = x""yes; then :
-
-else
-   as_fn_error $? "libtextcat headers not found." "$LINENO" 5
-fi
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special_textcat_Init in -ltextcat" >&5
-$as_echo_n "checking for special_textcat_Init in -ltextcat... " >&6; }
-if test "${ac_cv_lib_textcat_special_textcat_Init+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltextcat  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char special_textcat_Init ();
-int
-main ()
-{
-return special_textcat_Init ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_textcat_special_textcat_Init=yes
-else
-  ac_cv_lib_textcat_special_textcat_Init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_textcat_special_textcat_Init" >&5
-$as_echo "$ac_cv_lib_textcat_special_textcat_Init" >&6; }
-if test "x$ac_cv_lib_textcat_special_textcat_Init" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBTEXTCAT 1
-_ACEOF
-
-  LIBS="-ltextcat $LIBS"
-
-else
-   as_fn_error $? "libtextcat library not found or not suitable. libtextcat typically needs to be patched" "$LINENO" 5
-fi
-
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_LIBTEXTCAT=NO
-    BUILD_TYPE="$BUILD_TYPE LIBTEXTCAT"
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libtextcat data directory to use" >&5
-$as_echo_n "checking which libtextcat data directory to use... " >&6; }
-if test -n "$with_system_libtextcat_data" && test "$with_system_libtextcat_data" != "no"; then
-    if test "$with_system_libtextcat_data" = "yes"; then
-        SYSTEM_LIBTEXTCAT_DATA=file:///usr/share/libtextcat
-    else
-        SYSTEM_LIBTEXTCAT_DATA=file://$with_system_libtextcat_data
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_LIBTEXTCAT_DATA" >&5
-$as_echo "$SYSTEM_LIBTEXTCAT_DATA" >&6; }
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    BUILD_TYPE="$BUILD_TYPE LIBTEXTCATDATA"
-fi
-
-
-if test "$_os" = "Linux"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libc is >= 2.1.1" >&5
-$as_echo_n "checking whether libc is >= 2.1.1... " >&6; }
-   exec 6>/dev/null # no output
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnu_get_libc_version in -lc" >&5
-$as_echo_n "checking for gnu_get_libc_version in -lc... " >&6; }
-if test "${ac_cv_lib_c_gnu_get_libc_version+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gnu_get_libc_version ();
-int
-main ()
-{
-return gnu_get_libc_version ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_c_gnu_get_libc_version=yes
-else
-  ac_cv_lib_c_gnu_get_libc_version=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_gnu_get_libc_version" >&5
-$as_echo "$ac_cv_lib_c_gnu_get_libc_version" >&6; }
-if test "x$ac_cv_lib_c_gnu_get_libc_version" = x""yes; then :
-  HAVE_LIBC=yes; export HAVE_LIBC
-fi
-
-   exec 6>&1 # output on again
-   if test "$HAVE_LIBC"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   else
-      as_fn_error $? "no, upgrade libc" "$LINENO" 5
-   fi
-fi
-
-if test "$_os" != "WNT"; then
-  for ac_func in getopt
-do :
-  ac_fn_c_check_func "$LINENO" "getopt" "ac_cv_func_getopt"
-if test "x$ac_cv_func_getopt" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETOPT 1
-_ACEOF
- HAVE_GETOPT=YES
-else
-  HAVE_GETOPT=NO
-fi
-done
-
-  for ac_func in readdir_r
-do :
-  ac_fn_c_check_func "$LINENO" "readdir_r" "ac_cv_func_readdir_r"
-if test "x$ac_cv_func_readdir_r" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_READDIR_R 1
-_ACEOF
- HAVE_READDIR_R=YES
-else
-  HAVE_READDIR_R=NO
-fi
-done
-
-  if test "$HAVE_GETOPT" = "YES" -a "$HAVE_READDIR_R" = "YES"; then
-	SYSTEM_LIBC=YES
-  fi
-else
-  HAVE_GETOPT=NO
-  HAVE_READDIR_R=NO
-  SYSTEM_LIBC=YES
-fi
-
-
-
-
-if test \( "$_os" = "WINNT" \) ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PSDK files" >&5
-$as_echo_n "checking for PSDK files... " >&6; }
-	if test -z "$with_psdk_home"; then
-		# This first line will detect a February 2003 Microsoft Platform SDK
-		PSDK_HOME=`./oowintool --psdk-home`
-        # But there might be also an April 2005 PSDK, unfortunately MS changed
-        # the registry entry. (we prefer the old version!?)
-        if test -z "$PSDK_HOME"; then
-          PSDK_HOME=`cat /proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install\ Dir 2> /dev/null | tr '\000' '\n' | head -n 1`
-        fi
-            # normalize if found
-            if test -n "$PSDK_HOME"; then
-              PSDK_HOME=`cygpath -d "$PSDK_HOME"`
-              PSDK_HOME=`cygpath -u "$PSDK_HOME"`
-           fi
-	else
-           PSDK_HOME=`cygpath -u "$with_psdk_home"`
-	fi
-        # Remove a possible trailing backslash
-        PSDK_HOME=`echo $PSDK_HOME | $SED 's/\/$//'`
-    # Problem with current PSDK (iz 49865)
-    if test -f "$PSDK_HOME/Lib/libcp.lib"; then
-        as_fn_error $? "
-
-Some modules do not build correctly with MS Platform SDK - April 2005
-Edition if the library ($PSDK_HOME/Lib/libcp.lib) is found.
-Remove/rename/backup that file and restart configure. Details about this
-problem can be found in issue 49856." "$LINENO" 5
-    fi
-# WIndows SDK has different headers
-	if test \( -f "$PSDK_HOME/Include/adoint.h" \) \
-		 -a \( -f "$PSDK_HOME/Include/SqlUcode.h" \) \
-		 -a \( -f "$PSDK_HOME/Include/usp10.h" \); then
-		HAVE_PSDK_H="yes"
-	else
-		HAVE_PSDK_H="no"
-	fi
-	if test -f "$PSDK_HOME/lib/unicows.lib"; then
-		HAVE_PSDK_LIB="yes"
-	else
-		HAVE_PSDK_LIB="no"
-	fi
-    if test "$HAVE_PSDK_H" = "no" -o "$HAVE_PSDK_LIB" = "no"; then
-        as_fn_error $? "Some (all?) PSDK files not found, please check if all needed Platform SDKs
-are installed or use --with-psdk-home ." "$LINENO" 5
-    fi
-    if test ! -x "$PSDK_HOME/bin/msiinfo.exe" \
-         -o ! -x "$PSDK_HOME/bin/msidb.exe" \
-         -o ! -x "$PSDK_HOME/bin/uuidgen.exe" \
-         -o ! -x "$PSDK_HOME/bin/msitran.exe" ; then
-        as_fn_error $? "Some (all) files of the Windows Installer SDK are missing, please install." "$LINENO" 5
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SDK files found ...)" >&5
-$as_echo "SDK files found ...)" >&6; }
-    if echo $PSDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Found Windows SDK 6.1 ($PSDK_HOME)" >&5
-$as_echo "Found Windows SDK 6.1 ($PSDK_HOME)" >&6; }
-        WINDOWS_VISTA_PSDK=TRUE
-    elif echo $PSDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Found Windows SDK 6.0 ($PSDK_HOME)" >&5
-$as_echo "Found Windows SDK 6.0 ($PSDK_HOME)" >&6; }
-        WINDOWS_VISTA_PSDK=TRUE
-    else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Found Legacy Windows Platform SDK ($PSDK_HOME)" >&5
-$as_echo "Found Legacy Windows Platform SDK ($PSDK_HOME)" >&6; }
-    fi
-fi
-
-
-
-if test \( "$_os" = "WINNT" \) ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DirectX SDK files" >&5
-$as_echo_n "checking for DirectX SDK files... " >&6; }
-    if test -z "$with_directx_home"; then
-                if test -n "$DXSDK_DIR"; then
-            DIRECTXSDK_HOME=`cygpath -d "$DXSDK_DIR"`
-            DIRECTXSDK_HOME=`cygpath -u "$DIRECTXSDK_HOME"`
-        fi
-        # At this point $DIRECTXSDK_HOME might still be undefined. This will lead to
-        # the "DirectX SDK files not found" error later
-    else
-	DIRECTXSDK_HOME=`cygpath -u "$with_directx_home"`
-    fi
-    # Remove a possible trailing backslash
-    DIRECTXSDK_HOME=`echo $DIRECTXSDK_HOME | $SED 's/\/$//'`
-
-    if test -f "$DIRECTXSDK_HOME/Include/ddraw.h" ; then
-        HAVE_DIRECTXSDK_H="yes"
-    else
-        HAVE_DIRECTXSDK_H="no"
-    fi
-    # MS changed the location of the libraries with dec 2004 directx sdk
-    if test -d "$DIRECTXSDK_HOME/lib/x86" ; then
-        DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib/x86"
-    else
-        DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib"
-    fi
-    if test -f "$DIRECTXSDK_LIB/ddraw.lib" ; then
-        HAVE_DIRECTXSDK_LIB="yes"
-    else
-        HAVE_DIRECTXSDK_LIB="no"
-    fi
-    if test -n "$ENABLE_DIRECTX"; then
-	    if test "$HAVE_DIRECTXSDK_H" = "yes" -a "$HAVE_DIRECTXSDK_LIB" = "yes"; then
-		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
-	    else
-		    as_fn_error $? "DirectX SDK files not found, please use --with-directx-home or -disable-directx." "$LINENO" 5
-	    fi
-    else
-		DIRECTXSDK_HOME=""
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
-$as_echo "disabled" >&6; }
-    fi
-fi
-
-
-
-NSIS_PATH=""
-if test "$_os" = "WINNT" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSIS" >&5
-$as_echo_n "checking for NSIS... " >&6; }
-    # Extract the first word of "nsis.exe", so it can be a program name with args.
-set dummy nsis.exe; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_NSIS_PATH+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $NSIS_PATH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_NSIS_PATH="$NSIS_PATH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_NSIS_PATH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-NSIS_PATH=$ac_cv_path_NSIS_PATH
-if test -n "$NSIS_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NSIS_PATH" >&5
-$as_echo "$NSIS_PATH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    if test -n "$NSIS_PATH"; then
-        NSIS_PATH=`dirname "$NSIS_PATH"`
-    fi
-    if test -n "$with_nsis_path"; then
-        with_nsis_path=`cygpath -u "$with_nsis_path"`
-    fi
-    if test -e "$with_nsis_path/nsis.exe"; then
-        NSIS_PATH="$with_nsis_path"
-    fi
-    nsistest=`./oowintool --nsis-dir`;
-    if test -x "$nsistest/nsis.exe"; then
-        NSIS_PATH="$nsistest"
-    fi
-    if test -z "$NSIS_PATH"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: NSIS not found, no self contained installer will be build." >&5
-$as_echo "$as_me: WARNING: NSIS not found, no self contained installer will be build." >&2;}
-        echo "NSIS not found, no self contained installer will be build." >> warn
-    else
-        NSIS_PATH=`cygpath -d "$NSIS_PATH"`
-        NSIS_PATH=`cygpath -u "$NSIS_PATH"`
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found ($NSIS_PATH)" >&5
-$as_echo "found ($NSIS_PATH)" >&6; }
-    fi
-fi
-
-
-# Extract the first word of "bison", so it can be a program name with args.
-set dummy bison; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_BISON+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $BISON in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_BISON="$BISON" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-BISON=$ac_cv_path_BISON
-if test -n "$BISON"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5
-$as_echo "$BISON" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$BISON"; then
-   as_fn_error $? "no bison found in \$PATH, install bison" "$LINENO" 5
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking the bison version" >&5
-$as_echo_n "checking the bison version... " >&6; }
-   _bison_version=`$BISON --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
-    _bison_longver=`echo $_bison_version | $AWK -F. '{ print \$1*1000+\$2}'`
-    # Accept newer than 1.875 or older(equal) than 1.75
-    if test "$_bison_longver" -ge 1875 -o "$_bison_longver" -le 1075; then
-       if test "$_bison_version" = "1.875" ; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: suspect ($BISON $_bison_version)" >&5
-$as_echo "$as_me: WARNING: suspect ($BISON $_bison_version)" >&2;}
-          echo "Suspect ($BISON $_bison_version) suggest upgrade" >> warn
-       else
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked ($BISON $_bison_version)" >&5
-$as_echo "checked ($BISON $_bison_version)" >&6; }
-       fi
-    else
-       as_fn_error $? "failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" "$LINENO" 5
-    fi
-fi
-# Extract the first word of "flex", so it can be a program name with args.
-set dummy flex; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_FLEX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $FLEX in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_FLEX="$FLEX" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_FLEX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-FLEX=$ac_cv_path_FLEX
-if test -n "$FLEX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5
-$as_echo "$FLEX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$FLEX"; then
-   as_fn_error $? "no flex found in \$PATH, install flex" "$LINENO" 5
-fi
-# Extract the first word of "patch", so it can be a program name with args.
-set dummy patch; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PATCH+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PATCH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PATCH="$PATCH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PATCH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PATCH=$ac_cv_path_PATCH
-if test -n "$PATCH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATCH" >&5
-$as_echo "$PATCH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$PATCH"; then
-   as_fn_error $? "\\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" "$LINENO" 5
-fi
-
-if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
-   if test -z "$with_gnu_patch"; then
-      GNUPATCH=$PATCH
-   else
-      if test -x "$with_gnu_patch"; then
-	      GNUPATCH=$with_gnu_patch
-      else
-         as_fn_error $? "--with-gnu-patch did not point to an executable" "$LINENO" 5
-      fi
-   fi
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $GNUPATCH is GNU patch" >&5
-$as_echo_n "checking whether $GNUPATCH is GNU patch... " >&6; }
-   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   else
-      as_fn_error $? "no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" "$LINENO" 5
-   fi
-fi
-
-
-if test -z "$with_gnu_cp"; then
-   # check the place where the good stuff is hidden on Solaris...
-   if test -x /usr/gnu/bin/cp; then
-      GNUCP=/usr/gnu/bin/cp
-   else
-      for ac_prog in gnucp cp
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GNUCP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GNUCP in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GNUCP="$GNUCP" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_GNUCP="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-GNUCP=$ac_cv_path_GNUCP
-if test -n "$GNUCP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUCP" >&5
-$as_echo "$GNUCP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$GNUCP" && break
-done
-
-   fi
-   if test -z $GNUCP; then
-      as_fn_error $? "Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" "$LINENO" 5
-   fi
-else
-   if test -x "$with_gnu_cp"; then
-      GNUCP=$with_gnu_cp
-   else
-      as_fn_error $? "--with-gnu-cp did not point to an executable" "$LINENO" 5
-   fi
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $GNUCP is GNU cp from coreutils with preserve= support" >&5
-$as_echo_n "checking whether $GNUCP is GNU cp from coreutils with preserve= support... " >&6; }
-if $GNUCP --version 2>/dev/null | grep "coreutils" >/dev/null 2>/dev/null; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   GNUCP=''
-fi
-
-if test -z "$GNUCP"; then
-   if test "$_os" = "SunOS" -o "$_os" = "FreeBSD"; then
-      as_fn_error $? "no, GNU cp from coreutils is needed. install or specify with --with-gnu-cp=/path/to/it" "$LINENO" 5
-   else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GNU cp from coreutils found - using the system's cp command" >&5
-$as_echo "no GNU cp from coreutils found - using the system's cp command" >&6; }
-   fi
-fi
-
-
-
-
-if test "$_os" = "WINNT"; then
-    CYGWIN_PATH=""
-    # Extract the first word of "bash", so it can be a program name with args.
-set dummy bash; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CYGWIN_PATH+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CYGWIN_PATH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CYGWIN_PATH="$CYGWIN_PATH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_CYGWIN_PATH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CYGWIN_PATH=$ac_cv_path_CYGWIN_PATH
-if test -n "$CYGWIN_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGWIN_PATH" >&5
-$as_echo "$CYGWIN_PATH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    CYGWIN_PATH=`dirname "$CYGWIN_PATH"`
-fi
-if test -z "$CYGWIN_PATH"; then
-   CYGWIN_PATH="NO_CYGWIN"
-fi
-
-
-if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking ml.exe assembler path" >&5
-$as_echo_n "checking ml.exe assembler path... " >&6; }
-  if test -n "$with_asm_home"; then
-    with_asm_home=`cygpath -u "$with_asm_home"`
-  fi
-  if test ! -x "$with_asm_home/ml.exe"; then
-    # Extract the first word of "ml.exe", so it can be a program name with args.
-set dummy ml.exe; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ML_EXE+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ML_EXE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ML_EXE="$ML_EXE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ML_EXE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ML_EXE=$ac_cv_path_ML_EXE
-if test -n "$ML_EXE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ML_EXE" >&5
-$as_echo "$ML_EXE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    if test -z "$ML_EXE"; then
-      if test -x "$with_cl_home/bin/ml.exe"; then
-        with_asm_home=$with_cl_home/bin
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found ($with_asm_home)" >&5
-$as_echo "found ($with_asm_home)" >&6; }
-      else
-        as_fn_error $? "Configure did not find ml.exe assembler." "$LINENO" 5
-      fi
-    else
-       with_asm_home="ASM_IN_PATH"
-    fi
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ASM_HOME" >&5
-$as_echo "$ASM_HOME" >&6; }
-else
-  with_asm_home="NO_ASM_HOME"
-fi
-ASM_HOME="$with_asm_home"
-
-
-if test -z "$with_zip_home"; then
-	with_zip_home="$with_unzip_home"
-fi
-if test -n "$with_zip_home" ; then
-    if test "$_os" = "WINNT"; then
-        with_zip_home=`cygpath -u "$with_zip_home"`
-    fi
-    ZIP="$with_zip_home/zip"
-    UNZIP="$with_zip_home/unzip"
-    ZIP_HOME="$with_zip_home"
-else
-    # Extract the first word of "zip", so it can be a program name with args.
-set dummy zip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ZIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ZIP in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ZIP="$ZIP" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ZIP=$ac_cv_path_ZIP
-if test -n "$ZIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP" >&5
-$as_echo "$ZIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    # Extract the first word of "unzip", so it can be a program name with args.
-set dummy unzip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_UNZIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $UNZIP in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_UNZIP="$UNZIP" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_UNZIP="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-UNZIP=$ac_cv_path_UNZIP
-if test -n "$UNZIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNZIP" >&5
-$as_echo "$UNZIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    ZIP_HOME=`dirname "$ZIP"`
-fi
-if test -z "$ZIP" -o -z "$UNZIP"; then
-    as_fn_error $? "Zip/Unzip are required to build, please install or use --with-zip-home" "$LINENO" 5
-fi
-if "$ZIP" -FS < /dev/null 2>&1 | $EGREP "no such option: S" > /dev/null; then
-    as_fn_error $? "Zip version 3.0 or newer is required to build, please install or use --with-zip-home" "$LINENO" 5
-fi
-
-if test "$_os" = "WINNT"; then
-    if test -n "`$ZIP -h | grep -i WinNT`" ; then
-as_fn_error $? "$ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." "$LINENO" 5
-    fi
-fi
-
-
-if test "$_os" = "WINNT"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unicows.dll" >&5
-$as_echo_n "checking for unicows.dll... " >&6; }
-   if test -x ./external/unicows/unicows.dll; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
-   else
-      as_fn_error $? "The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/.
-Get it from the Microsoft site and put it into external/unicows.
-(Note: Microsoft seems to enjoy changing the exact location of this file. You
-may have to search Microsoft's website.) Last time it was seen at:
-<http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642/unicows.exe>." "$LINENO" 5
-   fi
-fi
-
-if test "$_os" = "WINNT"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbghelp.dll" >&5
-$as_echo_n "checking for dbghelp.dll... " >&6; }
-   if test -x ./external/dbghelp/dbghelp.dll; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
-   else
-      as_fn_error $? "dbghelp.dll is missing in external/dbghelp/.
-Get it from the Microsoft site and put it into external/dbghelp.
-(Note: Microsoft seems to enjoy changing the exact location of this file. You
-may have to search Microsoft's website.) Last time it was seen at:
-<http://www.microsoft.com/downloads/release.asp?releaseid=30682>." "$LINENO" 5
-   fi
-fi
-
-if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
-       if ./oowintool --msvc-copy-dlls ./external/msvcp ; then
-          :
-       else
-          as_fn_error $? "oowintool failed to copy CRT" "$LINENO" 5
-       fi
-fi
-
-if test "$_os" = "WINNT"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdiplus.dll" >&5
-$as_echo_n "checking for gdiplus.dll... " >&6; }
-   if test -x ./external/gdiplus/gdiplus.dll; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
-   else
-      as_fn_error $? "gdiplus.dll is missing in external/gdiplus/.
-Get it from the Microsoft site and put it into external/gdiplus.
-You may have to search Microsoft's website. Last time it was seen at:
-<http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>." "$LINENO" 5
-   fi
-fi
-
-if test "$_os" = "WINNT"; then
-       ./oowintool --msvc-copy-instmsi ./external/msi
-fi
-
-if test "$_os" = "WINNT"; then
-   if test  "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for instmsia.exe/instmsiw.exe" >&5
-$as_echo_n "checking for instmsia.exe/instmsiw.exe... " >&6; }
-   if test -x ./external/msi/instmsia.exe -a -x ./external/msi/instmsiw.exe; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
-   else
-      MSIAPATH=`/bin/find "$COMPATH/.." -iname instmsia.exe | head -n 1`
-      MSIWPATH=`/bin/find "$COMPATH/.." -iname instmsiw.exe | head -n 1`
-      if test -n "$MSIAPATH" -a -n "$MSIWPATH"; then
-         cp "$MSIAPATH" ./external/msi/ && chmod +x ./external/msi/instmsia.exe && MSIACOPY="OK"
-         cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK"
-      fi
-      if test -z "$MSIACOPY" -o -z "$MSIWCOPY"; then
-         as_fn_error $? "instmsia.exe and/or instmsiw.exe are/is missing in the default location.
-These programs are part of the Visual Studio installation and should be found in a
-directory similar to:
-\"c:\\Program Files\\Microsoft Visual Studio .NET 2003\\Common7\\Tools\\Deployment\\MsiRedist\\\"
-As the automatic detection fails please copy the files to external/msi/." "$LINENO" 5
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: found and copied" >&5
-$as_echo "found and copied" >&6; }
-      fi
-   fi
-fi
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which VCLplugs shall be built" >&5
-$as_echo_n "checking which VCLplugs shall be built... " >&6; }
-ENABLE_GTK=""
-if test "x$enable_gtk" = "xyes"; then
-    ENABLE_GTK="TRUE"
-    R="gtk"
-fi
-
-
-ENABLE_KDE=""
-if test "x$enable_kde" = "xyes"; then
-    ENABLE_KDE="TRUE"
-    R="$R kde"
-fi
-
-
-ENABLE_KDE4=""
-if test "x$enable_kde4" = "xyes"; then
-    ENABLE_KDE4="TRUE"
-    R="$R kde4"
-fi
-
-
-if test -z "$R"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $R" >&5
-$as_echo "$R" >&6; }
-fi
-
-
-ENABLE_GCONF=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable GConf support" >&5
-$as_echo_n "checking whether to enable GConf support... " >&6; }
-if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "OS2" -a "$enable_gconf" = "yes"; then
-    ENABLE_GCONF="TRUE"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gconf-2.0 " >&5
-$as_echo_n "checking for gconf-2.0 ... " >&6; }
-
-        if $PKG_CONFIG --exists "gconf-2.0 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCONF_CFLAGS" >&5
-$as_echo_n "checking GCONF_CFLAGS... " >&6; }
-            GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONF_CFLAGS" >&5
-$as_echo "$GCONF_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCONF_LIBS" >&5
-$as_echo_n "checking GCONF_LIBS... " >&6; }
-            GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONF_LIBS" >&5
-$as_echo "$GCONF_LIBS" >&6; }
-        else
-            GCONF_CFLAGS=""
-            GCONF_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0 "`
-            echo $GCONF_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-ENABLE_GNOMEVFS=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable GNOME VFS support" >&5
-$as_echo_n "checking whether to enable GNOME VFS support... " >&6; }
-if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes"; then
-    ENABLE_GNOMEVFS="TRUE"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnome-vfs-2.0 >= 2.6.0 " >&5
-$as_echo_n "checking for gnome-vfs-2.0 >= 2.6.0 ... " >&6; }
-
-        if $PKG_CONFIG --exists "gnome-vfs-2.0 >= 2.6.0 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNOMEVFS_CFLAGS" >&5
-$as_echo_n "checking GNOMEVFS_CFLAGS... " >&6; }
-            GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.6.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOMEVFS_CFLAGS" >&5
-$as_echo "$GNOMEVFS_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNOMEVFS_LIBS" >&5
-$as_echo_n "checking GNOMEVFS_LIBS... " >&6; }
-            GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.6.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOMEVFS_LIBS" >&5
-$as_echo "$GNOMEVFS_LIBS" >&6; }
-        else
-            GNOMEVFS_CFLAGS=""
-            GNOMEVFS_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-vfs-2.0 >= 2.6.0 "`
-            echo $GNOMEVFS_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-    if test "$ENABLE_GCONF" != "TRUE"; then
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gconf-2.0 " >&5
-$as_echo_n "checking for gconf-2.0 ... " >&6; }
-
-        if $PKG_CONFIG --exists "gconf-2.0 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCONF_CFLAGS" >&5
-$as_echo_n "checking GCONF_CFLAGS... " >&6; }
-            GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONF_CFLAGS" >&5
-$as_echo "$GCONF_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCONF_LIBS" >&5
-$as_echo_n "checking GCONF_LIBS... " >&6; }
-            GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONF_LIBS" >&5
-$as_echo "$GCONF_LIBS" >&6; }
-        else
-            GCONF_CFLAGS=""
-            GCONF_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0 "`
-            echo $GCONF_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-    fi
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-GTK_CFLAGS=""
-GTK_LIBS=""
-ENABLE_SYSTRAY_GTK=""
-ENABLE_DBUS=""
-if test  "$test_gtk" = "yes"; then
-
-   if test "$ENABLE_GTK" = "TRUE" ; then
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " >&5
-$as_echo_n "checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ... " >&6; }
-
-        if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_CFLAGS" >&5
-$as_echo_n "checking GTK_CFLAGS... " >&6; }
-            GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_CFLAGS" >&5
-$as_echo "$GTK_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_LIBS" >&5
-$as_echo_n "checking GTK_LIBS... " >&6; }
-            GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_LIBS" >&5
-$as_echo "$GTK_LIBS" >&6; }
-        else
-            GTK_CFLAGS=""
-            GTK_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 "`
-
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" "$LINENO" 5
-  fi
-
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gthread-2.0" >&5
-$as_echo_n "checking for gthread-2.0... " >&6; }
-
-        if $PKG_CONFIG --exists "gthread-2.0" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTHREAD_CFLAGS" >&5
-$as_echo_n "checking GTHREAD_CFLAGS... " >&6; }
-            GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTHREAD_CFLAGS" >&5
-$as_echo "$GTHREAD_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTHREAD_LIBS" >&5
-$as_echo_n "checking GTHREAD_LIBS... " >&6; }
-            GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTHREAD_LIBS" >&5
-$as_echo "$GTHREAD_LIBS" >&6; }
-        else
-            GTHREAD_CFLAGS=""
-            GTHREAD_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0"`
-
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" "$LINENO" 5
-  fi
-
-      BUILD_TYPE="$BUILD_TYPE GTK"
-
-      if test "x$enable_systray" = "xyes"; then
-         ENABLE_SYSTRAY_GTK="TRUE"
-         BUILD_TYPE="$BUILD_TYPE SYSTRAY_GTK"
-      fi
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable DBUS support" >&5
-$as_echo_n "checking whether to enable DBUS support... " >&6; }
-      if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_dbus" = "yes"; then
-          ENABLE_DBUS="TRUE"
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-glib-1 >= 0.70 " >&5
-$as_echo_n "checking for dbus-glib-1 >= 0.70 ... " >&6; }
-
-        if $PKG_CONFIG --exists "dbus-glib-1 >= 0.70 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_CFLAGS" >&5
-$as_echo_n "checking DBUS_CFLAGS... " >&6; }
-            DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.70 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_CFLAGS" >&5
-$as_echo "$DBUS_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_LIBS" >&5
-$as_echo_n "checking DBUS_LIBS... " >&6; }
-            DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.70 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_LIBS" >&5
-$as_echo "$DBUS_LIBS" >&6; }
-        else
-            DBUS_CFLAGS=""
-            DBUS_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= 0.70 "`
-            echo $DBUS_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-      else
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      fi
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable GIO support" >&5
-$as_echo_n "checking whether to enable GIO support... " >&6; }
-      if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then
-          if test "$ENABLE_GNOMEVFS" = "TRUE" ; then
-             as_fn_error $? "please use --enable-gio only together with --disable-gnome-vfs." "$LINENO" 5
-          fi
-          ENABLE_GIO="TRUE"
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-2.0 " >&5
-$as_echo_n "checking for gio-2.0 ... " >&6; }
-
-        if $PKG_CONFIG --exists "gio-2.0 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GIO_CFLAGS" >&5
-$as_echo_n "checking GIO_CFLAGS... " >&6; }
-            GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIO_CFLAGS" >&5
-$as_echo "$GIO_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GIO_LIBS" >&5
-$as_echo_n "checking GIO_LIBS... " >&6; }
-            GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIO_LIBS" >&5
-$as_echo "$GIO_LIBS" >&6; }
-        else
-            GIO_CFLAGS=""
-            GIO_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            GIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gio-2.0 "`
-            echo $GIO_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-      else
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      fi
-
-   fi
-
-fi
-
-
-
-
-
-
-
-
-
-GSTREAMER_CFLAGS=""
-GSTREAMER_LIBS=""
-ENABLE_GSTREAMER=""
-
-if test "$test_gstreamer" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the GStreamer media backend" >&5
-$as_echo_n "checking whether to build the GStreamer media backend... " >&6; }
-    if test "x$enable_gstreamer" != "xno" ; then
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 " >&5
-$as_echo_n "checking for gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 ... " >&6; }
-
-        if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSTREAMER_CFLAGS" >&5
-$as_echo_n "checking GSTREAMER_CFLAGS... " >&6; }
-            GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSTREAMER_CFLAGS" >&5
-$as_echo "$GSTREAMER_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSTREAMER_LIBS" >&5
-$as_echo_n "checking GSTREAMER_LIBS... " >&6; }
-            GSTREAMER_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSTREAMER_LIBS" >&5
-$as_echo "$GSTREAMER_LIBS" >&6; }
-        else
-            GSTREAMER_CFLAGS=""
-            GSTREAMER_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 "`
-
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "requirements to build the GStreamer media backend not met. Use --disable-gstreamer or install the missing packages" "$LINENO" 5
-  fi
-
-        ENABLE_GSTREAMER="TRUE"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-fi
-
-
-
-
-
-
-ENABLE_CAIRO=""
-BUILD_PIXMAN=""
-SYSTEM_CAIRO=""
-
-if test  "$test_cairo" = "yes"; then
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use cairo" >&5
-$as_echo_n "checking whether to use cairo... " >&6; }
-    if test "x$enable_cairo" != "xno" ; then
-        ENABLE_CAIRO="TRUE"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking which cairo to use" >&5
-$as_echo_n "checking which cairo to use... " >&6; }
-        if test -n "$with_system_cairo" -o -n "$with_system_libs" && \
-           test "$with_system_cairo" != "no"; then
-           { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-           SYSTEM_CAIRO=YES
-
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cairo >= 1.0.2 " >&5
-$as_echo_n "checking for cairo >= 1.0.2 ... " >&6; }
-
-        if $PKG_CONFIG --exists "cairo >= 1.0.2 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking CAIRO_CFLAGS" >&5
-$as_echo_n "checking CAIRO_CFLAGS... " >&6; }
-            CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.0.2 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAIRO_CFLAGS" >&5
-$as_echo "$CAIRO_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking CAIRO_LIBS" >&5
-$as_echo_n "checking CAIRO_LIBS... " >&6; }
-            CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.0.2 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAIRO_LIBS" >&5
-$as_echo "$CAIRO_LIBS" >&6; }
-        else
-            CAIRO_CFLAGS=""
-            CAIRO_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo >= 1.0.2 "`
-            echo $CAIRO_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-	   if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$ENABLE_FONTCONFIG" != "TRUE" ; then
-	      as_fn_error $? "Cairo library requires fontconfig." "$LINENO" 5
-	   fi
-           if test "$with_system_xrender_headers" = "yes"; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Xrender.h defines PictStandardA8" >&5
-$as_echo_n "checking whether Xrender.h defines PictStandardA8... " >&6; }
-              if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <X11/extensions/Xrender.h>
-
-int main(int argc, char **argv) {
-#ifdef PictStandardA8
-      return 0;
-#else
-      return 1;
-#endif
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  as_fn_error $? "no, X headers too old." "$LINENO" 5
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-           fi
-        else
-           BUILD_TYPE="$BUILD_TYPE CAIRO"
-	   	   if test "$build_cpu" != "x86_64"; then
-	      BUILD_PIXMAN=YES
-	   fi
-           { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-        fi
-    else
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-fi
-
-
-
-
-
-
-
-ENABLE_CAIRO_CANVAS="FALSE"
-if test "$enable_cairo_canvas" = "yes" -a "$ENABLE_CAIRO" = "TRUE" ; then
-   ENABLE_CAIRO_CANVAS="TRUE"
-fi
-
-
-
-ENABLE_LIBRSVG=""
-LIBRSVG_CFLAGS=""
-LIBRSVG_LIBS=""
-
-if test  "$test_librsvg" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use librsvg" >&5
-$as_echo_n "checking whether to use librsvg... " >&6; }
-    if test "x$enable_librsvg" != "xno" ; then
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for librsvg-2.0 >= 2.14" >&5
-$as_echo_n "checking for librsvg-2.0 >= 2.14... " >&6; }
-
-        if $PKG_CONFIG --exists "librsvg-2.0 >= 2.14" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBRSVG_CFLAGS" >&5
-$as_echo_n "checking LIBRSVG_CFLAGS... " >&6; }
-            LIBRSVG_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0 >= 2.14"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRSVG_CFLAGS" >&5
-$as_echo "$LIBRSVG_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBRSVG_LIBS" >&5
-$as_echo_n "checking LIBRSVG_LIBS... " >&6; }
-            LIBRSVG_LIBS=`$PKG_CONFIG --libs "librsvg-2.0 >= 2.14"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRSVG_LIBS" >&5
-$as_echo "$LIBRSVG_LIBS" >&6; }
-        else
-            LIBRSVG_CFLAGS=""
-            LIBRSVG_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            LIBRSVG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "librsvg-2.0 >= 2.14"`
-
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "requirements to build with librsvg support not met. Use --disable-librsvg or install the missing packages" "$LINENO" 5
-  fi
-
-        ENABLE_LIBRSVG="TRUE"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-fi
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the OpenGL Transitions component" >&5
-$as_echo_n "checking whether to build the OpenGL Transitions component... " >&6; }
-ENABLE_OPENGL=
-
-if test "x$enable_opengl" != "xno" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
-if test "x$ac_cv_header_GL_gl_h" = x""yes; then :
-
-else
-  as_fn_error $? "OpenGL headers not found" "$LINENO" 5
-fi
-
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lGL" >&5
-$as_echo_n "checking for main in -lGL... " >&6; }
-if test "${ac_cv_lib_GL_main+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGL  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_GL_main=yes
-else
-  ac_cv_lib_GL_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_main" >&5
-$as_echo "$ac_cv_lib_GL_main" >&6; }
-if test "x$ac_cv_lib_GL_main" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGL 1
-_ACEOF
-
-  LIBS="-lGL $LIBS"
-
-else
-  as_fn_error $? "libGL not installed or functional" "$LINENO" 5
-fi
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lGLU" >&5
-$as_echo_n "checking for main in -lGLU... " >&6; }
-if test "${ac_cv_lib_GLU_main+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGLU  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_GLU_main=yes
-else
-  ac_cv_lib_GLU_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_main" >&5
-$as_echo "$ac_cv_lib_GLU_main" >&6; }
-if test "x$ac_cv_lib_GLU_main" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGLU 1
-_ACEOF
-
-  LIBS="-lGLU $LIBS"
-
-else
-  as_fn_error $? "libGLU not installed or functional" "$LINENO" 5
-fi
-
-   ENABLE_OPENGL=TRUE
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build extra presenter ui" >&5
-$as_echo_n "checking whether to build extra presenter ui... " >&6; }
-if test -n "$enable_presenter_extra_ui" -a "$enable_presenter_extra_ui" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   ENABLE_PRESENTER_EXTRA_UI=YES
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   ENABLE_PRESENTER_EXTRA_UI=NO
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the Presentation Minimizer extension" >&5
-$as_echo_n "checking whether to build the Presentation Minimizer extension... " >&6; }
-if test -n "$enable_minimizer" -a "$enable_minimizer" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   ENABLE_MINIMIZER=YES
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   ENABLE_MINIMIZER=NO
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the Presenter Screen extension" >&5
-$as_echo_n "checking whether to build the Presenter Screen extension... " >&6; }
-if test -n "$enable_presenter_console" -a "$enable_presenter_screen" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   ENABLE_PRESENTER_SCREEN=YES
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   ENABLE_PRESENTER_SCREEN=NO
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the PDF Import extension" >&5
-$as_echo_n "checking whether to build the PDF Import extension... " >&6; }
-if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  ENABLE_PDFIMPORT=YES
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking which pdf backend to use" >&5
-$as_echo_n "checking which pdf backend to use... " >&6; }
-  if test -n "$with_system_poppler" -o -n "$with_system_libs" && \
-       test "$with_system_poppler" != "no"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-      SYSTEM_POPPLER=YES
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler >= 0.8.0 " >&5
-$as_echo_n "checking for poppler >= 0.8.0 ... " >&6; }
-
-        if $PKG_CONFIG --exists "poppler >= 0.8.0 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking POPPLER_CFLAGS" >&5
-$as_echo_n "checking POPPLER_CFLAGS... " >&6; }
-            POPPLER_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.8.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POPPLER_CFLAGS" >&5
-$as_echo "$POPPLER_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking POPPLER_LIBS" >&5
-$as_echo_n "checking POPPLER_LIBS... " >&6; }
-            POPPLER_LIBS=`$PKG_CONFIG --libs "poppler >= 0.8.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POPPLER_LIBS" >&5
-$as_echo "$POPPLER_LIBS" >&6; }
-        else
-            POPPLER_CFLAGS=""
-            POPPLER_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            POPPLER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "poppler >= 0.8.0 "`
-            echo $POPPLER_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-  else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-      SYSTEM_POPPLER=NO
-      BUILD_TYPE="$BUILD_TYPE XPDF"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xpdf module" >&5
-$as_echo_n "checking for xpdf module... " >&6; }
-      if test -d ./xpdf; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
-      else
-        as_fn_error $? "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
-      fi
-  fi
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   ENABLE_PDFIMPORT=NO
-fi
-
-
-
-
-
-if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sdext module" >&5
-$as_echo_n "checking for sdext module... " >&6; }
-  if test -d ./sdext; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
-  else
-   as_fn_error $? "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
-  fi
-  BUILD_TYPE="$BUILD_TYPE SDEXT"
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the Wiki Publisher extension" >&5
-$as_echo_n "checking whether to build the Wiki Publisher extension... " >&6; }
-if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test  "$WITH_JAVA" != "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for swext module" >&5
-$as_echo_n "checking for swext module... " >&6; }
-  if test -d ./swext; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
-  else
-   as_fn_error $? "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
-  fi
-  ENABLE_MEDIAWIKI=YES
-  BUILD_TYPE="$BUILD_TYPE SWEXT"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  ENABLE_MEDIAWIKI=NO
-fi
-
-
-if test "$ENABLE_MEDIAWIKI" = "YES"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which Servlet API Jar to use" >&5
-$as_echo_n "checking which Servlet API Jar to use... " >&6; }
-  if test -n "$with_system_servlet_api"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-    SYSTEM_SERVLETAPI=YES
-      if test -z "$SERVLETAPI_JAR"; then
-	SERVLETAPI_JAR=/usr/share/java/servlet-api.jar
-      fi
-      as_ac_File=`$as_echo "ac_cv_file_$SERVLETAPI_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SERVLETAPI_JAR" >&5
-$as_echo_n "checking for $SERVLETAPI_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$SERVLETAPI_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "servlet-api.jar not found." "$LINENO" 5
-fi
-
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_SERVLETAPI=NO
-    BUILD_TYPE="$BUILD_TYPE TOMCAT"
-  fi
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the Report Builder extension" >&5
-$as_echo_n "checking whether to build the Report Builder extension... " >&6; }
-if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test "$WITH_JAVA" != "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  ENABLE_REPORTBUILDER=YES
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for reportbuilder module" >&5
-$as_echo_n "checking for reportbuilder module... " >&6; }
-  if test -d ./reportbuilder; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
-  else
-    as_fn_error $? "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which jfreereport libs to use" >&5
-$as_echo_n "checking which jfreereport libs to use... " >&6; }
-  if test "$with_system_jfreereport" = "yes"; then
-      SYSTEM_JFREEREPORT=YES
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-      if test -z $SAC_JAR; then
-             SAC_JAR=/usr/share/java/sac.jar
-      fi
-      as_ac_File=`$as_echo "ac_cv_file_$SAC_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SAC_JAR" >&5
-$as_echo_n "checking for $SAC_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$SAC_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "sac.jar not found." "$LINENO" 5
-fi
-
-
-      if test -z $LIBXML_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libxml-1.0.0.jar" >&5
-$as_echo_n "checking for /usr/share/java/libxml-1.0.0.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libxml_1_0_0_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/libxml-1.0.0.jar"; then
-  ac_cv_file__usr_share_java_libxml_1_0_0_jar=yes
-else
-  ac_cv_file__usr_share_java_libxml_1_0_0_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libxml_1_0_0_jar" = x""yes; then :
-   LIBXML_JAR=/usr/share/java/libxml-1.0.0.jar
-else
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libxml.jar" >&5
-$as_echo_n "checking for /usr/share/java/libxml.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libxml_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/libxml.jar"; then
-  ac_cv_file__usr_share_java_libxml_jar=yes
-else
-  ac_cv_file__usr_share_java_libxml_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libxml_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libxml_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libxml_jar" = x""yes; then :
-   LIBXML_JAR=/usr/share/java/libxml.jar
-else
-  as_fn_error $? "libxml.jar replacement not found." "$LINENO" 5
-
-fi
-
-
-
-fi
-
-      else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBXML_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBXML_JAR" >&5
-$as_echo_n "checking for $LIBXML_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$LIBXML_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "libxml.jar not found." "$LINENO" 5
-fi
-
-      fi
-
-      if test -z $FLUTE_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/flute-1.3.0.jar" >&5
-$as_echo_n "checking for /usr/share/java/flute-1.3.0.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_flute_1_3_0_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/flute-1.3.0.jar"; then
-  ac_cv_file__usr_share_java_flute_1_3_0_jar=yes
-else
-  ac_cv_file__usr_share_java_flute_1_3_0_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_flute_1_3_0_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_flute_1_3_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_flute_1_3_0_jar" = x""yes; then :
-   FLUTE_JAR=/usr/share/java/flute-1.3.0.jar
-else
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/flute.jar" >&5
-$as_echo_n "checking for /usr/share/java/flute.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_flute_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/flute.jar"; then
-  ac_cv_file__usr_share_java_flute_jar=yes
-else
-  ac_cv_file__usr_share_java_flute_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_flute_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_flute_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_flute_jar" = x""yes; then :
-   FLUTE_JAR=/usr/share/java/flute.jar
-else
-   as_fn_error $? "flute-1.3.0.jar replacement not found." "$LINENO" 5
-
-fi
-
-
-
-fi
-
-      else
-        as_ac_File=`$as_echo "ac_cv_file_$FLUTE_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $FLUTE_JAR" >&5
-$as_echo_n "checking for $FLUTE_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$FLUTE_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "flute-1.3.0.jar not found." "$LINENO" 5
-fi
-
-      fi
-
-      if test -z $JFREEREPORT_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/flow-engine-0.9.2.jar" >&5
-$as_echo_n "checking for /usr/share/java/flow-engine-0.9.2.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_flow_engine_0_9_2_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/flow-engine-0.9.2.jar"; then
-  ac_cv_file__usr_share_java_flow_engine_0_9_2_jar=yes
-else
-  ac_cv_file__usr_share_java_flow_engine_0_9_2_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" = x""yes; then :
-   JFREEREPORT_JAR=/usr/share/java/flow-engine-0.9.2.jar
-else
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/flow-engine.jar" >&5
-$as_echo_n "checking for /usr/share/java/flow-engine.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_flow_engine_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/flow-engine.jar"; then
-  ac_cv_file__usr_share_java_flow_engine_jar=yes
-else
-  ac_cv_file__usr_share_java_flow_engine_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_flow_engine_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_flow_engine_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_flow_engine_jar" = x""yes; then :
-   JFREEREPORT_JAR=/usr/share/java/flow-engine.jar
-else
-  as_fn_error $? "jfreereport.jar replacement not found." "$LINENO" 5
-
-fi
-
-
-
-fi
-
-      else
-        as_ac_File=`$as_echo "ac_cv_file_$JFREEREPORT_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $JFREEREPORT_JAR" >&5
-$as_echo_n "checking for $JFREEREPORT_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$JFREEREPORT_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "jfreereport.jar not found." "$LINENO" 5
-fi
-
-      fi
-
-      if test -z $LIBLAYOUT_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/liblayout-0.2.9.jar" >&5
-$as_echo_n "checking for /usr/share/java/liblayout-0.2.9.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_liblayout_0_2_9_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/liblayout-0.2.9.jar"; then
-  ac_cv_file__usr_share_java_liblayout_0_2_9_jar=yes
-else
-  ac_cv_file__usr_share_java_liblayout_0_2_9_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_liblayout_0_2_9_jar" = x""yes; then :
-   LIBLAYOUT_JAR=/usr/share/java/liblayout-0.2.9.jar
-else
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/liblayout.jar" >&5
-$as_echo_n "checking for /usr/share/java/liblayout.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_liblayout_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/liblayout.jar"; then
-  ac_cv_file__usr_share_java_liblayout_jar=yes
-else
-  ac_cv_file__usr_share_java_liblayout_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_liblayout_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_liblayout_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_liblayout_jar" = x""yes; then :
-   LIBLAYOUT_JAR=/usr/share/java/liblayout.jar
-else
-  as_fn_error $? "liblayout.jar replacement not found." "$LINENO" 5
-
-fi
-
-
-
-fi
-
-      else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBLAYOUT_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBLAYOUT_JAR" >&5
-$as_echo_n "checking for $LIBLAYOUT_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$LIBLAYOUT_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "liblayout.jar not found." "$LINENO" 5
-fi
-
-      fi
-
-      if test -z $LIBLOADER_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libloader-1.0.0.jar" >&5
-$as_echo_n "checking for /usr/share/java/libloader-1.0.0.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libloader_1_0_0_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/libloader-1.0.0.jar"; then
-  ac_cv_file__usr_share_java_libloader_1_0_0_jar=yes
-else
-  ac_cv_file__usr_share_java_libloader_1_0_0_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libloader_1_0_0_jar" = x""yes; then :
-   LIBLOADER_JAR=/usr/share/java/libloader-1.0.0.jar
-else
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libloader.jar" >&5
-$as_echo_n "checking for /usr/share/java/libloader.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libloader_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/libloader.jar"; then
-  ac_cv_file__usr_share_java_libloader_jar=yes
-else
-  ac_cv_file__usr_share_java_libloader_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libloader_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libloader_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libloader_jar" = x""yes; then :
-   LIBLOADER_JAR=/usr/share/java/libloader.jar
-else
-  as_fn_error $? "libloader.jar replacement not found." "$LINENO" 5
-
-fi
-
-
-
-fi
-
-      else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBLOADER_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBLOADER_JAR" >&5
-$as_echo_n "checking for $LIBLOADER_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$LIBLOADER_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "libloader.jar not found." "$LINENO" 5
-fi
-
-      fi
-
-      if test -z $LIBFORMULA_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libformula-0.2.0.jar" >&5
-$as_echo_n "checking for /usr/share/java/libformula-0.2.0.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libformula_0_2_0_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/libformula-0.2.0.jar"; then
-  ac_cv_file__usr_share_java_libformula_0_2_0_jar=yes
-else
-  ac_cv_file__usr_share_java_libformula_0_2_0_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libformula_0_2_0_jar" = x""yes; then :
-   LIBFORMULA_JAR=/usr/share/java/libformula-0.2.0.jar
-else
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libformula.jar" >&5
-$as_echo_n "checking for /usr/share/java/libformula.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libformula_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/libformula.jar"; then
-  ac_cv_file__usr_share_java_libformula_jar=yes
-else
-  ac_cv_file__usr_share_java_libformula_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libformula_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libformula_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libformula_jar" = x""yes; then :
-   LIBFORMULA_JAR=/usr/share/java/libformula.jar
-else
-  as_fn_error $? "libformula.jar replacement not found." "$LINENO" 5
-
-fi
-
-
-
-fi
-
-      else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBFORMULA_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBFORMULA_JAR" >&5
-$as_echo_n "checking for $LIBFORMULA_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$LIBFORMULA_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "libformula.jar not found." "$LINENO" 5
-fi
-
-      fi
-
-      if test -z $LIBREPOSITORY_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/librepository-1.0.0.jar" >&5
-$as_echo_n "checking for /usr/share/java/librepository-1.0.0.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_librepository_1_0_0_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/librepository-1.0.0.jar"; then
-  ac_cv_file__usr_share_java_librepository_1_0_0_jar=yes
-else
-  ac_cv_file__usr_share_java_librepository_1_0_0_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_librepository_1_0_0_jar" = x""yes; then :
-   LIBREPOSITORY_JAR=/usr/share/java/librepository-1.0.0.jar
-else
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/librepository.jar" >&5
-$as_echo_n "checking for /usr/share/java/librepository.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_librepository_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/librepository.jar"; then
-  ac_cv_file__usr_share_java_librepository_jar=yes
-else
-  ac_cv_file__usr_share_java_librepository_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_librepository_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_librepository_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_librepository_jar" = x""yes; then :
-   LIBREPOSITORY_JAR=/usr/share/java/librepository.jar
-else
-  as_fn_error $? "librepository.jar replacement not found." "$LINENO" 5
-
-fi
-
-
-
-fi
-
-      else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBREPOSITORY_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBREPOSITORY_JAR" >&5
-$as_echo_n "checking for $LIBREPOSITORY_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$LIBREPOSITORY_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "librepository.jar not found." "$LINENO" 5
-fi
-
-      fi
-
-      if test -z $LIBFONTS_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libfonts-1.0.0.jar" >&5
-$as_echo_n "checking for /usr/share/java/libfonts-1.0.0.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libfonts_1_0_0_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/libfonts-1.0.0.jar"; then
-  ac_cv_file__usr_share_java_libfonts_1_0_0_jar=yes
-else
-  ac_cv_file__usr_share_java_libfonts_1_0_0_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libfonts_1_0_0_jar" = x""yes; then :
-   LIBFONTS_JAR=/usr/share/java/libfonts-1.0.0.jar
-else
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libfonts.jar" >&5
-$as_echo_n "checking for /usr/share/java/libfonts.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libfonts_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/libfonts.jar"; then
-  ac_cv_file__usr_share_java_libfonts_jar=yes
-else
-  ac_cv_file__usr_share_java_libfonts_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libfonts_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libfonts_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libfonts_jar" = x""yes; then :
-   LIBFONTS_JAR=/usr/share/java/libfonts.jar
-else
-  as_fn_error $? "libfonts.jar replacement not found." "$LINENO" 5
-
-fi
-
-
-
-fi
-
-      else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBFONTS_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBFONTS_JAR" >&5
-$as_echo_n "checking for $LIBFONTS_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$LIBFONTS_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "libfonts.jar not found." "$LINENO" 5
-fi
-
-      fi
-
-      if test -z $LIBSERIALIZER_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libserializer-1.0.0.jar" >&5
-$as_echo_n "checking for /usr/share/java/libserializer-1.0.0.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libserializer_1_0_0_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/libserializer-1.0.0.jar"; then
-  ac_cv_file__usr_share_java_libserializer_1_0_0_jar=yes
-else
-  ac_cv_file__usr_share_java_libserializer_1_0_0_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libserializer_1_0_0_jar" = x""yes; then :
-   LIBSERIALIZER_JAR=/usr/share/java/libserializer-1.0.0.jar
-else
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libserializer.jar" >&5
-$as_echo_n "checking for /usr/share/java/libserializer.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libserializer_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/libserializer.jar"; then
-  ac_cv_file__usr_share_java_libserializer_jar=yes
-else
-  ac_cv_file__usr_share_java_libserializer_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libserializer_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libserializer_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libserializer_jar" = x""yes; then :
-   LIBSERIALIZER_JAR=/usr/share/java/libserializer.jar
-else
-  as_fn_error $? "libserializer.jar replacement not found." "$LINENO" 5
-
-fi
-
-
-
-fi
-
-      else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBSERIALIZER_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBSERIALIZER_JAR" >&5
-$as_echo_n "checking for $LIBSERIALIZER_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$LIBSERIALIZER_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "libserializer.jar not found." "$LINENO" 5
-fi
-
-      fi
-
-
-      if test -z $LIBBASE_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libbase-1.0.0.jar" >&5
-$as_echo_n "checking for /usr/share/java/libbase-1.0.0.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libbase_1_0_0_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/libbase-1.0.0.jar"; then
-  ac_cv_file__usr_share_java_libbase_1_0_0_jar=yes
-else
-  ac_cv_file__usr_share_java_libbase_1_0_0_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libbase_1_0_0_jar" = x""yes; then :
-   LIBBASE_JAR=/usr/share/java/libbase-1.0.0.jar
-else
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libbase.jar" >&5
-$as_echo_n "checking for /usr/share/java/libbase.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libbase_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/libbase.jar"; then
-  ac_cv_file__usr_share_java_libbase_jar=yes
-else
-  ac_cv_file__usr_share_java_libbase_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libbase_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libbase_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libbase_jar" = x""yes; then :
-   LIBBASE_JAR=/usr/share/java/libbase.jar
-else
-  as_fn_error $? "libbase.jar replacement not found." "$LINENO" 5
-
-fi
-
-
-
-fi
-
-      else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBBASE_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBBASE_JAR" >&5
-$as_echo_n "checking for $LIBBASE_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$LIBBASE_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "libbase.jar not found." "$LINENO" 5
-fi
-
-      fi
-
-  else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jfreereport module" >&5
-$as_echo_n "checking for jfreereport module... " >&6; }
-     if test -d ./jfreereport; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
-     else
-      as_fn_error $? "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
-     fi
-     SYSTEM_JFREEREPORT=NO
-     BUILD_TYPE="$BUILD_TYPE JFREEREPORT"
-  fi
-  BUILD_TYPE="$BUILD_TYPE REPORTBUILDER"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  ENABLE_REPORTBUILDER=NO
-  SYSTEM_JFREEREPORT=NO
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# this has to be here because both the wiki publisher and the SRB use
-# commons-logging
-if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which Apache commons-* libs to use" >&5
-$as_echo_n "checking which Apache commons-* libs to use... " >&6; }
-  if test "$with_system_apache_commons" = "yes"; then
-    SYSTEM_APACHE_COMMONS=YES
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-    if test "$ENABLE_MEDIAWIKI" = "YES"; then
-      if test -z $COMMONS_CODEC_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-codec-1.3.jar" >&5
-$as_echo_n "checking for /usr/share/java/commons-codec-1.3.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_commons_codec_1_3_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/commons-codec-1.3.jar"; then
-  ac_cv_file__usr_share_java_commons_codec_1_3_jar=yes
-else
-  ac_cv_file__usr_share_java_commons_codec_1_3_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_codec_1_3_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_commons_codec_1_3_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_commons_codec_1_3_jar" = x""yes; then :
-   COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar
-else
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-codec.jar" >&5
-$as_echo_n "checking for /usr/share/java/commons-codec.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_commons_codec_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/commons-codec.jar"; then
-  ac_cv_file__usr_share_java_commons_codec_jar=yes
-else
-  ac_cv_file__usr_share_java_commons_codec_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_codec_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_commons_codec_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_commons_codec_jar" = x""yes; then :
-   COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar
-else
-  as_fn_error $? "commons-codec.jar replacement not found." "$LINENO" 5
-
-fi
-
-
-
-fi
-
-      else
-        as_ac_File=`$as_echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_CODEC_JAR" >&5
-$as_echo_n "checking for $COMMONS_CODEC_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$COMMONS_CODEC_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "commons-codec.jar not found." "$LINENO" 5
-fi
-
-      fi
-
-      if test -z $COMMONS_LANG_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-lang-2.3.jar" >&5
-$as_echo_n "checking for /usr/share/java/commons-lang-2.3.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_commons_lang_2_3_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/commons-lang-2.3.jar"; then
-  ac_cv_file__usr_share_java_commons_lang_2_3_jar=yes
-else
-  ac_cv_file__usr_share_java_commons_lang_2_3_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_lang_2_3_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_commons_lang_2_3_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_commons_lang_2_3_jar" = x""yes; then :
-   COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar
-else
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-lang.jar" >&5
-$as_echo_n "checking for /usr/share/java/commons-lang.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_commons_lang_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/commons-lang.jar"; then
-  ac_cv_file__usr_share_java_commons_lang_jar=yes
-else
-  ac_cv_file__usr_share_java_commons_lang_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_lang_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_commons_lang_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_commons_lang_jar" = x""yes; then :
-   COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar
-else
-  as_fn_error $? "commons-lang.jar replacement not found." "$LINENO" 5
-
-fi
-
-
-
-fi
-
-      else
-        as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_LANG_JAR" >&5
-$as_echo_n "checking for $COMMONS_LANG_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$COMMONS_LANG_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "commons-lang.jar not found." "$LINENO" 5
-fi
-
-      fi
-
-      if test -z $COMMONS_HTTPCLIENT_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-httpclient-3.1.jar" >&5
-$as_echo_n "checking for /usr/share/java/commons-httpclient-3.1.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_commons_httpclient_3_1_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/commons-httpclient-3.1.jar"; then
-  ac_cv_file__usr_share_java_commons_httpclient_3_1_jar=yes
-else
-  ac_cv_file__usr_share_java_commons_httpclient_3_1_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" = x""yes; then :
-   COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar
-else
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-httpclient.jar" >&5
-$as_echo_n "checking for /usr/share/java/commons-httpclient.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_commons_httpclient_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/commons-httpclient.jar"; then
-  ac_cv_file__usr_share_java_commons_httpclient_jar=yes
-else
-  ac_cv_file__usr_share_java_commons_httpclient_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_httpclient_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_commons_httpclient_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_commons_httpclient_jar" = x""yes; then :
-   COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar
-else
-  as_fn_error $? "commons-httpclient.jar replacement not found." "$LINENO" 5
-
-fi
-
-
-
-fi
-
-      else
-        as_ac_File=`$as_echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_HTTPCLIENT_JAR" >&5
-$as_echo_n "checking for $COMMONS_HTTPCLIENT_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$COMMONS_HTTPCLIENT_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "commons-httpclient.jar not found." "$LINENO" 5
-fi
-
-      fi
-    fi
-    if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
-      if test -z $COMMONS_LOGGING_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-logging-1.1.1.jar" >&5
-$as_echo_n "checking for /usr/share/java/commons-logging-1.1.1.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_commons_logging_1_1_1_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/commons-logging-1.1.1.jar"; then
-  ac_cv_file__usr_share_java_commons_logging_1_1_1_jar=yes
-else
-  ac_cv_file__usr_share_java_commons_logging_1_1_1_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" = x""yes; then :
-   COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar
-else
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-logging.jar" >&5
-$as_echo_n "checking for /usr/share/java/commons-logging.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_commons_logging_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/java/commons-logging.jar"; then
-  ac_cv_file__usr_share_java_commons_logging_jar=yes
-else
-  ac_cv_file__usr_share_java_commons_logging_jar=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_logging_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_commons_logging_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_commons_logging_jar" = x""yes; then :
-   COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar
-else
-  as_fn_error $? "commons-logging.jar replacement not found." "$LINENO" 5
-
-fi
-
-
-
-fi
-
-      else
-        as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_LOGGING_JAR" >&5
-$as_echo_n "checking for $COMMONS_LOGGING_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$COMMONS_LOGGING_JAR"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "commons-logging.jar not found." "$LINENO" 5
-fi
-
-      fi
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-    SYSTEM_APACHE_COMMONS=NO
-    BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
-  fi
-fi
-
-
-
-
-
-
-
-KDE_CFLAGS=""
-KDE_LIBS=""
-MOC="moc"
-if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
-        if test "$build_cpu" != "x86_64" ; then
-        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include $x_includes"
-        qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib $x_libraries"
-    else
-        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib64/qt3/include /usr/lib64/qt/include /usr/share/qt3/include /usr/lib/qt3/include /usr/lib/qt/include $x_includes"
-        qt_libdirs="$QTLIB /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib64/qt3/lib64 /usr/lib64/qt/lib64 /usr/share/qt3/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib $x_libraries"
-    fi
-    if test -n "$QTDIR" ; then
-        qt_incdirs="$QTDIR/include $qt_incdirs"
-        if test "$build_cpu" != "x86_64" ; then
-            qt_libdirs="$QTDIR/lib $qt_libdirs"
-        else
-            qt_libdirs="$QTDIR/lib64 $QTDIR/lib $qt_libdirs"
-        fi
-    fi
-    if test "$build_cpu" != "x86_64" ; then
-        kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes"
-        kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib $x_libraries"
-    else
-        kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes"
-        kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib64 $x_libraries"
-    fi
-    if test -n "$KDEDIR" ; then
-        kde_incdirs="$KDEDIR/include $kde_incdirs"
-        if test "$build_cpu" != "x86_64" ; then
-            kde_libdirs="$KDEDIR/lib $kde_libdirs"
-        else
-            kde_libdirs="$KDEDIR/lib64 $KDEDIR/lib $kde_libdirs"
-        fi
-    fi
-
-        qt_test_include="qstyle.h"
-    qt_test_library="libqt-mt.so"
-    kde_test_include="ksharedptr.h"
-    kde_test_library="libkdeui.so"
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt headers" >&5
-$as_echo_n "checking for Qt headers... " >&6; }
-    qt_incdir="no"
-    for kde_check in $qt_incdirs ; do
-        if test -r "$kde_check/$qt_test_include" ; then
-            qt_incdir="$kde_check"
-            break
-        fi
-    done
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_incdir" >&5
-$as_echo "$qt_incdir" >&6; }
-    if test "x$qt_incdir" = "xno" ; then
-        as_fn_error $? "Qt headers not found.  Please specify the root of
-your Qt installation by exporting QTDIR before running \"configure\"." "$LINENO" 5
-    fi
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt libraries" >&5
-$as_echo_n "checking for Qt libraries... " >&6; }
-    qt_libdir="no"
-    for qt_check in $qt_libdirs ; do
-        if test -r "$qt_check/$qt_test_library" ; then
-            qt_libdir="$qt_check"
-            break
-        fi
-    done
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_libdir" >&5
-$as_echo "$qt_libdir" >&6; }
-    if test "x$qt_libdir" = "xno" ; then
-        as_fn_error $? "Qt libraries not found.  Please specify the root of
-your Qt installation by exporting QTDIR before running \"configure\"." "$LINENO" 5
-    fi
-
-        # Extract the first word of "moc", so it can be a program name with args.
-set dummy moc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MOC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MOC in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MOC="$MOC" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$QTDIR/bin:$PATH "
-for as_dir in $as_dummy
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MOC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="no"
-  ;;
-esac
-fi
-MOC=$ac_cv_path_MOC
-if test -n "$MOC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOC" >&5
-$as_echo "$MOC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    if test "$MOC" = "no" ; then
-        as_fn_error $? "Qt Meta Object Compiler not found.  Please specify
-the root of your Qt installation by exporting QTDIR before running \"configure\"." "$LINENO" 5
-    fi
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE headers" >&5
-$as_echo_n "checking for KDE headers... " >&6; }
-    kde_incdir="no"
-    for kde_check in $kde_incdirs ; do
-        if test -r "$kde_check/$kde_test_include" ; then
-            kde_incdir="$kde_check"
-            break
-        fi
-    done
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_incdir" >&5
-$as_echo "$kde_incdir" >&6; }
-    if test "x$kde_incdir" = "xno" ; then
-        as_fn_error $? "KDE headers not found.  Please specify the root of
-your KDE installation by exporting KDEDIR before running \"configure\"." "$LINENO" 5
-    fi
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE libraries" >&5
-$as_echo_n "checking for KDE libraries... " >&6; }
-    kde_libdir="no"
-    for kde_check in $kde_libdirs ; do
-        if test -r "$kde_check/$kde_test_library" ; then
-            kde_libdir="$kde_check"
-            break
-        fi
-    done
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_libdir" >&5
-$as_echo "$kde_libdir" >&6; }
-    if test "x$kde_libdir" = "xno" ; then
-        as_fn_error $? "KDE libraries not found.  Please specify the root of
-your KDE installation by exporting KDEDIR before running \"configure\"." "$LINENO" 5
-    fi
-
-        KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
-    KDE_LIBS="-L$kde_libdir -L$qt_libdir -lkdeui -lkdecore -lqt-mt"
-fi
-
-
-
-
-
-KDE4_CFLAGS=""
-KDE4_LIBS=""
-MOC4="moc"
-if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
-   qt_incdirs="$QT4INC $QT4DIR /usr/include/qt4 /usr/include $x_includes"
-   qt_libdirs="$QT4LIB /usr/lib $x_libraries"
-
-   kde_incdirs="/usr/include $x_includes"
-   kde_libdirs="/usr/lib $x_libraries"
-
-   if test "$build_cpu" = "x86_64" ; then
-      qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
-      kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
-   fi
-
-   if test -n "$KDE4DIR" ; then
-      kde_incdirs="$KDE4DIR/include $kde_incdirs"
-      if test "$build_cpu" != "x86_64" ; then
-         kde_libdirs="$KDE4DIR/lib $kde_libdirs"
-      else
-         kde_libdirs="$KDE4DIR/lib64 $KDE4DIR/lib $kde_libdirs"
-      fi
-   fi
-
-   qt_test_include="Qt/qobject.h"
-   qt_test_library="libQtCore.so"
-   kde_test_include="ksharedptr.h"
-   kde_test_library="libkdeui.so"
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 headers" >&5
-$as_echo_n "checking for Qt4 headers... " >&6; }
-   qt_header_dir="no"
-   for inc_dir in $qt_incdirs ; do
-      if test -r "$inc_dir/$qt_test_include" ; then
-         qt_header_dir="$inc_dir"
-         break
-      fi
-   done
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_header_dir" >&5
-$as_echo "$qt_header_dir" >&6; }
-   if test "x$qt_header_dir" = "xno" ; then
-      as_fn_error $? "Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." "$LINENO" 5
-   fi
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 libraries" >&5
-$as_echo_n "checking for Qt4 libraries... " >&6; }
-   qt_lib_dir="no"
-   for lib_dir in $qt_libdirs ; do
-      if test -r "$lib_dir/$qt_test_library" ; then
-         qt_lib_dir="$lib_dir"
-         break
-      fi
-   done
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_lib_dir" >&5
-$as_echo "$qt_lib_dir" >&6; }
-
-   if test "x$qt_lib_dir" = "xno" ; then
-      as_fn_error $? "Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." "$LINENO" 5
-   fi
-
-      # Extract the first word of "moc", so it can be a program name with args.
-set dummy moc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MOC4+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MOC4 in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MOC4="$MOC4" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:$QT4DIR/bin "
-for as_dir in $as_dummy
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MOC4="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_MOC4" && ac_cv_path_MOC4="no"
-  ;;
-esac
-fi
-MOC4=$ac_cv_path_MOC4
-if test -n "$MOC4"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOC4" >&5
-$as_echo "$MOC4" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-   if test "$MOC4" = "no" ; then
-      as_fn_error $? "Qt Meta Object Compiler not found.  Please specify
-the root of your Qt installation by exporting QT4DIR before running \"configure\"." "$LINENO" 5
-   fi
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE4 headers" >&5
-$as_echo_n "checking for KDE4 headers... " >&6; }
-   kde_incdir="no"
-   for kde_check in $kde_incdirs ; do
-      if test -r "$kde_check/$kde_test_include" ; then
-         kde_incdir="$kde_check"
-         break
-      fi
-   done
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_incdir" >&5
-$as_echo "$kde_incdir" >&6; }
-   if test "x$kde_incdir" = "xno" ; then
-      as_fn_error $? "KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." "$LINENO" 5
-   fi
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE4 libraries" >&5
-$as_echo_n "checking for KDE4 libraries... " >&6; }
-   kde_libdir="no"
-   for kde_check in $kde_libdirs ; do
-      if test -r "$kde_check/$kde_test_library" ; then
-         kde_libdir="$kde_check"
-         break
-      fi
-   done
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_libdir" >&5
-$as_echo "$kde_libdir" >&6; }
-   if test "x$kde_libdir" = "xno" ; then
-      as_fn_error $? "KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." "$LINENO" 5
-   fi
-
-   KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
-   KDE4_LIBS="-L$kde_libdir -L$qt_lib_dir -lkdeui -lkdecore -lQtCore -lQtGui"
-fi
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the lockdown pieces" >&5
-$as_echo_n "checking whether to enable the lockdown pieces... " >&6; }
-ENABLE_LOCKDOWN=""
-if test -n "$enable_lockdown" && test "$enable_lockdown" != "no"; then
-  ENABLE_LOCKDOWN=YES
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable evolution 2 support" >&5
-$as_echo_n "checking whether to enable evolution 2 support... " >&6; }
-if test "$enable_evolution2" = "yes" -o "$enable_evolution2" = "TRUE"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-2.0" >&5
-$as_echo_n "checking for gobject-2.0... " >&6; }
-
-        if $PKG_CONFIG --exists "gobject-2.0" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GOBJECT_CFLAGS" >&5
-$as_echo_n "checking GOBJECT_CFLAGS... " >&6; }
-            GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOBJECT_CFLAGS" >&5
-$as_echo "$GOBJECT_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GOBJECT_LIBS" >&5
-$as_echo_n "checking GOBJECT_LIBS... " >&6; }
-            GOBJECT_LIBS=`$PKG_CONFIG --libs "gobject-2.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOBJECT_LIBS" >&5
-$as_echo "$GOBJECT_LIBS" >&6; }
-        else
-            GOBJECT_CFLAGS=""
-            GOBJECT_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            GOBJECT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gobject-2.0"`
-            echo $GOBJECT_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-   ENABLE_EVOAB2="TRUE"
-else
-   ENABLE_EVOAB2=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable KDE address book support" >&5
-$as_echo_n "checking whether to enable KDE address book support... " >&6; }
-if test "$enable_kdeab" = "yes" && test "$enable_kde" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-   save_CXXFLAGS=$CXXFLAGS
-   CXXFLAGS="$CXXFLAGS $KDE_CFLAGS"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether KDE is between 3.2 and 3.6" >&5
-$as_echo_n "checking whether KDE is between 3.2 and 3.6... " >&6; }
-       if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <kdeversion.h>
-
-int main(int argc, char **argv) {
-       if (KDE_VERSION_MAJOR == 3 && 2 <= KDE_VERSION_MINOR && KDE_VERSION_MINOR <= 6) return 0;
-       else return 1;
-}
-
-_ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  as_fn_error $? "KDE version too old or too recent, please use another version of KDE or disable KDE address book support" "$LINENO" 5
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-   CXXFLAGS=$save_CXXFLAGS
-   ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-   ENABLE_KAB=TRUE
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   ENABLE_KAB=
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include MathMLDTD" >&5
-$as_echo_n "checking whether to include MathMLDTD... " >&6; }
-if test -n "$enable_mathmldtd"; then
-  if test "$enable_mathmldtd" = "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    BUILD_TYPE="$BUILD_TYPE MATHMLDTD"
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include third-party fonts" >&5
-$as_echo_n "checking whether to include third-party fonts... " >&6; }
-if test "$with_fonts" != "no" ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  WITH_FONTS=YES
-  BUILD_TYPE="$BUILD_TYPE MORE_FONTS"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  WITH_FONTS=NO
-  SCPDEFS="$SCPDEFS -DWITHOUT_FONTS"
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include PPDs" >&5
-$as_echo_n "checking whether to include PPDs... " >&6; }
-if test "$with_ppds" != "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  WITHOUT_PPDS=YES
-  SCPDEFS="$SCPDEFS -DWITHOUT_PPDS"
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include AFMs" >&5
-$as_echo_n "checking whether to include AFMs... " >&6; }
-if test "$with_afms" != "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  BUILD_TYPE="$BUILD_TYPE AFMS"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  WITHOUT_AFMS=YES
-  SCPDEFS="$SCPDEFS -DWITHOUT_AFMS"
-fi
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether and how to use Xinerama" >&5
-$as_echo_n "checking whether and how to use Xinerama... " >&6; }
-if test "$_os" = "Darwin"; then
-   USE_XINERAMA=YES
-   XINERAMA_LINK=dynamic
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
-   if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then
-      # we have both versions, let the user decide but use the dynamic one
-      # per default
-      USE_XINERAMA=YES
-      if test -z "$with_static_xinerama" -o -n "$with_system_libs"; then
-         XINERAMA_LINK=dynamic
-      else
-         XINERAMA_LINK=static
-      fi
-   elif test -e "$XLIB/libXinerama.so" -a ! -e "$XLIB/libXinerama.a"; then
-      # we have only the dynamic version
-      USE_XINERAMA=YES
-      XINERAMA_LINK=dynamic
-   elif test -e "$XLIB/libXinerama.a"; then
-      # static version
-      if echo $build_cpu | grep -E 'i[3456]86' 2>/dev/null >/dev/null; then
-         USE_XINERAMA=YES
-         XINERAMA_LINK=static
-      else
-         USE_XINERAMA=NO
-         XINERAMA_LINK=none
-      fi
-   else
-      # no Xinerama
-      USE_XINERAMA=NO
-      XINERAMA_LINK=none
-   fi
-   if test "$USE_XINERAMA" = "YES"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, with $XINERAMA_LINK linking" >&5
-$as_echo "yes, with $XINERAMA_LINK linking" >&6; }
-      ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/Xinerama.h" "ac_cv_header_X11_extensions_Xinerama_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then :
-
-else
-  as_fn_error $? "Xinerama header not found." "$LINENO" 5
-fi
-
-
-      XINERAMA_EXTRA_LIBS="-L$XLIB -lXext"
-      if test "$_os" = "FreeBSD"; then
-          XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -lXt"
-      fi
-      if test "$_os" = "Linux"; then
-          XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -ldl"
-      fi
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XineramaIsActive in -lXinerama" >&5
-$as_echo_n "checking for XineramaIsActive in -lXinerama... " >&6; }
-if test "${ac_cv_lib_Xinerama_XineramaIsActive+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXinerama $XINERAMA_EXTRA_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XineramaIsActive ();
-int
-main ()
-{
-return XineramaIsActive ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_Xinerama_XineramaIsActive=yes
-else
-  ac_cv_lib_Xinerama_XineramaIsActive=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaIsActive" >&5
-$as_echo "$ac_cv_lib_Xinerama_XineramaIsActive" >&6; }
-if test "x$ac_cv_lib_Xinerama_XineramaIsActive" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBXINERAMA 1
-_ACEOF
-
-  LIBS="-lXinerama $LIBS"
-
-else
-  as_fn_error $? "Xinerama not functional?" "$LINENO" 5
-fi
-
-   else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, libXinerama not found or wrong architecture." >&5
-$as_echo "no, libXinerama not found or wrong architecture." >&6; }
-   fi
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build own version of librsvg" >&5
-$as_echo_n "checking whether to build own version of librsvg... " >&6; }
-
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_LIBRSVG=NO
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-		;;
-	Darwin*)
-	    SYSTEM_LIBRSVG=NO
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	    ;;
-   *)
-   SYSTEM_LIBRSVG=YES
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   ;;
-esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build own version of gdk-pixbuf" >&5
-$as_echo_n "checking whether to build own version of gdk-pixbuf... " >&6; }
-
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_GDKPIXBUF=NO
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-		;;
-	Darwin*)
-	    SYSTEM_GDKPIXBUF=NO
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	    ;;
-   *)
-   SYSTEM_GDKPIXBUF=YES
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   ;;
-esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build own version of glib" >&5
-$as_echo_n "checking whether to build own version of glib... " >&6; }
-
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_GLIB=NO
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-		;;
-	Darwin*)
-	    SYSTEM_GLIB=NO
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	    ;;
-   *)
-   SYSTEM_GLIB=YES
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   ;;
-esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build own version of gettext" >&5
-$as_echo_n "checking whether to build own version of gettext... " >&6; }
-
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_GETTEXT=NO
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-		;;
-	Darwin*)
-	    SYSTEM_GETTEXT=NO
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	    ;;
-   *)
-   SYSTEM_GETTEXT=YES
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   ;;
-esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build own version of libcroco" >&5
-$as_echo_n "checking whether to build own version of libcroco... " >&6; }
-
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_LIBCROCO=NO
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-		;;
-	Darwin*)
-	    SYSTEM_LIBCROCO=NO
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	    ;;
-   *)
-   SYSTEM_LIBCROCO=YES
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   ;;
-esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build own version of pango" >&5
-$as_echo_n "checking whether to build own version of pango... " >&6; }
-
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_PANGO=NO
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-		;;
-	Darwin*)
-	    SYSTEM_PANGO=NO
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	    ;;
-   *)
-   SYSTEM_PANGO=YES
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   ;;
-esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build own version of libgsf" >&5
-$as_echo_n "checking whether to build own version of libgsf... " >&6; }
-
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_LIBGSF=NO
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-		;;
-   *)
-   SYSTEM_LIBGSF=YES
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   ;;
-esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build own version of libpng" >&5
-$as_echo_n "checking whether to build own version of libpng... " >&6; }
-
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_LIBPNG=NO
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-		;;
-	Darwin*)
-	    SYSTEM_LIBPNG=NO
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	    ;;
-   *)
-   SYSTEM_LIBPNG=YES
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   ;;
-esac
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build own version of libjpeg" >&5
-$as_echo_n "checking whether to build own version of libjpeg... " >&6; }
-
-if test "$SYSTEM_JPEG" == "YES"; then
-SYSTEM_LIBJPEG=YES
-else
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_LIBJPEG=NO
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-		;;
-	Darwin*)
-	    SYSTEM_LIBJPEG=NO
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	    ;;
-   *)
-   SYSTEM_LIBJPEG=YES
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   ;;
-esac
-fi
-
-if test "$SYSTEM_LIBJPEG" == "YES"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-
-
-
-
-if test "$SOLAR_JAVA" != ""; then
-ANT_HOME=; export ANT_HOME
-WITH_ANT_HOME=; export WITH_ANT_HOME
-if test -z "$with_ant_home"; then
-   for ac_prog in jakarta-ant ant ant.sh ant.bat ant.cmd
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ANT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ANT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ANT="$ANT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ANT=$ac_cv_path_ANT
-if test -n "$ANT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ANT" >&5
-$as_echo "$ANT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ANT" && break
-done
-
-else
-   if test "$_os" = "WINNT"; then
-      with_ant_home=`cygpath -u "$with_ant_home"`
-   fi
-   for ac_prog in jakarta-ant ant ant.sh ant.bat ant.cmd
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ANT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ANT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ANT="$ANT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$with_ant_home/bin:$PATH"
-for as_dir in $as_dummy
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ANT=$ac_cv_path_ANT
-if test -n "$ANT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ANT" >&5
-$as_echo "$ANT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ANT" && break
-done
-
-   WITH_ANT_HOME=$with_ant_home
-   ANT_HOME=$with_ant_home
-fi
-
-if test -z "$ANT"; then
-  as_fn_error $? "Ant not found - Make sure it's in the path or use --with-ant-home" "$LINENO" 5
-else
-  # resolve relative or absolute symlink
-  while test -h "$ANT"; do
-     a_cwd=`pwd`
-     a_basename=`basename "$ANT"`
-     a_script=`ls -l "$ANT" | sed "s/.*${a_basename} -> //g"`
-     cd "`dirname "$ANT"`"
-     cd "`dirname "$a_script"`"
-     ANT="`pwd`"/"`basename "$a_script"`"
-     cd "$a_cwd"
-  done
-
-  if test "$_os" = "OS2"; then
-    ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"`
-    export ANT_HOME
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $ANT works" >&5
-$as_echo_n "checking if $ANT works... " >&6; }
-cat > conftest.java << EOF
-    public class conftest {
-	int testmethod(int a, int b) {
-            return a + b;
-	}
-    }
-EOF
-
-cat > conftest.xml << EOF
-    <project name="conftest" default="conftest">
-	<target name="conftest">
-            <javac srcdir="." includes="conftest.java">
-	    </javac>
-	</target>
-    </project>
-EOF
-  oldJAVA_HOME=$JAVA_HOME
-  if test "$JAVACISGCJ" = "yes"; then
-    JAVA_HOME=; export JAVA_HOME
-    ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
-  else
-    ant_cmd="$ANT -buildfile conftest.xml 1>&2"
-  fi
-  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ant_cmd\""; } >&5
-  (eval $ant_cmd) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if test $? = 0 && test -f ./conftest.class ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Ant works" >&5
-$as_echo "Ant works" >&6; }
-    if test -z "$WITH_ANT_HOME"; then
-        ANT_HOME=`$ANT -diagnostics | $EGREP "ant.home :" | $SED -e "s#ant.home : ##g"`
-        if test -z "$ANT_HOME"; then
-            ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"`
-        fi
-    else
-        ANT_HOME="$WITH_ANT_HOME"
-    fi
-  else
-    echo "configure: Ant test failed" >&5
-    cat conftest.java >&5
-    cat conftest.xml >&5
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ant does not work - Some Java projects will not build!" >&5
-$as_echo "$as_me: WARNING: Ant does not work - Some Java projects will not build!" >&2;}
-    ANT_HOME=""
-    echo "Ant does not work - Some Java projects will not build!" >>warn
-  fi
-  JAVA_HOME=$oldJAVA_HOME
-  rm -f conftest* core core.* *.core
-fi
-if test -z "$ANT_HOME"; then
-   ANT_HOME="NO_ANT_HOME"
-fi
-
-
-if test "$ANT_HOME" != "NO_ANT_HOME"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ant lib directory" >&5
-$as_echo_n "checking Ant lib directory... " >&6; }
-   if test -f $ANT_HOME/lib/ant.jar; then
-	  ANT_LIB="$ANT_HOME/lib"
-   else
-      if test -f $ANT_HOME/ant.jar; then
-	     ANT_LIB="$ANT_HOME"
-      else
-          if test -f /usr/share/java/ant.jar; then
-              ANT_LIB=/usr/share/java
-          else
-             if test -f /usr/share/ant-core/lib/ant.jar; then
-                 ANT_LIB=/usr/share/ant-core/lib
-             else
-                if test -f $ANT_HOME/lib/ant/ant.jar; then
-                    ANT_LIB="$ANT_HOME/lib/ant"
-                else
-                   if test -f /usr/share/lib/ant/ant.jar; then
-                       ANT_LIB=/usr/share/lib/ant
-                   else
-                       as_fn_error $? "Ant libraries not found!" "$LINENO" 5
-                   fi
-                fi
-             fi
-          fi
-      fi
-   fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: Ant lib directory found." >&5
-$as_echo "Ant lib directory found." >&6; }
-fi
-
-fi
-
-ant_minver=1.6.0
-# update for more extensions...
-if test "$ENABLE_MEDIAWIKI" = "YES"; then
-  ant_minver=1.7.0
-fi
-ant_minminor1=`echo $ant_minver | cut -d"." -f2`
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ant is >= $ant_minver" >&5
-$as_echo_n "checking whether ant is >= $ant_minver... " >&6; }
-ant_version=`$ANT -version | $AWK '{ print $4; }'`
-ant_version_major=`echo $ant_version | cut -d. -f1`
-ant_version_minor=`echo $ant_version | cut -d. -f2`
-echo "configure: ant_version $ant_version " >&5
-echo "configure: ant_version_major $ant_version_major " >&5
-echo "configure: ant_version_minor $ant_version_minor " >&5
-if test "$ant_version_major" -ge "2"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $ant_version" >&5
-$as_echo "yes, $ant_version" >&6; }
-elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $ant_version" >&5
-$as_echo "yes, $ant_version" >&6; }
-else
-   as_fn_error $? "no, you need at least ant >= $ant_minver" "$LINENO" 5
-fi
-
-if test "$ENABLE_MEDIAWIKI" = "YES"; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ant supports mapper type=\"regexp\"" >&5
-$as_echo_n "checking whether ant supports mapper type=\"regexp\"... " >&6; }
-rm -rf confdir
-mkdir confdir
-cat > conftest.java << EOF
-    public class conftest {
-        int testmethod(int a, int b) {
-            return a + b;
-        }
-    }
-EOF
-
-cat > conftest.xml << EOF
-    <project name="conftest" default="conftest">
-        <target name="conftest" depends="copytest">
-            <javac srcdir="." includes="conftest.java">
-            </javac>
-        </target>
-        <target name="copytest">
-             <copy todir="confdir">
-                 <fileset dir="confdir" includes="**/*.abc" casesensitive="yes"/>
-                 <filterset/>
-                 <mapper type="regexp" from="^(.*/\\)foo(/\\.*)" to="\1baa\2"/>
-             </copy>
-        </target>
-    </project>
-EOF
-  if test "$JAVACISGCJ" = "yes"; then
-    JAVA_HOME=; export JAVA_HOME
-    ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
-  else
-    ant_cmd="$ANT -buildfile conftest.xml 1>&2"
-  fi
-  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ant_cmd\""; } >&5
-  (eval $ant_cmd) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if test $? = 0 && test -f ./conftest.class ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    rm -rf confdir
-  else
-    echo "configure: Ant test failed" >&5
-    cat conftest.java >&5
-    cat conftest.xml >&5
-    rm -rf confdir
-    as_fn_error $? "no. Did you install ant-apache-regexp?" "$LINENO" 5
-  fi
-fi
-rm -f conftest* core core.* *.core
-
-OOO_JUNIT_JAR=
-if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JUnit 4" >&5
-$as_echo_n "checking for JUnit 4... " >&6; }
-    if test "$with_junit" == "yes"; then
-        if test -e /usr/share/java/junit4.jar; then
-            OOO_JUNIT_JAR=/usr/share/java/junit4.jar
-        else
-           if test -e /usr/share/lib/java/junit.jar; then
-              OOO_JUNIT_JAR=/usr/share/lib/java/junit.jar
-           else
-              OOO_JUNIT_JAR=/usr/share/java/junit.jar
-           fi
-        fi
-    else
-        OOO_JUNIT_JAR=$with_junit
-    fi
-    if test "$_os" = "WINNT"; then
-        OOO_JUNIT_JAR=`cygpath -m "$OOO_JUNIT_JAR"`
-    fi
-    "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" 2>&5 | \
-        grep org/junit/Before.class > /dev/null 2>&5
-    if test $? -eq 0; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OOO_JUNIT_JAR" >&5
-$as_echo "$OOO_JUNIT_JAR" >&6; }
-    else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-        as_fn_error $? "cannot find JUnit 4 jar; please install one in the default
-location (/usr/share/java), specify its pathname via
---with-junit=..., or disable it via --without-junit" "$LINENO" 5
-    fi
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which languages to be built" >&5
-$as_echo_n "checking which languages to be built... " >&6; }
-WITH_LANG="$with_lang"
-if test -z "$WITH_LANG"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: en-US" >&5
-$as_echo "en-US" >&6; }
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_LANG" >&5
-$as_echo "$WITH_LANG" >&6; }
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which languages have poor help localizations" >&5
-$as_echo_n "checking which languages have poor help localizations... " >&6; }
-WITH_POOR_HELP_LOCALIZATIONS="$with_poor_help_localizations"
-if test -z "$WITH_POOR_HELP_LOCALIZATIONS"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_POOR_HELP_LOCALIZATIONS" >&5
-$as_echo "$WITH_POOR_HELP_LOCALIZATIONS" >&6; }
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which dictionaries to include" >&5
-$as_echo_n "checking which dictionaries to include... " >&6; }
-if test -z "$with_dict"; then
-   WITH_DICT=,ALL,
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ALL" >&5
-$as_echo "ALL" >&6; }
-else
-   WITH_DICT=","$with_dict","
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dict" >&5
-$as_echo "$with_dict" >&6; }
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional 'intro' bitmaps" >&5
-$as_echo_n "checking for additional 'intro' bitmaps... " >&6; }
-INTRO_BITMAPS=
-if test -z "$with_intro_bitmaps" -o "$with_intro_bitmaps" = "no" ; then
-   INTRO_BITMAPS=
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-else
-   for bitmap in `echo $with_intro_bitmaps | tr ',' ' '` ; do
-      case "$bitmap" in
-         *.bmp) ;;
-         *)     bitmap= ; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Intro bitmaps should be .bmp files!" >&5
-$as_echo "$as_me: WARNING: Intro bitmaps should be .bmp files!" >&2;} ;;
-      esac
-      if test -n "$bitmap" ; then
-         INTRO_BITMAPS="$INTRO_BITMAPS $bitmap"
-      fi
-   done
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTRO_BITMAPS" >&5
-$as_echo "$INTRO_BITMAPS" >&6; }
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional 'about' bitmaps" >&5
-$as_echo_n "checking for additional 'about' bitmaps... " >&6; }
-ABOUT_BITMAPS=
-if test -z "$with_about_bitmaps" -o "$with_about_bitmaps" = "no" ; then
-   ABOUT_BITMAPS=
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-else
-   for bitmap in `echo $with_about_bitmaps | tr ',' ' '` ; do
-      case "$bitmap" in
-         *.bmp) ;;
-         *)     bitmap= ; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: About bitmaps should be .bmp files!" >&5
-$as_echo "$as_me: WARNING: About bitmaps should be .bmp files!" >&2;} ;;
-      esac
-      if test -n "$bitmap" ; then
-         ABOUT_BITMAPS="$ABOUT_BITMAPS $bitmap"
-      fi
-   done
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ABOUT_BITMAPS" >&5
-$as_echo "$ABOUT_BITMAPS" >&6; }
-fi
-
-
-OOO_VENDOR=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vendor" >&5
-$as_echo_n "checking for vendor... " >&6; }
-if test -z "$with_vendor" -o "$with_vendor" = "no" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5
-$as_echo "not set" >&6; }
-else
-   OOO_VENDOR="$with_vendor"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OOO_VENDOR" >&5
-$as_echo "$OOO_VENDOR" >&6; }
-fi
-
-
-UNIXWRAPPERNAME=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIX wrapper name" >&5
-$as_echo_n "checking for UNIX wrapper name... " >&6; }
-if test -z "$with_unix_wrapper" -o "$with_unix_wrapper" = "no"  -o "$with_unix_wrapper" = "yes" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5
-$as_echo "not set" >&6; }
-else
-   UNIXWRAPPERNAME="$with_unix_wrapper"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNIXWRAPPERNAME" >&5
-$as_echo "$UNIXWRAPPERNAME" >&6; }
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to statically link to Gtk" >&5
-$as_echo_n "checking whether to statically link to Gtk... " >&6; }
-if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then
-   ENABLE_STATIC_GTK="TRUE"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-   ENABLE_STATIC_GTK="FALSE"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use layout dialogs" >&5
-$as_echo_n "checking whether to use layout dialogs... " >&6; }
-if test -n "$enable_layout" && test "$enable_layout" != "no"; then
-   ENABLE_LAYOUT="TRUE"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-   ENABLE_LAYOUT="FALSE"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# ===================================================================
-# De- or increase default verbosity of build process
-# ===================================================================
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build verbosity" >&5
-$as_echo_n "checking build verbosity... " >&6; }
-if test -n "$enable_verbose"; then
-   if test "$enable_verbose" = "yes"; then
-      VERBOSE="TRUE"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: high" >&5
-$as_echo "high" >&6; }
-   fi
-   if test "$enable_verbose" = "no"; then
-      VERBOSE="FALSE"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: low" >&5
-$as_echo "low" >&6; }
-   fi
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5
-$as_echo "not set" >&6; }
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dependency tracking" >&5
-$as_echo_n "checking whether to enable dependency tracking... " >&6; }
-if test "$enable_dependency_tracking" = "no"; then
-    nodep=TRUE
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-
-
-echo "********************************************************************"
-echo "*                                                                  *"
-echo "*   Setting up the build environment variables.                    *"
-echo "*                                                                  *"
-echo "********************************************************************"
-
-if test -z "$COMPATH"; then
-   as_fn_error $? "No compiler found." "$LINENO" 5
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking solver path" >&5
-$as_echo_n "checking solver path... " >&6; }
-if test -z "$with_local_solver"; then
-   LOCAL_SOLVER="DEFAULT"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: default" >&5
-$as_echo "default" >&6; }
-else
-   LOCAL_SOLVER=$with_local_solver
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_local_solver" >&5
-$as_echo "$with_local_solver" >&6; }
-fi
-
-
-
-
-# make sure config.guess is +x; we execute config.guess, so it has to be so;
-chmod +x ./config.guess
-
-ac_config_files="$ac_config_files set_soenv Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-ac_script='
-:mline
-/\\$/{
- N
- s,\\\n,,
- b mline
-}
-t clear
-:clear
-s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
-t quote
-s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
-t quote
-b any
-:quote
-s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
-s/\[/\\&/g
-s/\]/\\&/g
-s/\$/$$/g
-H
-:any
-${
-	g
-	s/^\n//
-	s/\n/ /g
-	p
-}
-'
-DEFS=`sed -n "$ac_script" confdefs.h`
-
-
-ac_libobjs=
-ac_ltlibobjs=
-U=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to the package provider."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.67,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=?*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h |  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "set_soenv") CONFIG_FILES="$CONFIG_FILES set_soenv" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-
-eval set X "  :F $CONFIG_FILES      "
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
-
-
-
-  esac
-
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
-
-chmod a+x set_soenv
-if test -z "$enable_check_only"; then
-   './set_soenv'
-else
-   echo
-   echo Test Complete
-   echo No environment file will be generated
-   echo
-   num_warnings=`wc -l warn`
-   _num=`echo $num_warnings | $AWK '{ print $1 }'`
-   if test $_num -gt 0; then
-      echo The following warning\(s\) were generated by configure
-      echo ----------------------------------------------------
-      echo
-      cat warn
-      echo
-   else
-      echo There were no warnings
-   fi
-   echo
-fi
diff --git a/configure.cmd b/configure.cmd
deleted file mode 100755
index aff7e810b520..000000000000
--- a/configure.cmd
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-setlocal
-SET MY_ANT_HOME=e:/java150/apache-ant-1.7.0
-SET JAVA_HOME=e:\java150
-SET PATH=%JAVA_HOME%\bin;%PATH%;%MY_ANT_HOME%\bin;
-sh -c "configure --with-system-openssl --with-system-icu --with-system-libxml --with-system-libxslt --disable-werror --with-use-shell=bash --disable-mozilla --disable-epm --disable-odk --disable-qadevooo --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-nas --without-fonts --with-ant-home=%MY_ANT_HOME%" | tee configure.log
-endlocal
diff --git a/configure.in b/configure.in
index 34af2af72703..5241c6ed78cc 100644..100755
--- a/configure.in
+++ b/configure.in
@@ -1,883 +1,1323 @@
-dnl /******************************************************************
-dnl *     vi:set sw=3 ts=3 et:
-dnl *
-dnl * Name: configure.in
-dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
-dnl * Date: $Date: 2008-09-08 07:38:40 $
-dnl *
-dnl * Desc: This file serves as input for the GNU autoconf package
-dnl *       in order to create a configure script.
-dnl *       In this stage configure just checks the pre-requisites
-dnl *       necessary to build OpenOffice.org
-dnl *
-dnl *
-dnl ******************************************************************/
-AC_REVISION( $Revision: 1.290 $ )
+dnl -*- Mode: Autoconf; tab-width: 8; indent-tabs-mode: nil -*-
+dnl configure.in serves as input for the GNU autoconf package
+dnl in order to create a configure script.
+
+AC_INIT([LibreOffice], [3.5],,, [http://documentfoundation.org/])
 AC_PREREQ(2.50)
-AC_INIT()
 echo "$@" >config.parms
-AC_ARG_WITH(gnu-patch,
-[  --with-gnu-patch        Specify location of GNU patch on Solaris or FreeBSD
-],,)
-AC_ARG_WITH(agg,
-[  --without-agg           Disable the use of agg altogether
-],,with_agg=yes)
-AC_ARG_WITH(gnu-cp,
-[  --with-gnu-cp           Specify location of GNU cp on Solaris or FreeBSD
-],,)
+
+dnl ===================================================================
+dnl Optional Features (--enable/disable-)
+dnl ===================================================================
+
+dnl ---------- Extensions ----------
+
+AC_ARG_ENABLE(ext-barcode,
+    AS_HELP_STRING([--enable-ext-barcode],
+        [Enables the Barcode extension.]),
+,)
+
+AC_ARG_ENABLE(ext-diagram,
+    AS_HELP_STRING([--enable-ext-diagram],
+        [Enables the Diagram extension.]),
+,)
+
+AC_ARG_ENABLE(ext-google-docs,
+    AS_HELP_STRING([--enable-ext-google-docs],
+        [Download and enables the Google Documents extension.]),
+,)
+
+AC_ARG_ENABLE(ext-hunart,
+    AS_HELP_STRING([--enable-ext-hunart],
+        [Enables the Hungarian Cross-reference Toolbar extension.]),
+,)
+
+AC_ARG_ENABLE(ext-lightproof,
+    AS_HELP_STRING([--enable-ext-lightproof],
+        [Enables the Lightproof extension.]),
+,)
+
+AC_ARG_ENABLE(ext-mysql-connector,
+    AS_HELP_STRING([--enable-ext-mysql-connector],
+        [Enables the build of the MySQL Connector/LibreOffice extension. This requires
+         access to the MySQL Connector/C (aka libmysql) to be given, too, with
+         either the --with-system-mysql or --with-libmysql-path option.]),
+,)
+
+AC_ARG_ENABLE(ext-nlpsolver,
+    AS_HELP_STRING([--enable-ext-nlpsolver],
+        [Download and enables the NLPSolver extension.]),
+,)
+
+AC_ARG_ENABLE(ext-ct2n,
+    AS_HELP_STRING([--enable-ext-ct2n],
+        [Enables the ConvertTextToNumber extension.]),
+,)
+
+AC_ARG_ENABLE(ext-numbertext,
+    AS_HELP_STRING([--enable-ext-numbertext],
+        [Enables the Numbertext extension.]),
+,)
+
+AC_ARG_ENABLE(ext-oooblogger,
+    AS_HELP_STRING([--enable-ext-oooblogger],
+        [Download and enables the OOo Blogger extension.]),
+,)
+
+AC_ARG_ENABLE(ext-pdfimport,
+    AS_HELP_STRING([--enable-ext-pdfimport],
+        [Enables the PDF Import extension and xpdf.]),
+,)
+
+AC_ARG_ENABLE(ext-presenter-console,
+    AS_HELP_STRING([--enable-ext-presenter-console],
+        [Enables the Presenter Console extension.]),
+,)
+
+AC_ARG_ENABLE(ext-presenter-minimizer,
+    AS_HELP_STRING([--enable-ext-presenter-minimizer],
+        [Enables the Presentation Minimizer extension.]),
+,)
+
+AC_ARG_ENABLE(ext-report-builder,
+    AS_HELP_STRING([--enable-ext-report-builder],
+        [Enables the build of the Report Builder extension.]),
+,)
+
+AC_ARG_ENABLE(ext-scripting-beanshell,
+    AS_HELP_STRING([--enable-ext-scripting-beanshell],
+        [Enables support for scripts in BeanShell.]),
+,)
+
+AC_ARG_ENABLE(ext-scripting-javascript,
+    AS_HELP_STRING([--enable-ext-scripting-javascript],
+        [Enables support for scripts in JavaScript.]),
+,)
+
+AC_ARG_ENABLE(ext-typo,
+    AS_HELP_STRING([--enable-ext-typo],
+        [Enables the Typography Toolbar extension.]),
+,)
+
+AC_ARG_ENABLE(ext-validator,
+    AS_HELP_STRING([--enable-ext-validator],
+        [Enables the Validator extension.]),
+,)
+
+AC_ARG_ENABLE(ext-watch-window,
+    AS_HELP_STRING([--enable-ext-watch-window],
+        [Enables the Watch Window extension to Calc.]),
+,)
+
+AC_ARG_ENABLE(ext-wiki-publisher,
+    AS_HELP_STRING([--enable-ext-wiki-publisher],
+        [Enables the Wiki Publisher extension.]),
+,)
+
+dnl ---------- *** ----------
+
 AC_ARG_ENABLE(graphite,
-[  --enable-graphite       Enables the compilation of Graphite smart font rendering
-],,)
-AC_ARG_WITH(system-graphite,
-[  --with-system-graphite    use graphite library already installed on system
-],,)
+    AS_HELP_STRING([--enable-graphite],
+        [Enables the compilation of Graphite smart font rendering.]),
+,)
+
 AC_ARG_ENABLE(ldap,
-[  --disable-ldap          Disables the use of LDAP backend via Netscape/Mozilla
-                          or OpenLDAP LDAP SDK
-],,)
+    AS_HELP_STRING([--disable-ldap],
+        [Disables the use of LDAP backend via Netscape/Mozilla or OpenLDAP LDAP SDK]),
+,)
+
 AC_ARG_ENABLE(fetch-external,
-[  --disable-fetch-external Disables fetching external tarballs from web sources.
-],,)
-AC_ARG_WITH(external-tar,
-[  --with-external-tar=<TARFILE PATH>   Specify path to tarfiles manually ],
-[ TARFILE_LOCATION="$withval"
-])
-AC_ARG_WITH(openldap,
-[  --with-openldap         Enables the use of the OpenLDAP LDAP SDK instead
-                          of the Netscape/Mozilla one
-],,)
+    AS_HELP_STRING([--disable-fetch-external],
+        [Disables fetching external tarballs from web sources.]),
+,)
+
 AC_ARG_ENABLE(lockdown,
-[  --enable-lockdown       Enables the gconf integration work in OOo
-],,)
+    AS_HELP_STRING([--disable-lockdown],
+        [Disables the gconf integration work in LibreOffice.]),
+,enable_lockdown=yes)
+
 AC_ARG_ENABLE(vba,
-[  --disable-vba           disables the vba compatibility feature
-],,)
-AC_ARG_WITH(vba-package-format,
-[  --with-vba-package-format   specify package format for vba compatibility api.
-                          Specifying  "builtin" means the api component and 
-                          associated type library are  part of the installation set.
-                          Specifying "extn" creates an uno extension that is
-                          part of the installation set ( located in the program 
-                          directory ) that MUST be optionly registered using
-                          either the unopkg executeable or the extension manager
-                          gui.
-                         
-                          Note: "builtin" is the default, "extn" can cause
-                          problems.
-                          Usage: --with-vba-package-format="builtin" or
-                                 --with-vba-package-format="extn"
-],,)              
+    AS_HELP_STRING([--disable-vba],
+        [Disables the vba compatibility feature.]),
+,)
+
 AC_ARG_ENABLE(pch,
-[  --enable-pch            EXPERIMENTAL: Enables precompiled header support for C++.
-],,)
+    AS_HELP_STRING([--enable-pch],
+        [EXPERIMENTAL: Enables precompiled header support for C++.]),
+,)
+
 AC_ARG_ENABLE(mozilla,
-[  --disable-mozilla       OO.o usually includes a strangely hacked up mozilla
-                          binary for your platform, to build without this
-                          version, use this option.
-],,enable_mozilla="yes")
-AC_ARG_WITH(fonts,
-[  --without-fonts         OOo includes some third-party fonts to provide a reliable
-                          basis for help content, templates, samples, etc.
-                          When these fonts are already known to be available on the
-                          system then you should use this option.
-],,)
-AC_ARG_WITH(ppds,
-[  --without-ppds          Removes Postscript Printer definition files from
-                          openoffice.org installation set, for people building
-                          for specific distributions where PPDs are known to be
-                          already available (every recent distro with CUPS
-                          backend)
-],,)
-AC_ARG_WITH(afms,
-[  --without-afms          Removes bitmap font files from openoffice.org
-                          installation set, for people building for specific
-                          distributions where AFM files or TrueType Fonts
-                          are known to be available.
-],,)
+    AS_HELP_STRING([--disable-mozilla],
+        [LibreOffice usually includes a strangely hacked up Mozilla binary for your
+         platform, to build without this version, use this option.]),
+,enable_mozilla=yes)
+
 AC_ARG_ENABLE(epm,
-[  --disable-epm           OO.o includes self-packaging code, that requires
-                          epm, however epm is useless for large scale
-                          package building.
-],,enable_epm="yes")
-AC_ARG_WITH(epm,
-[  --with-epm		  Decides which epm to use. Default is to use
-			  the one from the system if one is built. When
-			  either this is not there or you say =internal
-			  epm will be built.
-],,)
-AC_ARG_WITH(package-format,
-[  --with-package-format   specify package format(s) for OOo installsets.
-                          Default is "normal" one of the OS/Distribution.
+    AS_HELP_STRING([--enable-epm],
+        [LibreOffice includes self-packaging code, that requires epm, however epm is
+         useless for large scale package building.]),
+,enable_epm=no)
+
+AC_ARG_ENABLE(activex_component,
+    AS_HELP_STRING([--disable-activex-component],
+        [Remove support for ActiveX embedding of LibreOffice.]),
+,enable_activex_component=yes)
 
-                          Usage: --with-package-format="foo bar"
-],,)                   
 AC_ARG_ENABLE(odk,
-[  --disable-odk           OO.o includes an ODK, office development kit
-                          which some packagers may with to build without
-],,enable_odk="yes")
+    AS_HELP_STRING([--disable-odk],
+        [LibreOffice includes an ODK, office development kit which some packagers may
+         wish to build without.]),
+,enable_odk=yes)
+
 AC_ARG_ENABLE(mathmldtd,
-[  --disable-mathmldtd     disable mathmldtd
-                          (useful for distributions that want to avoid packaging
-                          it)
-],,enable_mathmldtd="yes")
+    AS_HELP_STRING([--disable-mathmldtd],
+        [Disable mathmldtd (useful for distributions that want to avoid
+         packaging it).]),
+,enable_mathmldtd=yes)
+
 AC_ARG_ENABLE(evolution2,
-[  --enable-evolution2     Allows the built-in evolution 2 addressbook
-                          connectivity build to be enabled.
-],,)
-AC_ARG_WITH(system-stdlibs,
-[  --with-system-stdlibs   use libstdc++/libgcc_s already on system
-],,)
+    AS_HELP_STRING([--enable-evolution2],
+        [Allows the built-in evolution 2 addressbook connectivity build to be
+         enabled.]))
+
 AC_ARG_ENABLE(cups,
-[  --disable-cups          disable cups support in the psprint project
-],,enable_cups=yes)
+    AS_HELP_STRING([--disable-cups],
+        [Disable cups support in the psprint project.]))
+
 AC_ARG_ENABLE(fontconfig,
-[  --disable-fontconfig    disable support for the fontconfig library
-],,enable_fontconfig=yes)
+    AS_HELP_STRING([--disable-fontconfig],
+        [Disable support for the fontconfig library.]),
+,enable_fontconfig=yes)
+
 AC_ARG_ENABLE(directx,
-[  --disable-directx       Remove DirectX implementation for the new XCanvas
-                          interface. The DirectX support requires more stuff
-                          installed on Windows to compile.
-                          (DirectX SDK, GDI+ libs)
-],,enable_directx=yes)
+    AS_HELP_STRING([--disable-directx],
+        [Remove DirectX implementation for the new XCanvas interface.
+         The DirectX support requires more stuff installed on Windows to
+         compile. (DirectX SDK, GDI+ libs)]),
+,enable_directx=yes)
+
 AC_ARG_ENABLE(activex,
-[  --disable-activex       Disable the use of ActiveX for windows build.
-                          This switch is mandatory when using VC++ 2005/2008 Express.
-],,)
+    AS_HELP_STRING([--disable-activex],
+        [Disable the use of ActiveX for a Windows build.])
+    [
+                          This switch is mandatory when using VC++ 2008 Express.
+    ],
+,)
 
 AC_ARG_ENABLE(atl,
-[  --disable-atl          Disable the use of ATL for windows build.
-                          This switch is mandatory when using VC++ 2005/2008 Express.
-],,)
+    AS_HELP_STRING([--disable-atl],
+        [Disable the use of ATL for a Windows build.])
+    [
+                          This switch is mandatory when using VC++ 2008 Express.
+    ],
+,)
 
 AC_ARG_ENABLE(symbols,
-[  --enable-symbols        Include debugging symbols in output.
-                          WARNING - a complete build needs 8 Gb of space and
-                          takes much longer. (enables -g compiler flag)
-
-                          --enable-symbols=SMALL sets the gcc -g1 setting
-                          which is smaller.
-
+    AS_HELP_STRING([--enable-symbols],
+        [Include debugging symbols in output. WARNING - a complete build needs
+         8 Gb of space and takes much longer (enables -g compiler flag).])
+    [
                           Enabling symbols disables the stripping of the solver
                           (--disable-strip-solver).
-],,)
-AC_ARG_ENABLE(strip-solver,
-[  --disable-strip-solver  Disable the stripping of the solver.
-                          By default the solver is stripped unless a build with
-                          debugging symbols (--enable-symbols) is requested.
+    ],
+,)
 
+AC_ARG_ENABLE(strip-solver,
+    AS_HELP_STRING([--disable-strip-solver],
+        [Disable the stripping of the solver. By default the solver is stripped
+         unless a build with debugging symbols (--enable-symbols) is requested.])
+    [
                           This switch allows to override this setting.
-],,)
+    ],
+,)
+
 AC_ARG_ENABLE(werror,
-[  --enable-werror         Turn warnings to errors. (Has no effect in modules
-                          where the treating of warnings as errors is disabled
-                          explicitely)
-],,)
+    AS_HELP_STRING([--enable-werror],
+        [Turn warnings to errors. (Has no effect in modules where the treating
+         of warnings as errors is disabled explicitly.)]),
+,)
+
 AC_ARG_ENABLE(debug,
-[  --enable-debug          Include debugging symbols from --enable-symbols
-                          plus extra debugging code.  Extra large build!
-                          (enables -g compiler flag and dmake debug=true)
-],,)
+    AS_HELP_STRING([--enable-debug],
+        [Include debugging symbols from --enable-symbols plus extra debugging
+         code. Extra large build! (enables -g compiler flag and dmake debug=true)
+         If you need even more verbose output, build a module with
+         "build -- debug=true dbglevel=2".]))
+
 AC_ARG_ENABLE(dbgutil,
-[  --enable-dbgutil        Include additional debugging utilities, such as
-                          assertions, object counting, etc. Larger build.
-                          Independent from --enable-debug
-],,)
+    AS_HELP_STRING([--enable-dbgutil],
+        [Include additional debugging utilities, such as assertions, object
+         counting, etc. Larger build. Independent from --enable-debug]))
+
 AC_ARG_ENABLE(crashdump,
-[  --enable-crashdump      Enable the crashdump feature code.
-],,)
-AC_ARG_ENABLE(cl-standard,
-[  --enable-cl-standard    For Microsoft C/C++ compiler users, use non-optimizing
-                          standard compiler. ( This just disavles optimization
-                          options and therefore removes a lot of warnings when
-                          using the cheaper standard compiler. )
-],,)
+    AS_HELP_STRING([--enable-crashdump],
+        [Enable the crashdump feature.]))
+
+AC_ARG_ENABLE(python,
+    AS_HELP_STRING([--enable-python=<no/auto/system/internal>],
+        [Enables or disables Python support at run-time and build-time.
+         Also specifies what Python to use. 'auto' is the
+         default. Note that Python can be disabled with
+         --disable-python or --enable-python=no only if no
+         translations are required.]))
+
 AC_ARG_ENABLE(gtk,
-[  --disable-gtk           Determines whether to use Gtk+ vclplug on platforms
-                          where Gtk+ is available.
-],,enable_gtk=yes)
-AC_ARG_ENABLE(gstreamer,
-[  --disable-gstreamer     Determines whether to use the GStreamer media
-                          backend on platforms where GStreamer is available.
-],,enable_gstreamer=yes)
+    AS_HELP_STRING([--disable-gtk],
+        [Determines whether to use Gtk+ vclplug on platforms where Gtk+ is available.]),
+,enable_gtk=yes)
+
+AC_ARG_ENABLE(gtk3,
+    AS_HELP_STRING([--disable-gtk3],
+        [Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+ 3.0 is available.]),
+,enable_gtk3=no)
+
 AC_ARG_ENABLE(systray,
-[  --disable-systray       Determines whether to build the systray quickstarter.
-],,enable_systray=yes)
-AC_ARG_ENABLE(cairo,
-[  --enable-cairo          Determines whether to use Cairo library on
-                          platforms where Cairo is available.
-],,enable_cairo=no)
-AC_ARG_WITH(system-cairo,
-[  --with-system-cairo      Use Cairo libraries already on system
-],,)
+    AS_HELP_STRING([--disable-systray],
+        [Determines whether to build the systray quickstarter.]),
+,enable_systray=yes)
+
 AC_ARG_ENABLE(cairo-canvas,
 [  --disable-cairo-canvas  Determines whether to build the Cairo canvas on
                           platforms where Cairo is available.
 ],,enable_cairo_canvas=yes)
 AC_ARG_ENABLE(librsvg,
-[  --enable-librsvg        Determines whether to use librsvg library on
-                          platforms where librsvg is available.
-                          (actually, it is possible to build with
-                          --disable-librsvg and to still have SVG support
-                          within a running soffice instance, since this
-                          dependency is a runtime only dependency.
-                          To have SVG suppport at runtime, the librsvg, the cairo
-                          and the gobject library - and all depending libraries
-                          as well - need to be accessible by the running soffice
-                          instance.
-                          The intention of defaulting this flag to yes is to
-                          indicate this fact to the build maintainer)
-],,enable_librsvg=yes)
+    AS_HELP_STRING([--enable-librsvg=<no/auto/system/internal>],
+        [Enables or disables use of librsvg to render SVG at run-time.
+         Also specificed what librsvg to use. 'auto' is the default.]))
+
 AC_ARG_ENABLE(opengl,
-[  --enable-opengl         Determines whether to build the OpenGL 3D slide 
-                          transitions component
-],,enable_opengl=no)
+    AS_HELP_STRING([--disable-opengl],
+        [Determines whether to build the OpenGL 3D slide transitions component.]),
+,enable_opengl=yes)
+
 AC_ARG_ENABLE(dbus,
-[  --enable-dbus           Determines whether to enable presentation mode 
-                          screensaver control under GNOME via DBUS 
-],,enable_dbus=no)
+    AS_HELP_STRING([--enable-dbus],
+        [Determines whether to enable presentation mode screensaver control
+         under GNOME via DBUS.]),
+,enable_dbus=no)
+
 AC_ARG_ENABLE(gconf,
-[  --disable-gconf         Determines whether to use the GConf support
-],,enable_gconf=yes)
+    AS_HELP_STRING([--disable-gconf],
+        [Determines whether to use the GConf support.]),
+,enable_gconf=yes)
+
 AC_ARG_ENABLE(gnome-vfs,
-[  --disable-gnome-vfs     Determines whether to use the Gnome Virtual Filing
-                          System on platforms where that VFS is available
-],,enable_gnome_vfs=yes)
+    AS_HELP_STRING([--disable-gnome-vfs],
+        [Determines whether to use the Gnome Virtual Filing System on platforms
+         where that VFS is available.]),
+,enable_gnome_vfs=yes)
+
 AC_ARG_ENABLE(gio,
-[  --enable-gio            Determines whether to use the GIO support
-],,enable_gio=no)
+    AS_HELP_STRING([--enable-gio],
+        [Determines whether to use the GIO support.]),
+,enable_gio=no)
+
 AC_ARG_ENABLE(static-gtk,
-[  --enable-static-gtk     Modules that are linked against gtk libraries use
-                          the static libraries instead of the dynamic ones. 
-                          (enables -Bstatic linker flag for gtk libraries)
-],,)
+    AS_HELP_STRING([--enable-static-gtk],
+        [Modules that are linked against GTK+ libraries use the static libraries
+         instead of the dynamic ones. (Enables -Bstatic linker flag for GTK+ libraries.)]),
+,)
+
 AC_ARG_ENABLE(layout,
-[  --enable-layout         Enable the compilation and use of layout dialogs
-],,)
+    AS_HELP_STRING([--enable-layout],
+        [Enable the compilation and use of layout dialogs.]),
+,)
+
 AC_ARG_ENABLE(build-mozilla,
-[  --disable-build-mozilla Use this option if you do not want to build the
-                          mozilla components from the mozilla source code but
-                          take precompiled zips
-],,)
-AC_ARG_WITH(mozilla-version,
-[  --with-mozilla-version  Choose which version of mozilla to use while building
-                          mozilla. Default: 1.7.5.
-                          Note that not all versions are supported.
-],,)
-AC_ARG_WITH(mozilla-toolkit,
-[  --with-mozilla-toolkit  Choose which GUI toolkit to use while building mozilla
-                          components. Default: gtk2
-],,)
-AC_ARG_ENABLE(nss_module,
-[  --disable-nss-module    Whether to use provided NSS module     
-],,enable_nss_module=yes)
+    AS_HELP_STRING([--disable-build-mozilla],
+        [Use this option if you do not want to build the Mozilla components from
+         the Mozilla source code but take precompiled zips.]),
+,)
+
+AC_ARG_ENABLE(nss-module,
+    AS_HELP_STRING([--disable-nss-module],
+        [Whether to use provided NSS module.]),
+,enable_nss_module=yes)
+
 AC_ARG_ENABLE(kde,
-[  --enable-kde            Determines whether to use Qt/KDE vclplug on platforms
-                          where Qt and KDE are available.
-],,)
+    AS_HELP_STRING([--enable-kde],
+        [Determines whether to use Qt3/KDE3 vclplug on platforms where Qt3 and
+         KDE3 are available.]),
+,)
+
 AC_ARG_ENABLE(kdeab,
-[  --disable-kdeab         Disable the KDE address book support
-],,if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi)
+    AS_HELP_STRING([--disable-kdeab],
+        [Disable the KDE3 address book support.]),
+,
+    if test "$enable_kde" = "yes"; then
+        enable_kdeab=yes;
+    fi
+)
+
 AC_ARG_ENABLE(kde4,
-[  --enable-kde4            Determines whether to use Qt4/KDE4 vclplug on platforms
-                          where Qt4 and KDE4 are available. May be used with --enable-kde 
-                          if you want to support both KDE3 and KDE4.
-],,)
+    AS_HELP_STRING([--enable-kde4],
+        [Determines whether to use Qt4/KDE4 vclplug on platforms where Qt4 and
+         KDE4 are available. May be used with --enable-kde if you want to support
+         both KDE3 and KDE4.]),
+,)
+
+AC_ARG_ENABLE(unix-qstart-libpng,
+    AS_HELP_STRING([--disable-unix-qstart-libpng],
+        [On UNIX systems, we have a faster splash app, that can use libpng to
+	 render its splash, if we can safely link to the system libpng then
+	 enabling this is a good idea (ie. for Linux Distro packaging).]),
+,enable_unix_libpng=yes)
+
 AC_ARG_ENABLE(binfilter,
-[  --disable-binfilter     Disable legacy binary file formats filters
-],,if ! test -d ./binfilter; then enable_binfilter=no; fi)
+    AS_HELP_STRING([--enable-binfilter],
+        [Enable legacy binary file formats filters build.]),
+,enable_binfilter=no
+)
+
+AC_ARG_ENABLE(ugly,
+    AS_HELP_STRING([--enable-ugly],
+        [Enables ugly pieces of functionality.]),
+,enable_ugly=no
+)
+
 AC_ARG_ENABLE(rpath,
-[  --disable-rpath         Disable the use of relative paths in shared libraries
-],,)
-AC_ARG_ENABLE(pam,
-[  --disable-pam           Disable pam support.
-],,)
-AC_ARG_ENABLE(pam-link,
-[  --enable-pam-link       link with libpam instead of dynamically open it
-],,)
-AC_ARG_ENABLE(crypt-link,
-[  --disable-crypt-link    disable linking with libcrypt instead of dynamically
-                          open it (needed for ancient GNU/Linux distributions
-                          without crypt()/libcrypt)
-],,enable_crypt_link=yes)
+    AS_HELP_STRING([--disable-rpath],
+        [Disable the use of relative paths in shared libraries.]),
+,)
+
 AC_ARG_ENABLE(xrender-link,
-[  --enable-xrender-link   link with libXrender instead of dynamically open it
-],,)
+    AS_HELP_STRING([--enable-xrender-link],
+        [Link with libXrender instead of dynamically open it.]),
+,)
+
 AC_ARG_ENABLE(randr,
-[  --disable-randr         disable RandR support in the vcl project
-],,enable_randr=yes)
+    AS_HELP_STRING([--disable-randr],
+        [Disable RandR support in the vcl project.]),
+,enable_randr=yes)
+
 AC_ARG_ENABLE(randr-link,
-[  --disable-randr-link    disable linking with libXrandr, instead dynamically 
-                           open it at runtime
-],,enable_randr_link=yes)
+    AS_HELP_STRING([--disable-randr-link],
+        [Disable linking with libXrandr, instead dynamically open it at runtime.]),
+,enable_randr_link=yes)
+
+AC_ARG_ENABLE(gstreamer,
+    AS_HELP_STRING([--disable-gstreamer],
+        [Disable building the gstreamer avmedia backend.]),
+,enable_gstreamer=yes)
+
+AC_ARG_ENABLE(neon,
+    AS_HELP_STRING([--disable-neon],
+        [Disable neon and the compilation of webdav binding.]),
+,)
+
+AC_ARG_ENABLE(build-unowinreg,
+    AS_HELP_STRING([--enable-build-unowinreg],
+        [Do not use the prebuilt unowinreg.dll. Build it instead. The MinGW C++
+         compiler is needed on Linux.])
+    [
+                          Usage:     --enable-build-unowinreg
+    ],
+,)
+
+AC_ARG_ENABLE(verbose,
+    AS_HELP_STRING([--enable-verbose],
+        [Increase build verbosity.])[
+  --disable-verbose       Decrease build verbosity.],
+,)
+
+AC_ARG_ENABLE(dependency-tracking,
+    AS_HELP_STRING([--enable-dependency-tracking],
+        [Do not reject slow dependency extractors.])[
+  --disable-dependency-tracking
+                          Disables generation of dependency information.
+                          Speed up one-time builds.],
+,)
+
+AC_ARG_ENABLE(icecream,
+    AS_HELP_STRING([--enable-icecream],
+        [Use the 'icecream' distributed compiling tool to speedup the compilation.
+         It defaults to /opt/icecream for the location of the icecream gcc/g++
+         wrappers, you can override that using --with-gcc-home=/the/path switch.]),
+,)
+
+AC_ARG_ENABLE(zenity,
+    AS_HELP_STRING([--disable-zenity],
+        [Do not display a build icon in the notification area (on unix) during build.]),
+,enable_zenity=yes)
+
+AC_ARG_ENABLE(cl-x64,
+    AS_HELP_STRING([--enable-cl-x64],
+        [Build a 64-bit LibreOffice using the Microsoft C/C++ x64 compiler.]),
+,)
+
+AC_ARG_ENABLE(extra-gallery,
+    AS_HELP_STRING([--enable-extra-gallery],
+	[Add extra gallery content.]),
+,)
+
+AC_ARG_ENABLE(extra-template,
+    AS_HELP_STRING([--enable-extra-template],
+	[Add extra template content.]),
+,)
+
+AC_ARG_ENABLE(extra-sample,
+    AS_HELP_STRING([--enable-extra-sample],
+	[Add extra sample content.]),
+,)
+
+AC_ARG_ENABLE(extra-font,
+    AS_HELP_STRING([--enable-extra-font],
+	[Add extra font content.]),
+,)
+
+AC_ARG_ENABLE(lomenubar,
+    AS_HELP_STRING([--enable-lomenubar],
+	[Enable global menu support.]),
+,)
+
+AC_ARG_ENABLE(release-build,
+    AS_HELP_STRING([--enable-release-build],
+        [Enable release build.
+         See http://wiki.documentfoundation.org/DevBuild]),
+,)
+
+dnl ===================================================================
+dnl Optional Packages (--with/without-)
+dnl ===================================================================
+AC_ARG_WITH(gnu-patch,
+    AS_HELP_STRING([--with-gnu-patch],
+        [Specify location of GNU patch on Solaris or FreeBSD.]),
+,)
+
+AC_ARG_WITH(gnu-cp,
+    AS_HELP_STRING([--with-gnu-cp],
+        [Specify location of GNU cp on Solaris or FreeBSD.]),
+,)
+
+AC_ARG_WITH(system-graphite,
+    AS_HELP_STRING([--with-system-graphite],
+        [Use graphite library already installed on system.]),
+,)
+
+AC_ARG_WITH(external-tar,
+    AS_HELP_STRING([--with-external-tar=<TARFILE PATH>],
+        [Specify path to tarfiles manually.]),
+    TARFILE_LOCATION=$withval ,
+)
+
+AC_ARG_WITH(linked-git,
+    AS_HELP_STRING([--with-linked-git=<OTHER_CLONE_DIR>],
+        [Specify another checkout's clonedir to re-use. This makes use of
+		 git-new-workdir, and saves a lot of diskspace when having multiple
+		 trees side-by-side.]),
+    GIT_LINK_SRC=$withval ,
+)
+
+AC_ARG_WITH(openldap,
+    AS_HELP_STRING([--with-openldap],
+        [Enables the use of the OpenLDAP LDAP SDK instead of the Netscape/Mozilla one.]),
+,)
+
+AC_ARG_WITH(vba-package-format,
+    AS_HELP_STRING([--with-vba-package-format],
+        [Specify package format for vba compatibility api. Specifying  "builtin"
+         means the api component and associated type library are  part of the
+         installation set. Specifying "extn" creates an uno extension that is
+         part of the installation set (located in the program directory) that
+         MUST be optionly registered using either the unopkg executeable or the
+         extension manager gui.])
+    [
+                          Note: "builtin" is the default, "extn" can cause
+                          problems.
+
+                          Usage:     --with-vba-package-format="builtin" or
+                                     --with-vba-package-format="extn"
+    ],
+,)
+
+AC_ARG_WITH(theme,
+    AS_HELP_STRING([--with-theme="theme1 theme2..."],
+	[Choose which themes to include. By default those themes with an '*' are included.
+         Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, classic, industrial.]),
+,)
+
+AC_ARG_WITH(theme,
+    AS_HELP_STRING([--with-theme="theme1 theme2..."],
+	[Choose which themes to include. By default those themes with an '*' are included.
+         Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, classic, industrial.]),
+,)
+
+AC_ARG_WITH(extension-integration,
+    AS_HELP_STRING([--with-extension-integration],
+        [It will integrate the builded extensions to the installer of the product.
+         Please use this switch to include any extension.]),
+,)
+
+AC_ARG_WITH(helppack-integration,
+[
+  --without-helppack-integration      It will not integrate the helppacks to the installer
+                          of the product.
+                          Please use this switch to use the online help or separate help packages.],
+,)
+
+AC_ARG_WITH(fonts,
+    AS_HELP_STRING([--without-fonts],
+        [LibreOffice includes some third-party fonts to provide a reliable basis for
+         help content, templates, samples, etc. When these fonts are already
+         known to be available on the system then you should use this option.]),
+,)
+
+AC_ARG_WITH(ppds,
+    AS_HELP_STRING([--without-ppds],
+        [Removes Postscript Printer definition files from LibreOffice
+         installation set, for people building for specific distributions where
+         PPDs are known to be already available (every recent distro with CUPS backend).]),
+,)
+
+AC_ARG_WITH(afms,
+    AS_HELP_STRING([--without-afms],
+        [Removes bitmap font files from LibreOffice installation set, for people
+         building for specific distributions where AFM files or TrueType Fonts
+         are known to be available.]),
+,)
+
+AC_ARG_WITH(agfa-monotype-fonts,
+     AS_HELP_STRING([--with-agfa-monotype-fonts],
+          [Do not include the proprietary Agfa Monotype fonts
+           (even if present) in the LibreOffice installation
+           set.])
+,)
+
+AC_ARG_WITH(epm,
+    AS_HELP_STRING([--with-epm],
+        [Decides which epm to use. Default is to use the one from the system if
+         one is built. When either this is not there or you say =internal epm
+         will be built.]),
+,)
+
+AC_ARG_WITH(package-format,
+    AS_HELP_STRING([--with-package-format],
+        [Specify package format(s) for LibreOffice installsets. Default is the
+         "normal" one of the OS/Distribution. Possible values: aix, bsd, deb,
+         inst, tardist, osx, pkg, rpm, setld, native, portable, archive, dmg,
+          installed, msi. Example: --with-package-format="deb dmg"]),
+,)
+
+AC_ARG_WITH(system-stdlibs,
+    AS_HELP_STRING([--with-system-stdlibs],
+        [Use libstdc++/libgcc_s already on system.]),
+,)
+
+AC_ARG_WITH(system-cairo,
+    AS_HELP_STRING([--with-system-cairo],
+        [Use Cairo libraries already on system.]),
+,)
+
+AC_ARG_WITH(mozilla-version,
+    AS_HELP_STRING([--with-mozilla-version],
+        [Choose which version of Mozilla to use while building Mozilla.
+         (default=1.7.5) Note that not all versions are supported.]),
+,)
+
+AC_ARG_WITH(mozilla-toolkit,
+    AS_HELP_STRING([--with-mozilla-toolkit],
+        [Choose which GUI toolkit to use while building Mozilla components. (default=gtk2)]),
+,)
+
 AC_ARG_WITH(myspell-dicts,
-[  --without-myspell-dicts Removes myspell dictionaries from openoffice.org
-                          installation set, for people building for specific
-                          distributions where the myspell dictionaries are
-                          installed from other sources
-],,)
+    AS_HELP_STRING([--without-myspell-dicts],
+        [Removes myspell dictionaries from LibreOffice installation set, for
+         people building for specific distributions where the myspell dictionaries
+         are installed from other sources.]),
+,)
+
 AC_ARG_WITH(system-dicts,
-[  --with-system-dicts    Use dictionaries from system paths- Specify
-                         them via --with-{dict,hyph,thes}-path=/path
-			 if you want to override the default ones
-],,)
+    AS_HELP_STRING([--with-system-dicts],
+        [Use dictionaries from system paths- Specify them via
+         --with-{dict,hyph,thes}-path=/path if you want to override the default ones.]),
+,)
+
 AC_ARG_WITH(external-dict-dir,
-[  --with-external-dict-dir Specify external dictionary dir
-],,)
+    AS_HELP_STRING([--with-external-dict-dir],
+        [Specify external dictionary dir.]),
+,)
+
 AC_ARG_WITH(external-hyph-dir,
-[  --with-external-hyph-dir Specify external hyphenation pattern dir
-],,)
+    AS_HELP_STRING([--with-external-hyph-dir],
+        [Specify external hyphenation pattern dir.]),
+,)
+
 AC_ARG_WITH(external-thes-dir,
-[  --with-external-thes-dir Specify external thesaurus dir
-],,)
+    AS_HELP_STRING([--with-external-thes-dir],
+        [Specify external thesaurus dir.]),
+,)
+
 AC_ARG_WITH(system-libs,
-[  --with-system-libs      Use libs already on system -- enables all
-                          --with-system-* flags except mozilla and
-                          odbc/sane/xrender-header(s)
-],,)
+    AS_HELP_STRING([--with-system-libs],
+        [Use libs already on system -- enables all --with-system-* flags except
+         mozilla and odbc/sane/xrender-header(s).]),
+,)
+
 AC_ARG_WITH(system-headers,
-[  --with-system-headers   Use headers already on system -- enables all
-                          --with-system-* flags for external packages
-                          whose headers are the only entities used i.e.
-                          boost/vigra/odbc/sane/xrender-header(s)
-],,)
+    AS_HELP_STRING([--with-system-headers],
+        [Use headers already on system -- enables all --with-system-* flags for
+         external packages whose headers are the only entities used i.e.
+         boost/vigra/odbc/sane/xrender-header(s).]),
+,)
+
 AC_ARG_WITH(system-jars,
-[  --without-system-jars   When building with --with-system-libs, also the
-                          needed jars are expected on the system. Use this to
-                          disable that. 
-                          (except for the db case where --with-system-db
-                          *has to* imply using the db.jar from there, too)
-],,)
+    AS_HELP_STRING([--without-system-jars],
+        [When building with --with-system-libs, also the needed jars are expected
+         on the system. Use this to disable that (except for the db case where
+         --with-system-db *has to* imply using the db.jar from there, too).]),
+,)
+
 AC_ARG_WITH(system-zlib,
-[  --with-system-zlib      Use zlib already on system
-],,)
+    AS_HELP_STRING([--with-system-zlib],
+        [Use zlib already on system.]),
+,)
+
 AC_ARG_WITH(system-openssl,
-[  --with-system-openssl   Use OpenSSL already on system
-],,)
+    AS_HELP_STRING([--with-system-openssl],
+        [Use OpenSSL already on system.]),
+,)
+
 AC_ARG_WITH(system-jpeg,
-[  --with-system-jpeg      Use jpeg already on system
-],,)
+    AS_HELP_STRING([--with-system-jpeg],
+        [Use jpeg already on system.]),
+,)
+
 AC_ARG_WITH(system-expat,
-[  --with-system-expat     Use expat already on system
-],,)
+    AS_HELP_STRING([--with-system-expat],
+        [Use expat already on system.]),
+,)
+
+AC_ARG_WITH(system-libvisio,
+    AS_HELP_STRING([--with-system-libvisio],
+        [Use libvisio already on system.]),
+,)
+
 AC_ARG_WITH(system-libwpd,
-[  --with-system-libwpd    Use libwpd already on system
-],,)
+    AS_HELP_STRING([--with-system-libwpd],
+        [Use libwpd already on system.]),
+,)
+
+AC_ARG_WITH(system-libwps,
+    AS_HELP_STRING([--with-system-libwps],
+        [Use libwps already on system.]),
+,)
+
+AC_ARG_WITH(system-libwpg,
+    AS_HELP_STRING([--with-system-libwpg],
+        [Use libwpg already on system.]),
+,)
+
 AC_ARG_WITH(system-libxml,
-[  --with-system-libxml    Use libxml already on system
-],,)
-AC_ARG_WITH(system-python,
-[  --with-system-python    Use python already on system
-],,)
+    AS_HELP_STRING([--with-system-libxml],
+        [Use libxml already on system.]),
+,)
+
+AC_ARG_WITH(system-translate-toolkit,
+    AS_HELP_STRING([--with-system-translate-toolkit],
+        [Use translate-toolkit already on system.]))
+
 AC_ARG_WITH(system-icu,
-[  --with-system-icu       Use icu already on system
-],,)
+    AS_HELP_STRING([--with-system-icu],
+        [Use icu already on system.]))
+
 AC_ARG_WITH(system-poppler,
-[  --with-system-poppler   Use poppler already on system
-],,)
+    AS_HELP_STRING([--with-system-poppler],
+        [Use system poppler. (only needed for pdfimport extension)]))
+
 AC_ARG_WITH(system-db,
-[  --with-system-db        Use berkeley db already on system
-],,)
+    AS_HELP_STRING([--with-system-db],
+        [Use Berkeley db already on system.]))
+
 AC_ARG_WITH(system-lucene,
-[  --with-system-lucene    Use lucene already on system
-],,)
+    AS_HELP_STRING([--with-system-lucene],
+        [Use Lucene already on system.]))
+
+AC_ARG_WITH(system-apache-commons,
+    AS_HELP_STRING([--with-system-apache-commons],
+        [Use Apache commons libraries already on system.]))
+
 AC_ARG_WITH(lucene-core-jar,
-[  --with-lucene-core-jar=JARFILE   Specify path to jarfile manually ],
-[ LUCENE_CORE_JAR="$withval"
-])
+    AS_HELP_STRING([--with-lucene-core-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LUCENE_CORE_JAR=$withval)
+
 AC_ARG_WITH(lucene-analyzers-jar,
-[  --with-lucene-analyzers-jar=JARFILE   Specify path to jarfile manually ],
-[ LUCENE_ANALYZERS_JAR="$withval"
-])
-AC_ARG_ENABLE(mysql-connector,
-[  --enable-mysql-connector     enables the build of the MySQL Connector/OOo extension.
-                                This requires access to the MySQL Connector/C (aka libmysql) to be given, too, with
-                                either the --with-system-mysql or --with-libmysql-path option.
-],,)
+    AS_HELP_STRING([--with-lucene-analyzers-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LUCENE_ANALYZERS_JAR=$withval ,)
+
 AC_ARG_WITH(system-mysql,
-[  --with-system-mysql          Use MySQL libraries already on system, for building the MySQL Connector/OOo extension.
-                                Requires MYSQLCONFIG to point to the mysql_config executable.
-],,)
+    AS_HELP_STRING([--with-system-mysql],
+        [Use MySQL libraries already on system, for building the MySQL Connector/LibreOffice
+         extension. Requires MYSQLCONFIG to point to the mysql_config executable.]))
+
 AC_ARG_WITH(libmysql-path,
-[  --with-libmysql-path         Use Connector/C (libmysql) installation for building the MySQL Connector/OOo extension.
+    AS_HELP_STRING([--with-libmysql-path],
+        [Use Connector/C (libmysql) installation for building the MySQL
+         Connector/LibreOffice extension.])
+    [
+                          Usage:     --with-libmysql-path=<absolute path to
+                                                  your Connector/C installation>
+    ],
+,)
 
-                                Usage: --with-libmysql-path=<absolute path to your Connector/C installation>
-],,)
 AC_ARG_WITH(system-mysql-cppconn,
-[  --with-system-mysql-cppconn  Use MySQL C++ Connector libraries already on system
-],,)
+    AS_HELP_STRING([--with-system-mysql-cppconn],
+        [Use MySQL C++ Connector libraries already on system.]))
+
 AC_ARG_WITH(system-hsqldb,
-[  --with-system-hsqldb    Use hsqldb already on system
-],,)
+    AS_HELP_STRING([--with-system-hsqldb],
+        [Use hsqldb already on system.]))
+
 AC_ARG_WITH(hsqldb-jar,
-[  --with-hsqldb-jar=JARFILE   Specify path to jarfile manually ],
-[ HSQLDB_JAR="$withval"
-])
+    AS_HELP_STRING([--with-hsqldb-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    HSQLDB_JAR=$withval)
+
 AC_ARG_WITH(system-beanshell,
-[  --with-system-beanshell Use beanshell already on system
-],,)
+    AS_HELP_STRING([--with-system-beanshell],
+        [Use beanshell already on system.]))
+
 AC_ARG_WITH(beanshell-jar,
-[  --with-beanshell-jar=JARFILE   Specify path to jarfile manually ],
-[ BSH_JAR="$withval"
-])
-AC_ARG_ENABLE(presenter-extra-ui,
-[  --enable-presenter-extra-ui   enables extra functionality during slideshow,
-                                 e.g. selecting pen color, erasing drawings etc.
-],,enable_presenter_extra_ui=no)
-AC_ARG_ENABLE(minimizer,
-[  --enable-minimizer          enables the build of the Presentation Minimizer extension
-],,)
-AC_ARG_ENABLE(presenter-console,
-[  --enable-presenter-console          enables the build of the Presenter Console extension
-],,)
-AC_ARG_ENABLE(pdfimport,
-[  --enable-pdfimport          enables the build of the PDF Import extension and xpdf
-],,)
-AC_ARG_ENABLE(wiki-publisher,
-[  --enable-wiki-publisher      enables the build of the Wiki Publisher extension
-],,)
+    AS_HELP_STRING([--with-beanshell-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    BSH_JAR=$withval)
+
 AC_ARG_WITH(commons-codec-jar,
-[  --with-commons-codec-jar=JARFILE   Specify path to jarfile manually ],
-[ COMMONS_CODEC_JAR="$withval"
-])
+    AS_HELP_STRING([--with-commons-codec-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    COMMONS_CODEC_JAR=$withval)
+
 AC_ARG_WITH(commons-lang-jar,
-[  --with-commons-lang-jar=JARFILE   Specify path to jarfile manually ],
-[ COMMONS_LANG_JAR="$withval"
-])
+    AS_HELP_STRING([--with-commons-lang-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    COMMONS_LANG_JAR=$withval)
+
 AC_ARG_WITH(commons-httpclient-jar,
-[  --with-commons-httpclient-jar=JARFILE   Specify path to jarfile manually ],
-[ COMMONS_HTTPCLIENT_JAR="$withval"
-])
+    AS_HELP_STRING([--with-commons-httpclient-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    COMMONS_HTTPCLIENT_JAR=$withval)
+
 AC_ARG_WITH(commons-logging-jar,
-[  --with-commons-logging-jar=JARFILE   Specify path to jarfile manually ],
-[ COMMONS_LOGGING_JAR="$withval"
-])
+    AS_HELP_STRING([--with-commons-logging-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    COMMONS_LOGGING_JAR=$withval)
+
 AC_ARG_WITH(servlet-api-jar,
-[  --servlet-api-jar=JARFILE   Specify path to jarfile manually ],
-[ SERVLETAPI_JAR="$withval"
-])
-AC_ARG_ENABLE(report-builder,
-[  --enable-report-builder  enables the build of the Report Builder extension
-],,)
+    AS_HELP_STRING([--with-servlet-api-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    SERVLETAPI_JAR=$withval)
+
 AC_ARG_WITH(system-jfreereport,
-[  --with-system-jfreereport      Use JFreeReport already on system
-],,)
+    AS_HELP_STRING([--with-system-jfreereport],
+        [Use JFreeReport already on system.]))
+
 AC_ARG_WITH(sac-jar,
-[  --with-sac-jar=JARFILE   Specify path to jarfile manually ],
-[ SAC_JAR="$withval"
-])
+    AS_HELP_STRING([--with-sac-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    SAC_JAR=$withval)
+
 AC_ARG_WITH(libxml-jar,
-[  --with-libxml-jar=JARFILE   Specify path to jarfile manually ],
-[ LIBXML_JAR="$withval"
-])
+    AS_HELP_STRING([--with-libxml-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LIBXML_JAR=$withval)
+
 AC_ARG_WITH(flute-jar,
-[  --with-flute-jar=JARFILE   Specify path to jarfile manually ],
-[ FLUTE_JAR="$withval"
-])
+    AS_HELP_STRING([--with-flute-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    FLUTE_JAR=$withval)
+
 AC_ARG_WITH(jfreereport-jar,
-[  --with-jfreereport-jar=JARFILE   Specify path to jarfile manually ],
-[ JFREEREPORT_JAR="$withval"
-])
+    AS_HELP_STRING([--with-jfreereport-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    JFREEREPORT_JAR=$withval)
+
 AC_ARG_WITH(liblayout-jar,
-[  --with-liblayout-jar=JARFILE   Specify path to jarfile manually ],
-[ LIBLAYOUT_JAR="$withval"
-])
+    AS_HELP_STRING([--with-liblayout-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LIBLAYOUT_JAR=$withval)
+
 AC_ARG_WITH(libloader-jar,
-[  --with-libloader-jar=JARFILE   Specify path to jarfile manually ],
-[ LIBLOADER_JAR="$withval"
-])
+    AS_HELP_STRING([--with-libloader-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LIBLOADER_JAR=$withval)
+
 AC_ARG_WITH(libloader-jar,
-[  --with-libloader-jar=JARFILE   Specify path to jarfile manually ],
-[ LIBLOADER_JAR="$withval"
-])
+    AS_HELP_STRING([--with-libloader-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LIBLOADER_JAR=$withval)
+
 AC_ARG_WITH(libformula-jar,
-[  --with-libformula-jar=JARFILE   Specify path to jarfile manually ],
-[ LIBFORMULA_JAR="$withval"
-])
+    AS_HELP_STRING([--with-libformula-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LIBFORMULA_JAR=$withval)
+
 AC_ARG_WITH(librepository-jar,
-[  --with-librepository-jar=JARFILE   Specify path to jarfile manually ],
-[ LIBREPOSITORY_JAR="$withval"
-])
+    AS_HELP_STRING([--with-librepository-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LIBREPOSITORY_JAR=$withval)
+
 AC_ARG_WITH(libfonts-jar,
-[  --with-libfonts-jar=JARFILE   Specify path to jarfile manually ],
-[ LIBFONTS_JAR="$withval"
-])
+    AS_HELP_STRING([--with-libfonts-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LIBFONTS_JAR=$withval)
+
 AC_ARG_WITH(libserializer-jar,
-[  --with-libserializer-jar=JARFILE   Specify path to jarfile manually ],
-[ LIBSERIALIZER_JAR="$withval"
-])
+    AS_HELP_STRING([--with-libserializer-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LIBSERIALIZER_JAR=$withval)
+
 AC_ARG_WITH(libbase-jar,
-[  --with-libbase-jar=JARFILE   Specify path to jarfile manually ],
-[ LIBBASE_JAR="$withval"
-])
+    AS_HELP_STRING([--with-libbase-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LIBBASE_JAR=$withval)
+
 AC_ARG_WITH(system-saxon,
-[  --with-system-saxon     Use saxon already on system
-],,)
+    AS_HELP_STRING([--with-system-saxon],
+        [Use saxon already on system.]))
+
 AC_ARG_WITH(saxon-jar,
-[  --with-saxon-jar=JARFILE   Specify path to jarfile manually ],
-[ SAXON_JAR="$withval"
-])
+    AS_HELP_STRING([--with-saxon-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    SAXON_JAR=$withval)
+
 AC_ARG_WITH(system-libxslt,
-[  --with-system-libxslt   Use libxslt already on system
-],,)
+    AS_HELP_STRING([--with-system-libxslt],
+        [Use libxslt already on system.]))
+
 AC_ARG_WITH(system-odbc,
-[  --with-system-odbc-headers     Use the odbc headers already on system
-],,)
+    AS_HELP_STRING([--with-system-odbc],
+        [Use the odbc headers already on system.]))
+
 AC_ARG_WITH(system-sane,
-[  --with-system-sane-header      Use sane.h already on system
-],,)
-AC_ARG_WITH(system-xrender,
-[  --with-system-xrender-headers  Use XRender headers already on system
-],,)
+    AS_HELP_STRING([--with-system-sane-header],
+        [Use sane.h already on system.]))
+
+AC_ARG_WITH(system-xrender-headers,
+    AS_HELP_STRING([--with-system-xrender-headers],
+        [Use XRender headers already on system.]))
+
+AC_ARG_WITH(system-mesa-headers,
+    AS_HELP_STRING([--with-system-mesa-headers],
+        [Use Mesa headers already on system.]))
+
 AC_ARG_WITH(system-curl,
-[  --with-system-curl      Use curl already on system
-],,)
+    AS_HELP_STRING([--with-system-curl],
+        [Use curl already on system.]))
+
 AC_ARG_WITH(system-boost,
-[  --with-system-boost     Use boost already on system
-],,)
+    AS_HELP_STRING([--with-system-boost],
+        [Use boost already on system.]))
+
 AC_ARG_WITH(system-mdds,
-[  --with-system-mdds      Use mdds already on system
-],,)
+    AS_HELP_STRING([--with-system-mdds],
+        [Use mdds already on system.]))
+
 AC_ARG_WITH(system-vigra,
-[  --with-system-vigra     Use vigra already on system
-],,)
-AC_ARG_ENABLE(neon,
-[  --disable-neon          Disable neon and the compilation of webdav binding
-],,)
-AC_ARG_ENABLE(Xaw,
-[  --disable-Xaw           Disables the use of Xaw for the Netscape/Mozilla
-                           plugin
-],,)
+    AS_HELP_STRING([--with-system-vigra],
+        [Use vigra already on system.]))
+
 AC_ARG_WITH(system-neon,
-[  --with-system-neon      Use neon already on system
-],,)
-AC_ARG_WITH(system-agg,
-[  --with-system-agg       Use AGG already on system
-],,)
+    AS_HELP_STRING([--with-system-neon],
+        [Use neon already on system.]))
+
 AC_ARG_WITH(system-hunspell,
-[  --with-system-hunspell   Use libhunspell already on system
-],,)
+    AS_HELP_STRING([--with-system-hunspell],
+        [Use libhunspell already on system.]))
+
 AC_ARG_WITH(system-mythes,
-[  --with-system-mythes    Use mythes already on system
-],,)
+    AS_HELP_STRING([--with-system-mythes],
+        [Use mythes already on system.]))
+
 AC_ARG_WITH(system-altlinuxhyph,
-[  --with-system-altlinuxhyph    Use ALTLinuxhyph already on system
-],,)
+    AS_HELP_STRING([--with-system-altlinuxhyph],
+        [Use ALTLinuxhyph already on system.]))
+
 AC_ARG_WITH(system-lpsolve,
-[  --with-system-lpsolve         Use lpsolve already on system
-],,)
+    AS_HELP_STRING([--with-system-lpsolve],
+        [Use lpsolve already on system.]))
+
 AC_ARG_WITH(system-libtextcat,
-[  --with-system-libtextcat      Use libtextcat already on system
-],,)
+    AS_HELP_STRING([--with-system-libtextcat],
+        [Use libtextcat already on system.]))
+
 AC_ARG_WITH(external-libtextcat-data,
-[  --with-system-libtextcat-data Use libtextcat data already on system
-],,)
+    AS_HELP_STRING([--with-external-libtextcat-data],
+        [Use libtextcat data already on system.]))
+
 AC_ARG_WITH(system-cppunit,
-[  --with-system-cppunit         Use cppunit already on system
-],,)
+    AS_HELP_STRING([--with-system-cppunit],
+        [Use cppunit already on system.]))
+
 AC_ARG_WITH(system-redland,
-[  --with-system-redland   Use redland library already on system
-],,)
+    AS_HELP_STRING([--with-system-redland],
+        [Use redland library already on system.]))
+
 AC_ARG_WITH(system-mozilla,
-[  --with-system-mozilla   Use mozilla already on system. Note that some
-                          components cannot be built against a contemporary
-                          mozilla. The flavour used can be specified by
-                          --with-system-mozilla=<flavour>. Supported are:
-                          libxul (default), xulrunner, firefox, seamonkey,
-                          mozilla
-], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
-AC_ARG_WITH(stlport,
-[  --with-stlport         The location that STLport is installed in. The STL
-                          header files are assumed to be in
-                          stlport-home/stlport and the STLPort library in
-                          stlport-home/lib.
+    AS_HELP_STRING([--with-system-mozilla],
+        [Use Mozilla already on system. Note that some components cannot be built
+         against a contemporary Mozilla. The flavour used can be specified by
+         --with-system-mozilla=<flavour>. Supported are: libxul (default),
+         xulrunner, firefox, seamonkey, mozilla.]),
+    WITH_SYSTEM_MOZILLA=$withval ,
+WITH_SYSTEM_MOZILLA=no)
+
+AC_ARG_WITH(system-gettext,
+    AS_HELP_STRING([--with-system-gettext],
+        [Use gettext runtime library already on system.]))
+
+AC_ARG_WITH(system-libpng,
+    AS_HELP_STRING([--with-system-libpng],
+        [Use libpng already on system.]))
+
+AC_ARG_WITH(linker-hash-style,
+    AS_HELP_STRING([--with-linker-hash-style],
+        [Use linker with --hash-style=<style> when linking shared objects.
+         Possible values: "sysv", "gnu", "both". The default value is "gnu"
+         if supported on the build system, and "sysv" otherwise.]))
 
-                          Usage: --with-stlport=<absolute path to stlport home>
+AC_ARG_WITH(stlport,
+    AS_HELP_STRING([--with-stlport],
+        [Build the STLPort library for compatibility with old extensions for
+         architectures where STLPort used to be used.]),
+    with_stlport=$withval ,
+with_stlport=auto)
 
-                          Warning!!, disabling using --without-stlport or 
-                          enabling using --with-stlport on a platform that
-                          defaults to the opposite will break ABI compatability
-], WITH_STLPORT=$withval , WITH_STLPORT=auto)
 AC_ARG_WITH(jdk-home,
-[  --with-jdk-home         if you have installed JDK 1.3 or later on your system
-                          please supply the path here.
-                          Note that this is not the location of the Java binary
-                          but the location of the entire distribution.
- 
-                          Usage: --with-jdk-home=<absolute path to JDK home>
-],,)
+    AS_HELP_STRING([--with-jdk-home],
+        [If you have installed JDK 1.3 or later on your system please supply the
+         path here. Note that this is not the location of the java command but the
+         location of the entire distribution.])
+    [
+                          Usage:     --with-jdk-home=<absolute path to JDK home>
+    ],
+,)
+
 AC_ARG_WITH(gxx_include_path,
-[  --with-gxx-include-path if you want to override the autodetected g++ include
-                          path.
- 
-                          Usage: --with-gxx-include-path=<absolute path to g++ include dir>
-],,)
+    AS_HELP_STRING([--with-gxx-include-path],
+        [If you want to override the autodetected g++ include path.])
+    [
+                          Usage:     --with-gxx-include-path=<absolute path to
+                                                                g++ include dir>
+    ],
+,)
+
 AC_ARG_WITH(java,
-[  --with-java             Build with[[out]] Java support.  If you use
-                          --without-java/--with-java=no then the build will have
-                          no support for Java components, applets, accessibility
-                          or XML filters. 
-], if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi, WITH_JAVA=java)
-AC_ARG_ENABLE(gcjaot,
-[  --enable-gcjaot         Build with[[out]] using Ahead of Time java compilation
-                          support to speed up buildsi by compiling the jars also
-                          to native code..
-                          --enable-gcjaot is only known to work with bytecode
-                          created with gcj or ecj
-],,)
+    AS_HELP_STRING([--with-java],
+        [Specify the name of the Java interpreter command. Typically "java"
+         which is the default.
+
+         To build without support for Java components, applets, accessibility
+         or the XML filters written in Java, use --without-java or --with-java=no.])
+    [
+                          Usage:     --with-java==<java command>
+                                     --without-java
+    ],
+    [ test -z "$with_java" -o "$with_java" = "yes" && with_java=java ],
+    [ with_java=java ]
+)
+
+AC_ARG_WITH(java_target_version,
+    AS_HELP_STRING([--with-java-target-version],
+        [Generate class files that will work on JVMs with the specified version.
+         For example, use --with-java-target-version=1.4 to make sure that the
+         application will work with JVM 1.4 even when compiled with JDK 1.5.])
+    [
+                          This option is ignored when you compile with gcj/gij.
+
+                          Usage:     --with-java-target-version=<jvm version>
+    ],
+,)
+
+AC_ARG_WITH(jvm-path,
+    AS_HELP_STRING([--with-jvm-path],
+        [Use a specific JVM search path at runtime.])
+    [
+                          Usage:     --with-jvm-path=<absolute path to parent of jvm home>
+
+                          e. g.: --with-jvm-path=/usr/lib/
+                                 to find JRE/JDK in /usr/lib/jvm/
+    ],
+,)
+
 AC_ARG_WITH(ant-home,
-[  --with-ant-home         If you have installed Jakarta Ant on your system,
-                          please supply the path here.
-                          Note that this is not the location of the Ant binary
-                          but the location of the entire distribution.
- 
-                          Usage: --with-ant-home=<absolute path to Ant home>
-],,)
+    AS_HELP_STRING([--with-ant-home],
+        [If you have installed Jakarta Ant on your system, please supply the path here.
+         Note that this is not the location of the Ant binary but the location
+         of the entire distribution.])
+    [
+                          Usage:     --with-ant-home=<absolute path to Ant home>
+    ],
+,)
+
 AC_ARG_WITH(junit,
-[  --with-junit            Specifies the JUnit 4 jar file to use for JUnit-based
-                          tests.  --without-junit disables those tests.  Not
-                          relevant in the --without-java case.
+    AS_HELP_STRING([--with-junit],
+        [Specifies the JUnit 4 jar file to use for JUnit-based tests.
+         --without-junit disables those tests. Not relevant in the --without-java case.])
+    [
+                          Usage:     --with-junit=<absolute path to JUnit 4 jar>
+    ],
+,with_junit=yes)
 
-                          Usage: --with-junit=<absolute path to JUnit 4 jar>
-],,with_junit=yes)
 AC_ARG_WITH(perl-home,
-[  --with-perl-home        If you have installed the Perl 5 Distribution, on your
-                          system, please supply the path here.
-                          Note that this is not the location of the Perl binary
-                          but the location of the entire distribution.
- 
-                          Usage: --with-perl-home=<absolute path to Perl 5 home>
-],,)
+    AS_HELP_STRING([--with-perl-home],
+        [If you have installed Perl 5 Distribution, on your system, please
+         supply the path here. Note that this is not the location of the Perl
+         binary but the location of the entire distribution.])
+    [
+                          Usage:     --with-perl-home=<abs. path to Perl 5 home>
+    ],
+,)
+
 AC_ARG_WITH(cl-home,
-[  --with-cl-home          For Windows NT users, please supply the path
-                          for the Microsoft C/C++ compiler. 
-                          Note that this is not the location of the compiler
-                          binary but the location of the entire distribution.
- 
-                          Usage: --with-cl-home=<absolute path to Microsoft C/C++ compiler home>
-],,)
+    AS_HELP_STRING([--with-cl-home],
+        [For Windows NT users, please supply the path for the Microsoft C/C++
+         compiler. Note that this is not the location of the compiler binary but
+         the location of the entire distribution.])
+    [
+                          Usage:     --with-cl-home=<absolute path to Microsoft
+                                                            C/C++ compiler home>
+    ],
+,)
+
 AC_ARG_WITH(mspdb-path,
-[  --with-mspdb-path       For Microsoft C/C++ compiler users, please supply the
-                          path pointing to the mspdb71.dll (.NET 2003).
- 
-                          Usage: --with-mspdb-path=<absolute path to mspdb71.dll>
-],,)
+    AS_HELP_STRING([--with-mspdb-path],
+        [For Microsoft C/C++ compiler users, please supply the path pointing to
+         the mspdb80.dll (if using Visual Studio 2008) or mspdb100.dl (if using
+         Visual Studio 2010).])
+    [
+                          Usage:     --with-mspdb-path=<path to
+                                                       mspdb80.dll/mspdb100.dll>
+    ],
+,)
+
 AC_ARG_WITH(midl-path,
-[  --with-midl-path        For Microsoft C/C++ .NET compiler users, please supply
-                          the path pointing to the midl.exe.
- 
-                          Usage: --with-midl-path=<absolute path to midl.exe>
-],,)
+    AS_HELP_STRING([--with-midl-path],
+        [For Microsoft compiler users, please supply the path pointing to the midl.exe.])
+    [
+                          Usage:     --with-midl-path=<abs. path to midl.exe>
+    ],
+,)
+
 AC_ARG_WITH(csc-path,
-[  --with-csc-path         For Microsoft C/C++ .NET compiler users, please supply
-                          the path pointing to the csc.exe.
- 
-                          Usage: --with-csc-path=<absolute path to csc.exe>
-],,)
+    AS_HELP_STRING([--with-csc-path],
+        [For Windows builds, please supply the path pointing to the csc.exe.
+         Usually found automatically when building on Windows.])
+    [
+                          Usage:     --with-csc-path=<abs. path to csc.exe>
+    ],
+,)
+
 AC_ARG_WITH(nsis-path,
-[  --with-nsis-path        For Windows users, please supply the path to the
-                          "Nullsoft Scriptable Install System" (NSIS). If NSIS
-                          is found in the path or this option is supplied a self
-                          contained executable installer for OpenOffice.org will
-                          be created.
+    AS_HELP_STRING([--with-nsis-path],
+        [For Windows builds, please supply the directory where makensis
+         is located. If makensis is found in PATH or this option is
+         properly supplied a self-contained executable installer for
+         LibreOffice will be created.])
+    [
+                          Usage:     --with-nsis-path=<path to directory containing makensis>
+    ],
+,)
+
+AC_ARG_WITH(dotnet-framework-home,
+    AS_HELP_STRING([--with-dotnet-framework-home],
+        [For Microsoft compiler users, please supply the path pointing to
+         lib/mscoree.lib, usually something like:
+         "/cygdrive/c/Program Files/Windows SDKs/Windows/v7.0"])
+    [
+                          Note that in most cases it will be automatically
+                          found, though.
+
+                          Usage:     --with-dotnet-framework-home=<absolute path to .NET
+                                                          Framework>
+    ],
+,)
+
+AC_ARG_WITH(windows-sdk-home,
+    AS_HELP_STRING([--with-windows-sdk-home],
+        [For Windows builds, please supply the path to the Windows SDK.
+         Usually found automatically when building on Windows.])
+    [
+                          Usage:     --with-windows-sdk-home=<absolute path to Windows SDK>
+    ],
+,)
 
-                          Usage: --with-nsis-path=<absolute path to nsis.exe>
-],,)
-AC_ARG_WITH(frame-home,
-[  --with-frame-home       For Microsoft C/C++ .NET compiler users, please supply
-                          the path pointing to lib/mscoree.lib, usually
-                          something like:
-                          "/cygdrive/c/Program Files/Microsoft Visual Studio .NET/FrameworkSDK"
-
-                          MS Visual Toolkit compiler users, please supply the
-                          path pointing to lib/msvcrt.lib, usually something
-                          like:
-                          "/cygdrive/c/Program Files/Microsoft Visual Studio .NET 2003/Vc7"
-
-                          Usage: --with-frame-home=<absolute path to Framework SDK [[home]]>
-],,)
-AC_ARG_WITH(psdk-home,
-[  --with-psdk-home        For Windows users, please supply the path to the
-                          Microsoft Platform SDK.
- 
-                          Usage: --with-psdk-home=<absolute path to Microsoft Platform SDK>
-],,)
 AC_ARG_WITH(directx-home,
-[  --with-directx-home     For Windows users, please supply the path to the
-                          Microsoft DirectX SDK.
- 
-                          Usage: --with-directx-home=<absolute path to Microsoft DirectX SDK>
-],,)
+    AS_HELP_STRING([--with-directx-home],
+        [For Windows users, please supply the path to the Microsoft DirectX SDK.])
+    [
+                          Usage:     --with-directx-home=<absolute path to
+                                                          Microsoft DirectX SDK>
+    ],
+,)
+
 AC_ARG_WITH(mozilla-build,
-[  --with-mozilla-build    For Windows users, please supply the path to the
-                          mozilla build tools.
- 
-                          Usage: --with-mozilla-build=<absolute path to mozilla build tools>
-
-						  At the moment of this writing, an installer for the mozilla build tools
-						  can be obtained from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32.
-],[MOZILLABUILD=$withval],)
-AC_ARG_WITH(local-solenv,
-[  --with-local-solenv     If you have solenv in a location other than ./solenv,
-                          please supply the path here.
- 
-                          Usage: --with-local-solenv=<absolute path to solenv>
-],,)
+    AS_HELP_STRING([--with-mozilla-build],
+        [For Windows users, please supply the path to the Mozilla build tools.])
+    [
+                          Usage:     --with-mozilla-build=<absolute path to
+                                                          Mozilla build tools>
+
+                          At the moment of this writing, an installer for the
+                          mozilla build tools can be obtained from http://ftp.
+                          mozilla.org/pub/mozilla.org/mozilla/libraries/win32.
+    ],
+    MOZILLABUILD=$withval ,
+)
+
 AC_ARG_WITH(local-solver,
-[  --with-local-solver     if you have solver in a location other than ./solver,
-                          please supply the path here.
- 
-                          Usage: --with-local-solver=<absolute path to solver>
-],,)
-AC_ARG_ENABLE(check-only,
-[  --enable-check-only     Use this option option if you just want to check your
-                          environment.  This option stops the generation of an 
-                          ????env.set
- 
-                          Usage: --enable-check-only=yes
-],,)
-AC_ARG_ENABLE(ccache-skip,
-[[  --enable-ccache-skip    [default=auto] allow the use of --ccache-skip to 
-                          escape compiler flags that would otherwise prevent 
-                          caching of the result (currently used on Mac only)
-                          NOTE: requires patched version because of a bug in
-                          ccache (see issue 104567 for details and patch) 
-                          explicitly enable if your version of ccache doesn't 
-                          identify as version 2.4_OOo
-]],,enable_ccache_skip=auto)
-AC_ARG_WITH(lang,
-[  --with-lang             Use this option to build OpenOffice.org with
-                          additional language support. English (US) is always
-                          included by default. Separate multiple languages with
-                          space. For all languages, use --with-lang=ALL.
+    AS_HELP_STRING([--with-local-solver],
+        [If you have solver in a location other than ./solver, please supply the path here.])
+    [
+                          Usage:     --with-local-solver=<abs. path to solver>
+    ],
+,)
 
-                          Usage: --with-lang="es sw tu cs sk"
+AC_ARG_WITH(lang,
+    AS_HELP_STRING([--with-lang],
+        [Use this option to build LibreOffice with additional language support.
+         English (US) is always included by default.
+         Separate multiple languages with space.
+         For all languages, use --with-lang=ALL.])
+    [
+                          Usage:     --with-lang="es sw tu cs sk"
+    ],
+,)
+
+AC_ARG_WITH(intro-bitmap,
+[  --with-intro-bitmap    Prefer the specified intro bitmap over the
+                          the default one.
+
+                          Usage:     --with-intro-bitmap=/path/my_ooo_intro.png
 ],,)
-AC_ARG_WITH(poor-help-localizations,
-[  --with-poor-help-localizations
-                           Use this option to specify which languages have
-                          unusable help localizations. Separate multiple
-                          languages with space.
 
-                          Usage: --with-poor-help-localizations="af ar be-BY ca"
-],,)
-AC_ARG_WITH(dict,
-[  --with-dict             Use this option to build OpenOffice.org with
-                          dictionary support. ALL dictionaries are always
-                          included by default unless overridden with
-                          this option. Separate multiple dictionaries with
-                          commas. For all dictionaries, use --with-dict=ALL.
-
-                          Usage: --with-dict=ENGB,ENUS,ITIT
-],,)
-AC_ARG_WITH(intro-bitmaps,
-[  --with-intro-bitmaps    Prefer the specified intro bitmaps over the
-                          the default one.  Can be more than one (separated by
-                          commas), the order means priority of fallback if the
-                          first does not exist (in the installed tree).
+AC_ARG_WITH(about-bitmap,
+[  --with-about-bitmap    Similarly to --with-intro-bitmap, this allows
+                          specification of bitmap for the About box.
 
-                          Usage: --with-intro-bitmaps=/path/my_ooo_intro.bmp
+                          Usage:     --with-about-bitmap=/path/my_ooo_about.png
 ],,)
-AC_ARG_WITH(about-bitmaps,
-[  --with-about-bitmaps    Similarly to --with-intro-bitmaps, this allows
-                          specification of bitmaps for the About box.
 
-                          Usage: --with-about-bitmaps=/path/my_ooo_about.bmp
-],,)
 AC_ARG_WITH(vendor,
-[  --with-vendor           Set vendor of the build.
+    AS_HELP_STRING([--with-vendor],
+        [Set vendor of the build.])
+    [
+                          Usage:     --with-vendor="John the Builder"
+    ],
+,)
 
-                          Usage: --with-vendor="John the Builder"
-],,)
 AC_ARG_WITH(unix-wrapper,
-[  --with-unix-wrapper    Redefines the name of the UNIX wrapper that will be used
-                          in the desktop files and in the desktop-integration RPMs.
+    AS_HELP_STRING([--with-unix-wrapper],
+        [Redefines the name of the UNIX wrapper that will be used in the desktop
+         files and in the desktop-integration RPMs.])
+    [
+                          Usage:     --with-unix-wrapper=ooffice
+    ],
+,)
 
-                          Usage: --with-unix-wrapper=ooffice
-],,)
 AC_ARG_WITH(asm-home,
-[  --with-asm-home         For Windows users, please supply the path for the
-                          ml.exe assembler.
+    AS_HELP_STRING([--with-asm-home],
+        [For Windows, please supply the path for the ml.exe or ml64.exe assembler.])
+    [
+                          Usage:     --with-asm-home=<path to assembler directory>
+    ],
+,)
 
-                          Usage: --with-asm-home=<path to ml.exe directory>
-],,)
 AC_ARG_WITH(os-version,
-[  --with-os-version       For FreeBSD users, use this option option to override
-                          the detected OSVERSION.
-
-                          Usage: --with-os-version=<OSVERSION>
-],,)
-AC_ARG_WITH(unzip-home,
-[  --with-unzip-home       Deprecated: use --with-zip-home instead],,)
-AC_ARG_WITH(zip-home,
-[  --with-zip-home         If you use a non standard zip, for example windows
-                          please supply the path for zip
-
-                          Usage: --with-zip-home=<path to zip executable>
-],,)
-AC_ARG_WITH(mingwin,
-[  --with-mingwin          For Windows users, use the mingwin32 compiler within
-                          cygwin environment
-
-                          Usage: --with-mingwin=yes
+    AS_HELP_STRING([--with-os-version],
+        [For FreeBSD users, use this option option to override the detected OSVERSION.])
+    [
+                          Usage:     --with-os-version=<OSVERSION>
+    ],
+,)
+
+AC_ARG_WITH(mingw-cross-compiler,
+    AS_HELP_STRING([--with-mingw-cross-compiler],
+        [Specify the MinGW cross-compiler to use.])
+    [
+                          Usage:     --with-mingw-cross-compiler=<mingw32-g++ command>
+
+                          When building on the ODK on Unix and building unowinreg.dll,
+                          specify the MinGW C++ cross-compiler.
+    ],
+,)
 
-                          For !Windows use, use the mingw32 C++ compiler to
-                          (re-) build unowinreg.dll. Specify the MinGW C++
-                          Compilers name.
-
-                          Usage: --with-mingwin=i586-mingw32msvc-g++
-],WITH_MINGWIN=$withval,WITH_MINGWIN=0)
 AC_ARG_WITH(build-version,
-[  --with-build-version    Allows the builder to add a custom version tag
-                          that will appear in the Help/About box for QA
-                          purposes.
+    AS_HELP_STRING([--with-build-version],
+        [Allows the builder to add a custom version tag that will appear in the
+         Help/About box for QA purposes.])
+    [
+                          Usage:     --with-build-version="Built by Jim"
+    ],
+    with_build_version=$withval ,
+)
 
-                          Usage: --with-build-version="Built by Jim"
-],with_build_version=$withval)
 AC_ARG_WITH(alloc,
-[  --with-alloc            Define which allocator to build with
-                          (choices are oo, system, tcmalloc, jemalloc)
-
-                          Note that on FreeBSD/NetBSD system==jemalloc
-],,)
-AC_ARG_ENABLE(verbose,
-[  --enable-verbose        Increase build verbosity.
-  --disable-verbose       Decrease build verbosity.
-],,)
-AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  Disables generation of dependency information.
-],,)
-
-BUILD_TYPE="OOo"
+    AS_HELP_STRING([--with-alloc],
+        [Define which allocator to build with (choices are oo, system, tcmalloc, jemalloc).
+         Note that on FreeBSD/NetBSD system==jemalloc]),
+,)
+
+AC_ARG_WITH(sun-templates,
+    AS_HELP_STRING([--with-sun-templates],
+        [Integrate Sun template packages.]),
+,)
+
+AC_ARG_WITH(num-cpus,
+    AS_HELP_STRING([--with-num-cpus],
+        [Number of build processes/cpus to use (number of projects that will build at the same time).
+         Multi-process/multi-cpu builds can save a lot of time on multi-cpu machines.
+         Defaults to the number of CPUs on the machine.]),
+,)
+
+AC_ARG_WITH(max-jobs,
+    AS_HELP_STRING([--with-max-jobs],
+        [Maximum number of jobs per one CPU that will be issued at the same time my dmake.
+         The real number of the jobs is affected by the --with-num-cpus too, it can get up to CPUS*max_jobs.
+         Defaults to 1, unless you configure --enable-icecream - then to 10.]),
+,)
+
+BUILD_TYPE="LibO"
+SCPDEFS=""
 
-dnl ===================================================================
-dnl Message.
-dnl ===================================================================
 echo "********************************************************************"
-echo "*                                                                  *"
-echo "*   OpenOffice.org build configuration.                            *"
-echo "*                                                                  *"
-echo "*   The configure process checks your platform to see whether      *"
-echo "*   you can build OpenOffice.org on it.                            *"
-echo "*   This process checks all pre-requisites and generates a file    *"
-echo "*   containing the necessary environment variables.                *"
-echo "*   Source this file after configure has ended successfully.       *"
-echo "*                                                                  *"
-echo "*   Any warning that is generated during the configure process     *"
-echo "*   must be taken into account since it can be a reason for        *"
-echo "*   an unsuccessful build of OpenOffice.org                        *"
-echo "*                                                                  *"
-echo "********************************************************************"
-echo ""
-echo "********************************************************************"
-echo "*                                                                  *"
-echo "*   Checking the platform pre-requisites.                          *"
-echo "*                                                                  *"
+echo "*"
+echo "*   Running ${PACKAGE_NAME} build configuration."
+echo "*"
 echo "********************************************************************"
 echo ""
+
 dnl ===================================================================
-dnl Configure pre-requisites.
+dnl checks build and host OSes
+dnl ===================================================================
+AC_CANONICAL_SYSTEM
+
+if test "$cross_compiling" = "yes"; then
+  CROSS_COMPILING=YES
+else
+  CROSS_COMPILING=
+fi
+AC_SUBST(CROSS_COMPILING)
+
+if test "$build_os" = "cygwin"; then
+  EXEEXT_FOR_BUILD=.exe
+else
+  EXEEXT_FOR_BUILD=
+fi
+AC_SUBST(EXEEXT_FOR_BUILD)
+
+dnl ===================================================================
+dnl check for required programs (grep, awk, sed, bash)
 dnl ===================================================================
 cat /dev/null > warn
+
+if test "$EUID" -eq "0"  -a "z`uname -o 2>/dev/null`" = "zCygwin" ; then
+   AC_MSG_ERROR([You must build LibreOffice as a normal user - not using an administrative account])
+fi
+
+save_CC=$CC
+save_CXX=$CXX
+
 AC_PROG_EGREP
 AC_PROG_AWK
 AC_PATH_PROG( AWK, $AWK)
@@ -890,212 +1330,432 @@ if test -z "$SED"; then
    AC_MSG_ERROR([install sed to run this script])
 fi
 
-AC_MSG_CHECKING([for solenv environment])
-if test -z "$with_local_solenv"; then
-   LOCAL_SOLENV="DEFAULT"
-   AC_MSG_RESULT([default])
-else
-   LOCAL_SOLENV=$with_local_solenv
-   AC_MSG_RESULT([$with_local_solenv])
-fi
-AC_SUBST(LOCAL_SOLENV)
-
-if test "$LOCAL_SOLENV" = "DEFAULT"; then 
-  _solenv="./solenv"
-else
-  _solenv="$LOCAL_SOLENV"
-fi
-AC_SUBST(_solenv)
-
-if test -e $_solenv/inc/minor.mk; then
-   # Get UPD number from ./solenv/inc/minor.mk
-   UPD="`grep RSCVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
-   AC_SUBST(UPD)
-   SOURCEVERSION="`grep SOURCEVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
-   AC_SUBST(SOURCEVERSION)
-else
-   AC_MSG_ERROR([$_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation...])
+AC_PATH_PROG(BASH, bash)
+if test -z "$BASH"; then
+   AC_MSG_ERROR([bash not found in \$PATH])
 fi
+AC_SUBST(BASH)
 
-dnl ===================================================================
-dnl Checks for the operating system and processor.
-dnl ===================================================================
-AC_CANONICAL_SYSTEM
-if test "$build" != "$host" -o "$build" != "$target" \
-  -o "$host" != "$target"; then
-	AC_MSG_WARN([cross-compiling by any means is not supported (yet)!])
-	echo "cross-compiling by any means is not supported (yet)!" >> warn
-fi
-
-if echo "$build_os" | grep cygwin; then
-   AC_MSG_CHECKING([Cygwin version])
-   CygwinVer=`uname -r`
-   AC_MSG_RESULT([$CygwinVer])
-   if test "`echo $CygwinVer | $AWK -F . '{ print $1$2 }'`" -lt "15"; then
-      AC_MSG_ERROR([You need at least Cygwin V1.5.x])
-   fi
-else
-   CygwinVer="false"
+AC_MSG_CHECKING([for GNU or BSD tar])
+for a in $GNUTAR gtar gnutar tar; do
+      $a --version 2> /dev/null | egrep "GNU|bsdtar"  2>&1 > /dev/null
+      if test $? -eq 0;  then
+           GNUTAR=$a
+           break
+      fi
+done
+AC_MSG_RESULT($GNUTAR)
+if test -z "$GNUTAR"; then
+    AC_MSG_ERROR([not found. install GNU or BSD tar.])
 fi
+AC_SUBST(GNUTAR)
 
 dnl ===================================================================
 dnl The following is a list of supported systems.
 dnl Sequential to keep the logic very simple
 dnl These values may be checked and reset later.
 dnl ===================================================================
-case "$build_os" in
-	solaris*)
-		test_gtk=yes
-		test_cairo=yes
-		test_librsvg=yes
-		test_kde=yes
-		test_cups=yes
-        test_randr=yes
-		test_freetype=yes
-        test_gstreamer=yes
-		_os=SunOS
-		AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
-		if test -z "$GNUTAR"; then
-			AC_MSG_ERROR([gtar (gnu tar) not found but needed. Install it (SUN Freeware package).])
-		fi
-		AC_SUBST(GNUTAR)
-
-		dnl ===========================================================
-		dnl check whether we're using solaris 6,7,8 - sparc or intel.
-		dnl ===========================================================
-   		AC_MSG_CHECKING([the Solaris operating system release])
-   		_os_release=`echo $build_os | $SED -e s/solaris2\.//`
-		if test "$_os_release" -lt "6"; then
-      			AC_MSG_ERROR([use solaris >= 6 to build OpenOffice.org])
-   		else
-      			AC_MSG_RESULT([ok ($_os_release)])
-   		fi
-
-   		dnl check whether we're using a sparc or i386 processor
-   		AC_MSG_CHECKING([the processor type])
-   		if test "$build_cpu" = "sparc" -o "$build_cpu" = "i386"; then
-      			AC_MSG_RESULT([ok ($build_cpu)])
-   		else
-      			AC_MSG_ERROR([only sparc and i386 processors are supported])
-   		fi
-		;;
-	linux-gnu*|k*bsd*-gnu*)
-		test_gtk=yes
-		test_cairo=yes
-		test_librsvg=yes
-		test_kde=yes
-		test_kde4=yes
-		test_cups=yes
-        test_randr=yes
-		test_freetype=yes
+#defaults unless the os test overrides this:
+test_randr=yes
+test_cups=yes
+test_fontconfig=yes
+
+case "$host_os" in
+    solaris*)
+        test_gtk=yes
+        build_gstreamer=yes
+        test_kde=yes
+        test_freetype=yes
         test_gstreamer=yes
-        _os=Linux	
-		;;
-	gnu)
-		test_cups=no
-		_os=GNU
-		;;
-	cygwin*) # Windows
-		test_cups=no
-		test_cairo=yes
-		test_librsvg=no
-		test_freetype=no
-        test_gstreamer=no
-		_os=WINNT
-		;;
-	darwin*) # Mac OS X
-		test_cups=yes
-		test_gtk=yes
-		test_cairo=yes
-		test_librsvg=no
+        _os=SunOS
+        AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
+        if test -z "$GNUTAR"; then
+            AC_MSG_ERROR([gtar (GNU tar) not found but needed. Install it (Sun Freeware package).])
+        fi
+        AC_SUBST(GNUTAR)
+
+        dnl ===========================================================
+        dnl Check whether we're using Solaris 6,7,8 - SPARC or Intel.
+        dnl ===========================================================
+           AC_MSG_CHECKING([the Solaris operating system release])
+           _os_release=`echo $host_os | $SED -e s/solaris2\.//`
+        if test "$_os_release" -lt "6"; then
+                  AC_MSG_ERROR([use Solaris >= 6 to build LibreOffice])
+           else
+                  AC_MSG_RESULT([ok ($_os_release)])
+           fi
+
+           dnl Check whether we're using a SPARC or i386 processor
+           AC_MSG_CHECKING([the processor type])
+           if test "$host_cpu" = "sparc" -o "$host_cpu" = "i386"; then
+                  AC_MSG_RESULT([ok ($host_cpu)])
+           else
+                  AC_MSG_ERROR([only SPARC and i386 processors are supported])
+           fi
+        ;;
+    linux-gnu*|k*bsd*-gnu*)
+        test_gtk=yes
+        build_gstreamer=yes
+        test_kde=yes
+        test_kde4=yes
+        test_freetype=yes
+        test_unix_quickstarter=yes
+        _os=Linux
+        ;;
+    gnu)
         test_randr=no
-		test_freetype=no
-        test_gstreamer=no
-		_os=Darwin
-      if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
-         AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray])
-         echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn
-         enable_systray=no
-      fi
-		;;
-	os2*)
-		test_x=no
-		test_cups=no
+        test_cups=no
+        _os=GNU
+        ;;
+    cygwin*|interix*|mingw32*)
+
+        # When building on Windows normally with MSVC under Cygwin,
+        # configure thinks that the host platform (the platform the
+        # built code will run on) is Cygwin, even if it obviously is
+        # Windows, which in Autoconf terminology is called
+        # "mingw32". (Which is misleading as MinGW is the name of the
+        # tool-chain, not an operating system.)
+
+        # Somewhat confusing, yes. But this configure script doesn't
+        # look at $host etc that much, it mostly uses its own $_os
+        # variable, set here in this case statement.
+
+        # When cross-compiling to Windows from Unix, the host platform
+        # is "mingw32" (because in that case it is the MinGW
+        # tool-chain that is used).
+
+        test_cups=no
         test_randr=no
-		test_gtk=no
-		test_librsvg=no
-		test_freetype=no
-        test_gstreamer=no
-		_os=OS2
-		;;
-	freebsd*)
-		test_gtk=yes
-		test_cairo=yes
-		test_librsvg=yes
-		test_kde=yes
-		test_kde4=yes
-		test_cups=yes
-        test_randr=yes
-		test_freetype=yes
-        test_gstreamer=yes
-		AC_MSG_CHECKING([the FreeBSD operating system release])
-		if test -n "$with_os_version"; then
-			OSVERSION="$with_os_version"
-		else
-			OSVERSION=`/sbin/sysctl -n kern.osreldate`
-		fi
-		AC_MSG_RESULT([found OSVERSION=$OSVERSION])
-		AC_MSG_CHECKING([which thread library to use])
-		if test "$OSVERSION" -lt "500016"; then
-			PTHREAD_CFLAGS="-D_THREAD_SAFE"
-			PTHREAD_LIBS="-pthread"
-		elif test "$OSVERSION" -lt "502102"; then
-			PTHREAD_CFLAGS="-D_THREAD_SAFE"
-			PTHREAD_LIBS="-lc_r"
-		else 
-			PTHREAD_CFLAGS=""
-			PTHREAD_LIBS="-pthread"
-		fi
-		AC_MSG_RESULT([$PTHREAD_LIBS])
-		_os=FreeBSD
-		;;
-	osf)
-		test_cups=no
+        test_freetype=no
+        test_fontconfig=no
+        _os=WINNT
+        # Confusingly, if the host OS matches "mingw32*", that means
+        # we are using the MinGW compiler, either natively (unlikely)
+        # or cross-compiling. We use WITH_MINGW to indicate
+        # use of MinGW in both cases.
+        case "$host_os" in
+            mingw32*)
+            WITH_MINGW=yes
+            ;;
+        esac
+        ;;
+    darwin*) # Mac OS X or iOS
+        test_gtk=yes
         test_randr=no
-		_os=OSF1
-		;;
-	netbsd)
-		test_gtk=yes
-		test_cairo=yes
-		test_librsvg=yes
-		test_kde=yes
-		test_kde4=yes
-		test_cups=no
-        test_randr=yes
-		test_freetype=yes
-        test_gstreamer=yes
-		PTHREAD_CFLAGS="-pthread"
-		PTHREAD_LIBS="-pthread -lpthread"
-		_os=NetBSD
-		;;
-	aix*)
-		test_cups=no
+        test_freetype=no
+        test_fontconfig=no
+        if test "$host_cpu" = "arm"; then
+	    _os=iOS
+            test_gtk=no
+        else
+            _os=Darwin
+        fi
+        enable_systray=no
+        ;;
+    freebsd*)
+        test_gtk=yes
+        build_gstreamer=yes
+        test_kde=yes
+        test_kde4=yes
+        test_freetype=yes
+        AC_MSG_CHECKING([the FreeBSD operating system release])
+        if test -n "$with_os_version"; then
+            OSVERSION="$with_os_version"
+        else
+            OSVERSION=`/sbin/sysctl -n kern.osreldate`
+        fi
+        AC_MSG_RESULT([found OSVERSION=$OSVERSION])
+        AC_MSG_CHECKING([which thread library to use])
+        if test "$OSVERSION" -lt "500016"; then
+            PTHREAD_CFLAGS="-D_THREAD_SAFE"
+            PTHREAD_LIBS="-pthread"
+        elif test "$OSVERSION" -lt "502102"; then
+            PTHREAD_CFLAGS="-D_THREAD_SAFE"
+            PTHREAD_LIBS="-lc_r"
+        else
+            PTHREAD_CFLAGS=""
+            PTHREAD_LIBS="-pthread"
+        fi
+        AC_MSG_RESULT([$PTHREAD_LIBS])
+        _os=FreeBSD
+        ;;
+    *netbsd*)
+        test_gtk=yes
+        build_gstreamer=yes
+        test_kde=no
+        test_kde4=yes
+        test_freetype=yes
+        PTHREAD_LIBS="-pthread -lpthread"
+        _os=NetBSD
+        ;;
+    aix*)
+        test_cups=no
         test_randr=no
-		test_freetype=yes
-        test_gstreamer=yes
-	   PTHREAD_LIBS=-pthread
-		echo "AIX is an alpha port --- Use at own risk" >> warn
-		_os=AIX
-		;;
+        test_freetype=yes
+        PTHREAD_LIBS=-pthread
+        _os=AIX
+        ;;
+    openbsd*)
+        test_gtk=yes
+        test_kde=yes
+        test_freetype=yes
+        PTHREAD_CFLAGS="-D_THREAD_SAFE"
+        PTHREAD_LIBS="-pthread"
+        _os=OpenBSD
+        ;;
+    dragonfly*)
+        test_gtk=yes
+        build_gstreamer=yes
+        test_kde=yes
+        test_kde4=yes
+        test_freetype=yes
+        PTHREAD_LIBS="-pthread"
+        _os=DragonFly
+        ;;
+    androideabi*)
+        build_gstreamer=no
+	test_cups=no
+        test_fontconfig=no
+        test_freetype=no
+        test_gtk=no
+        test_kde=no
+        test_kde4=no
+        test_randr=no
+        test_unix_quickstarter=no
+        _os=Android
+        ;;
    *)
-   AC_MSG_ERROR([$_os operating system is not suitable to build OpenOffice.org!])
+   AC_MSG_ERROR([$host_os operating system is not suitable to build LibreOffice!])
    ;;
 esac
 
+AC_SUBST(WITH_MINGW)
 AC_SUBST(OSVERSION)
 AC_SUBST(PTHREAD_CFLAGS)
 AC_SUBST(PTHREAD_LIBS)
 
+if test $build_os = "cygwin"; then
+   dnl ===================================================================
+   dnl If $CC is set to a MinGW compiler, set WITH_MINGW
+   dnl ===================================================================
+   if test "$WITH_MINGW" != "yes" -a -n "$CC" -a "`$CC -dumpmachine 2>/dev/null | $SED -e 's/^.*-//'`" = "mingw32"; then
+      WITH_MINGW="yes"
+   fi
+fi
+
+dnl ===================================================================
+dnl Extra check for Windows. Cygwin builds need gcc to build dmake
+dnl and g++ to build guw.exe although MSVC or MinGW is used to
+dnl build LibreOffice.
+dnl ===================================================================
+if test "build_os" = "cygwin" ; then
+   AC_MSG_CHECKING([for Cygwin gcc/g++])
+   if which gcc > /dev/null && which g++ > /dev/null ; then
+      AC_MSG_RESULT([found])
+   else
+      AC_MSG_ERROR([Cygwin gcc and g++ are needed, please install them.])
+   fi
+fi
+
+dnl ===================================================================
+dnl  Checks for C compiler,
+dnl  The check for the C++ compiler is later on.
+dnl ===================================================================
+GCC_HOME_SET="true"
+AC_MSG_CHECKING([gcc home])
+if test -z "$with_gcc_home"; then
+   if test -n "$enable_icecream" && test "$enable_icecream" != "no" ; then
+      GCC_HOME="/opt/icecream"
+   else
+      GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,`
+      GCC_HOME_SET="false"
+   fi
+else
+    GCC_HOME="$with_gcc_home"
+fi
+AC_MSG_RESULT($GCC_HOME)
+AC_SUBST(GCC_HOME)
+
+if test "$GCC_HOME_SET" = "true" ; then
+   if test -z "$CC"; then
+      CC="$GCC_HOME/bin/gcc"
+   fi
+   if test -z "$CXX"; then
+      CXX="$GCC_HOME/bin/g++"
+   fi
+fi
+
+dnl The following checks for gcc, cc and then cl (if it weren't guarded for win32)
+if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
+   AC_PROG_CC
+fi
+
+COMPATH=`dirname "$CC"`
+if test "$COMPATH" = "." ; then
+    AC_PATH_PROGS(COMPATH, $CC)
+    dnl double square bracket to get single because of M4 quote...
+    COMPATH=`echo $COMPATH | $SED "s@/[[^/:]]*\\\$@@"`;
+fi
+COMPATH=`echo $COMPATH | $SED "s@/[[Bb]][[Ii]][[Nn]]\\\$@@"`;
+
+dnl ===================================================================
+dnl  Test the gcc version,  3 is OK
+dnl ===================================================================
+if test \( "$_os" != "WINNT" -o "$WITH_MINGW" = "yes" \) -a "$GCC" = "yes"; then
+    AC_MSG_CHECKING([the GNU C compiler version])
+   _gcc_version=`$CC -dumpversion`
+   _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
+   GCCVER=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
+
+   if test "$_os" = "Darwin" -a "$GCCVER" -ge "040100" ; then
+      if test -z "$save_CC" -a -x "$GCC_HOME/bin/gcc-4.0" ; then
+         export CC=$GCC_HOME/bin/gcc-4.0
+          dnl  export CC to have it available in set_soenv -> config.guess
+         GCCVER2=`"$CC" -dumpversion | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
+         if test "$GCCVER2" -ge "040000" -a "$GCCVER2" -lt "040100" ; then
+            GCCVER=$GCCVER2
+         fi
+      fi
+      if test "$GCCVER" -ge "040100" ; then
+         AC_MSG_ERROR([You need to use the gcc-4.0 compiler (gcc $_gcc_version won't work with the MacOSX10.4u.sdk) - set CC accordingly])
+      else
+         AC_MSG_RESULT([implicitly using CC=$CC])
+      fi
+   else
+      AC_MSG_RESULT([checked (gcc $_gcc_version)])
+   fi
+   if test "$_os" = "SunOS"; then
+      AC_MSG_CHECKING([gcc linker])
+      if $CC -Wl,--version 2>&1 |head -n 1| grep -v GNU > /dev/null;then
+          AC_MSG_ERROR([failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris])
+      fi
+      AC_MSG_RESULT([ok (GNU ld)])
+   fi
+fi
+
+HAVE_LD_BSYMBOLIC_FUNCTIONS=
+if test "$GCC" = "yes"; then
+   AC_MSG_CHECKING( for -Bsymbolic-functions linker support )
+   bsymbolic_functions_ldflags_save=$LDFLAGS
+   LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo"
+   AC_LINK_IFELSE([AC_LANG_PROGRAM([
+   #include <stdio.h>
+   ],[
+    printf ("hello world\n");
+   ])], HAVE_LD_BSYMBOLIC_FUNCTIONS=TRUE, [])
+   if test "z$HAVE_LD_BSYMBOLIC_FUNCTIONS" = "zTRUE"; then
+     AC_MSG_RESULT( found )
+   else
+     AC_MSG_RESULT( not found )
+   fi
+   LDFLAGS=$bsymbolic_functions_ldflags_save
+fi
+AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
+
+dnl ===================================================================
+dnl Set up a different compiler to produce tools to run on the build
+dnl machine when doing cross-compilation
+dnl ===================================================================
+
+m4_pattern_allow([PKG_CONFIG_FOR_BUILD])
+if test "$cross_compiling" = "yes"; then
+  AC_MSG_CHECKING([for BUILD platform configuration])
+  echo
+  rm -rf CONF-FOR-BUILD Env.Build.sh
+  mkdir CONF-FOR-BUILD
+  tar cf - \
+	configure \
+	config.guess \
+	oowintool \
+	solenv/inc/minor.mk \
+	solenv/inc/postset.mk \
+	solenv/inc/langlist.mk \
+	set_soenv.in \
+	bootstrap.1 \
+	post_download.in \
+	ooo.lst.in \
+	Makefile.in \
+	bin/repo-list.in | (cd CONF-FOR-BUILD && tar xf -)
+  (
+    unset COM GUI GUIBASE OS CPU CPUNAME
+    unset CC CXX SYSBASE CFLAGS
+    unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
+    test -n "$CC_FOR_BUILD" && export CC="$CC_FOR_BUILD"
+    test -n "$CXX_FOR_BUILD" && export CXX="$CXX_FOR_BUILD"
+    test -n "$PKG_CONFIG_FOR_BUILD" && export PKG_CONFIG="$PKG_CONFIG_FOR_BUILD"
+    cd CONF-FOR-BUILD
+    sub_conf_opts=""
+    test -n "$with_ant_home" && sub_conf_opts="$sub_conf_opts --with-ant-home=$with_ant_home"
+    test $with_junit = no && sub_conf_opts="$sub_conf_opts --without-junit"
+    test -n "$TARFILE_LOCATION" && sub_conf_opts="$sub_conf_opts --with-external-tar=$TARFILE_LOCATION"
+    ./configure \
+	--disable-mozilla \
+	--disable-build-mozilla \
+        $sub_conf_opts \
+	2>&1 | sed -e 's/^/    /'
+    test -f ./*Env.Set.sh 2>/dev/null || exit
+    cp *Env.Set.sh ../Env.Build.sh
+    . ./*Env.Set.sh
+    for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
+             SYSTEM_LIBXSLT; do
+      VV='$'$V
+      VV=`eval "echo $VV"`
+      if test -n "$VV"; then
+	line=${V}_FOR_BUILD='${'${V}_FOR_BUILD:-$VV'}'
+        echo "$line" >>build-config
+      fi
+    done
+
+    for V in OUTDIR PATH SOLARINC SOLARLIB WORKDIR; do
+      VV='$'$V
+      VV=`eval "echo $VV"`
+      VV=`echo $VV | sed -e 's,/CONF-FOR-BUILD,,g'`
+      if test -n "$VV"; then
+	line="${V}_FOR_BUILD='$VV'"
+        echo "$line" >>build-config
+      fi
+    done
+  )
+  test -f CONF-FOR-BUILD/build-config || AC_MSG_ERROR([Running configure script for BUILD system failed, see CONF-FOR-BUILD/config.log])
+  test -f Env.Build.sh || AC_MSG_ERROR([A file called Env.Build.sh was supposed to have been copied here, but it isn't found])
+  perl -pi -e 's,/CONF-FOR-BUILD,,g' Env.Build.sh
+  eval `cat CONF-FOR-BUILD/build-config`
+  AC_MSG_RESULT([checking for BUILD platform configuration... done])
+  rm -rf CONF-FOR-BUILD
+else
+  CC_FOR_BUILD="$CC"
+  CXX_FOR_BUILD="$CXX"
+fi
+AC_SUBST(COM_FOR_BUILD)
+AC_SUBST(GUI_FOR_BUILD)
+AC_SUBST(GUIBASE_FOR_BUILD)
+AC_SUBST(OS_FOR_BUILD)
+AC_SUBST(CPU_FOR_BUILD)
+AC_SUBST(CPUNAME_FOR_BUILD)
+AC_SUBST(CC_FOR_BUILD)
+AC_SUBST(CXX_FOR_BUILD)
+AC_SUBST(GXX_INCLUDE_PATH_FOR_BUILD)
+AC_SUBST(INPATH_FOR_BUILD)
+AC_SUBST(OUTPATH_FOR_BUILD)
+AC_SUBST(MACOSX_DEPLOYMENT_TARGET_FOR_BUILD)
+AC_SUBST(SYSTEM_LIBXSLT_FOR_BUILD)
+
+AC_SUBST(OUTDIR_FOR_BUILD)
+AC_SUBST(PATH_FOR_BUILD)
+AC_SUBST(SOLARINC_FOR_BUILD)
+AC_SUBST(SOLARLIB_FOR_BUILD)
+AC_SUBST(WORKDIR_FOR_BUILD)
+
+if test -e solenv/inc/minor.mk; then
+   # Get UPD number from ./solenv/inc/minor.mk
+   UPD="`grep RSCVERSION= solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
+   AC_SUBST(UPD)
+   SOURCEVERSION="`grep SOURCEVERSION= solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
+   AC_SUBST(SOURCEVERSION)
+else
+   AC_MSG_ERROR([solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation...])
+fi
+
 dnl ===================================================================
 dnl Set the ENABLE_CRASHDUMP variable.
 dnl ===================================================================
@@ -1110,26 +1770,58 @@ else
 fi
 AC_SUBST(ENABLE_CRASHDUMP)
 
+
+dnl ===================================================================
+dnl Windows specific tests and stuff
+dnl ===================================================================
 if test "$_os" = "WINNT"; then
+
+   dnl Include twain scanners
    BUILD_TYPE="$BUILD_TYPE TWAIN"
-fi
 
-if test "$_os" = "WINNT"; then
-   dnl ===================================================================
-   dnl Set the VC_STANDARD variable.
-   dnl ===================================================================
-   AC_MSG_CHECKING([whether to use the standard non-optimizing compiler])
-   if test "$enable_cl_standard" = "" -o "$enable_cl_standard" = "no"; then
-      VC_STANDARD=""
+   dnl Set the CL_X64 variable if we are building a 64-bit LibreOffice.
+   AC_MSG_CHECKING([whether to build a 64-bit LibreOffice])
+   if test "z$enable_cl_x64" = "z" -o "$enable_cl_x64" = "no"; then
+      CL_X64=""
+      AC_MSG_RESULT([no])
+   else
+      CL_X64="TRUE"
+      AC_MSG_RESULT([yes])
+   fi
+   AC_SUBST(CL_X64)
+
+   AC_MSG_CHECKING([whether to use DirectX])
+   if test "$enable_directx" = "yes" -o "$enable_directx" = ""; then
+      ENABLE_DIRECTX="TRUE"
+      AC_MSG_RESULT([yes])
+   else
+      ENABLE_DIRECTX=""
       AC_MSG_RESULT([no])
+   fi
+   AC_SUBST(ENABLE_DIRECTX)
+
+   AC_MSG_CHECKING([whether to use ActiveX])
+   if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then
+      DISABLE_ACTIVEX=""
+      AC_MSG_RESULT([yes])
    else
-      VC_STANDARD="TRUE"
+      DISABLE_ACTIVEX="TRUE"
+      AC_MSG_RESULT([no])
+   fi
+   AC_SUBST(DISABLE_ACTIVEX)
+
+   AC_MSG_CHECKING([whether to use ATL])
+   if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE" -o "$enable_atl" = ""; then
+      DISABLE_ATL=""
       AC_MSG_RESULT([yes])
+   else
+      DISABLE_ATL="TRUE"
+      AC_MSG_RESULT([no])
    fi
-   AC_SUBST(VC_STANDARD)
+   AC_SUBST(DISABLE_ATL)
+
 fi
 
-dnl ===================================================================
 dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
 dnl ===================================================================
 AC_MSG_CHECKING([whether to turn warnings to errors])
@@ -1137,23 +1829,20 @@ if test -n "$enable_werror" && test "$enable_werror" != "no"; then
    ENABLE_WERROR="TRUE"
    AC_MSG_RESULT([yes])
    AC_MSG_WARN([Turning warnings to errors has no effect in modules or])
-   AC_MSG_WARN([on platforms where it has been disabled explicitely])
-   echo "Turning warnings to errors has no effect in modules or on platforms where it has been disabled explicitely" >> warn
+   AC_MSG_WARN([on platforms where it has been disabled explicitly])
+   echo "Turning warnings to errors has no effect in modules or on platforms where it has been disabled explicitly" >> warn
 else
    ENABLE_WERROR="FALSE"
    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_WERROR)
 
-dnl ===================================================================
 dnl Set the ENABLE_DEBUG variable. (Activate --enable-symbols)
 dnl ===================================================================
 AC_MSG_CHECKING([whether to do a debug build])
 if test -n "$enable_debug" && test "$enable_debug" != "no"; then
    ENABLE_DEBUG="TRUE"
-   if test -z "$enable_symbols"; then
-      enable_symbols="yes"
-   fi
+   enable_symbols="yes"
    AC_MSG_RESULT([yes])
 else
    ENABLE_DEBUG="FALSE"
@@ -1161,7 +1850,6 @@ else
 fi
 AC_SUBST(ENABLE_DEBUG)
 
-dnl ===================================================================
 dnl Set the ENABLE_DBGUTIL variable
 dnl ===================================================================
 AC_MSG_CHECKING([whether to build with additional debug utilities])
@@ -1180,92 +1868,85 @@ AC_SUBST(PRODUCT)
 AC_SUBST(PROFULLSWITCH)
 AC_SUBST(PROEXT)
 
+dnl whether to include symbols into final build.
 dnl ===================================================================
-dnl First setting is whether to include symbols into final build.
-dnl ===================================================================
-AC_MSG_CHECKING([whether to include symbols into final build])
-if test -n "$enable_symbols" && test "$enable_symbols" != "no"; then
-	if test "$enable_symbols" = "yes" -o "$enable_symbols" = "TRUE"; then
-		ENABLE_SYMBOLS="TRUE"
-		AC_MSG_RESULT([yes])
-	else
-		if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
-			ENABLE_SYMBOLS="SMALL"
-			AC_MSG_RESULT([yes, small ones])
-		else if test "$enable_symbols" != "no" ; then
-			     echo enable symbols is: $enable_symbols
-			     AC_MSG_ERROR([--enable-symbols only accepts yes, TRUE or SMALL as parameter.])
-           	     else
-              		     ENABLE_SYMBOLS=
-		     fi
-		fi
-	fi
+AC_MSG_CHECKING([whether to include symbols])
+if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then
+   ENABLE_SYMBOLS="TRUE"
+   AC_MSG_RESULT([yes])
 else
    ENABLE_SYMBOLS=
    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_SYMBOLS)
 
-dnl ===================================================================
 dnl Determine if the solver is to be stripped or not.
 dnl ===================================================================
 AC_MSG_CHECKING([whether to strip the solver or not.])
-if test -n "$enable_strip_solver"; then
-   if test "$enable_strip_solver" = "yes"; then
-      DISABLE_STRIP=
-   else if test "$enable_strip_solver" = "no"; then
-           DISABLE_STRIP="TRUE"
-        else
-           AC_MSG_ERROR([--disable-strip-solver only accepts yes or no as parameter.])
-        fi
-   fi
+if test "z$enable_strip_solver" = "zno"; then
+   DISABLE_STRIP="TRUE"
+   AC_MSG_RESULT([no])
 else
    if test -n "$ENABLE_SYMBOLS"; then
       DISABLE_STRIP="TRUE"
+      AC_MSG_RESULT([no])
    else
       DISABLE_STRIP=
+      AC_MSG_RESULT([yes])
    fi
 fi
 AC_SUBST(DISABLE_STRIP)
 
+dnl check for cups support
 dnl ===================================================================
-dnl Build options
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable native CUPS support])
-if test "$test_cups" = "yes" -a \( "$enable_cups" = "yes" -o "$enable_cups" = "TRUE" \) ; then
+AC_MSG_CHECKING([whether to enable native cups support])
+if test "$test_cups" = "yes" -a "z$enable_cups" != "zno"; then
    ENABLE_CUPS="TRUE"
    AC_MSG_RESULT([yes])
+   AC_CHECK_LIB(cups, cupsPrintFiles)
+   AC_CHECK_HEADER(cups/cups.h, AC_DEFINE(HAVE_CUPS_H))
+   if test "$ac_cv_lib_cups_cupsPrintFiles" != "yes" -a "$ac_cv_header_cups_cups_h" != "yes"; then
+        AC_MSG_ERROR([Could not find CUPS. Install libcupsys2-dev or cups???-devel.])
+   fi
 else
    ENABLE_CUPS=""
    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_CUPS)
 
+
+# check for fontconfig support
 AC_MSG_CHECKING([whether to enable fontconfig support])
-if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a \( "$enable_fontconfig" = "yes" -o "$enable_fontconfig" = "TRUE" \); then
+if test "z$test_fontconfig" = "zyes" -a "z$enable_fontconfig" != "no"; then
    ENABLE_FONTCONFIG="TRUE"
    AC_MSG_RESULT([yes])
+   PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0])
 else
    ENABLE_FONTCONFIG=""
    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_FONTCONFIG)
+AC_SUBST(FONTCONFIG_CFLAGS)
+AC_SUBST(FONTCONFIG_LIBS)
 
+dnl whether to find & fetch external tarballs?
 dnl ===================================================================
-dnl find external tarballs.
-dnl ===================================================================
-if test -z $TARFILE_LOCATION; then
+if test -z "$TARFILE_LOCATION"; then
    TARFILE_LOCATION="DEFAULT"
 fi
 AC_SUBST(TARFILE_LOCATION)
 
-if test -z "$enable_fetch_external" || test "$enable_fetch_external" = "yes" \
+if test "z$enable_fetch_external" != "zno" \
    && test -z "$with_system_libs" -a "$with_system_jars" != "no"; then
-   DO_FETCH_TARBALLS="yes"
+   DO_FETCH_TARBALLS="YES"
 fi
 AC_SUBST(DO_FETCH_TARBALLS)
 
+
+dnl git-new-workdir
 dnl ===================================================================
+AC_SUBST(GIT_LINK_SRC)
+
 dnl Disable legacy binary file formats filters
 dnl ===================================================================
 AC_MSG_CHECKING([whether to enable filters for legacy binary file formats (StarOffice 5.2)])
@@ -1279,38 +1960,16 @@ else
 fi
 AC_SUBST(WITH_BINFILTER)
 
-if test "$_os" = "WINNT"; then
-   AC_MSG_CHECKING([whether to use DirectX])
-   if test "$enable_directx" = "yes" -o "$enable_directx" = "TRUE" -o "$enable_directx" = ""; then
-      ENABLE_DIRECTX="TRUE"
-      AC_MSG_RESULT([yes])
-   else
-      ENABLE_DIRECTX=""
-      AC_MSG_RESULT([no])
-   fi
-   AC_SUBST(ENABLE_DIRECTX)
-
-   AC_MSG_CHECKING([whether to use ActiveX])
-   if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then
-      DISABLE_ACTIVEX=""
-      AC_MSG_RESULT([yes])
-   else
-      DISABLE_ACTIVEX="TRUE"
-      AC_MSG_RESULT([no])
-   fi
-   AC_SUBST(DISABLE_ACTIVEX)
-
-   AC_MSG_CHECKING([whether to use ATL])
-   if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE" -o "$enable_atl" = ""; then
-      DISABLE_ATL=""
-      AC_MSG_RESULT([yes])
-   else
-      DISABLE_ATL="TRUE"
-      AC_MSG_RESULT([no])
-   fi
-   AC_SUBST(DISABLE_ATL)
-
+dnl Enable ugly pieces of code we're better off without
+dnl ===================================================================
+if test "$enable_ugly" = "yes"; then
+  BUILD_TYPE="$BUILD_TYPE DICTIONARIES"
+  SCPDEFS="$SCPDEFS -DWITH_UGLY"
+  ENABLE_UGLY=YES
+else
+  ENABLE_UGLY=NO
 fi
+AC_SUBST(ENABLE_UGLY)
 
 dnl ===================================================================
 dnl Disable rpath in shared libraries?
@@ -1337,222 +1996,55 @@ else
 fi
 AC_SUBST(WITH_MYSPELL_DICTS)
 
-if test "$WITH_MYSPELL_DICTS" = "NO"; then
-  AC_MSG_CHECKING([whether to use dicts from external paths])
-  if test -n "$with_system_dicts" -a "$with_system_dicts" = "yes"; then
-	AC_MSG_RESULT([yes])
-	SYSTEM_DICTS=YES
-	AC_MSG_CHECKING([for spelling dictionary directory])
-	if test -n "$with_external_dict_dir"; then
-		DICT_SYSTEM_DIR=file://$with_external_dict_dir
-	else
-		DICT_SYSTEM_DIR=file:///usr/share/hunspell
-	fi
-	AC_MSG_RESULT([$DICT_SYSTEM_DIR])
-	AC_MSG_CHECKING([for hyphenation patterns directory])
-	if test -n "$with_external_hyph_dir"; then
-		HYPH_SYSTEM_DIR=file://$with_external_hyph_dir
-	else
-		HYPH_SYSTEM_DIR=file:///usr/share/hyphen
-	fi
-	AC_MSG_RESULT([$HYPH_SYSTEM_DIR])
-	AC_MSG_CHECKING([for thesaurus directory])
-	if test -n "$with_external_thes_dir"; then
-		THES_SYSTEM_DIR=file://$with_external_thes_dir
-	else
-		THES_SYSTEM_DIR=file:///usr/share/mythes
-	fi
-	AC_MSG_RESULT([$THES_SYSTEM_DIR])
-  else
-  	AC_MSG_RESULT([no])
-  	SYSTEM_DICTS=NO
-  fi
+AC_MSG_CHECKING([whether to use dicts from external paths])
+if test -n "$with_system_dicts" -a "$with_system_dicts" = "yes"; then
+    AC_MSG_RESULT([yes])
+    SYSTEM_DICTS=YES
+    AC_MSG_CHECKING([for spelling dictionary directory])
+    if test -n "$with_external_dict_dir"; then
+        DICT_SYSTEM_DIR=file://$with_external_dict_dir
+    else
+        DICT_SYSTEM_DIR=file:///usr/share/hunspell
+    fi
+    AC_MSG_RESULT([$DICT_SYSTEM_DIR])
+    AC_MSG_CHECKING([for hyphenation patterns directory])
+    if test -n "$with_external_hyph_dir"; then
+        HYPH_SYSTEM_DIR=file://$with_external_hyph_dir
+    else
+        HYPH_SYSTEM_DIR=file:///usr/share/hyphen
+    fi
+    AC_MSG_RESULT([$HYPH_SYSTEM_DIR])
+    AC_MSG_CHECKING([for thesaurus directory])
+    if test -n "$with_external_thes_dir"; then
+        THES_SYSTEM_DIR=file://$with_external_thes_dir
+    else
+        THES_SYSTEM_DIR=file:///usr/share/mythes
+    fi
+    AC_MSG_RESULT([$THES_SYSTEM_DIR])
+else
+        AC_MSG_RESULT([no])
+        SYSTEM_DICTS=NO
 fi
 AC_SUBST(SYSTEM_DICTS)
 AC_SUBST(DICT_SYSTEM_DIR)
 AC_SUBST(HYPH_SYSTEM_DIR)
 AC_SUBST(THES_SYSTEM_DIR)
 
-if test $_os = "WINNT"; then
-   AC_MSG_CHECKING([Windows build environment sanity])
-   dnl ===================================================================
-   dnl Sanity check! Native windows programs cannot use cygwin symlinks!
-   dnl ===================================================================
-   dnl As long as awk instead of $AWK is used somewhere in the sources,
-   dnl check for $AWK and awk. $AWK is pointing to gawk in cygwin.
-      if test -L $AWK -o -L `which awk` -o -L `which tar` -o -L `which gunzip` ; then
-         AC_MSG_ERROR([$AWK, awk, tar or gunzip is a cygwin symlink!
-Native windows programs cannot use cygwin symlinks. Remove the symbolic
-link, and copy the program to the name of the link.])
-      fi
-   dnl ===================================================================
-   dnl Another sanity check! More a band-aid. winenv.* adds guw.exe to
-   dnl CC and CXX but the configure checks here assume that guw.exe
-   dnl (if needed at all) is not yet present.
-   dnl ===================================================================
-   CC=`echo $CC | $SED "s/^guw.exe //"`
-   CXX=`echo $CXX | $SED "s/^guw.exe //"`
-   dnl ===================================================================
-   dnl If $CC is set to a MinGW compiler, e.g. "gcc -mno-cygwin" enable
-   dnl $WITH_MINGWIN
-   dnl ===================================================================
-      if test -n "$CC";then
-         if test "`$CC -dumpmachine 2>/dev/null | $SED -e 's/^.*-//'`" = "mingw32"; then
-            WITH_MINGWIN="yes"
-         fi
-      fi
-   dnl ===================================================================
-   if test "$WITH_MINGWIN" = "yes" ; then
-      if test -z "$CC"; then
-         CC="gcc -mno-cygwin"
-         CXX="g++ -mno-cygwin"
-      fi
-   fi
-   AC_MSG_RESULT([ok])
-fi
-AC_SUBST(WITH_MINGWIN)
-
-dnl ===================================================================
-dnl Extra check for Windows. cygwin builds need gcc to build dmake
-dnl and g++ to build guw.exe although MS cl (or MinGW) is used to
-dnl build OOo.
-dnl ===================================================================
-if test "$_os" = "WINNT" ; then
-   AC_MSG_CHECKING([for cygwin gcc/g++])
-   if which gcc > /dev/null && which g++ > /dev/null ; then
-      AC_MSG_RESULT([found])
-   else
-      AC_MSG_ERROR([cygwin gcc and g++ are needed, please install them.])
-   fi
-fi
-
-
-dnl ===================================================================
-dnl Check whether the bash shell can be used.
-dnl ===================================================================
-AC_PATH_PROG(SHELLPATH, bash)
-if test -z "$SHELLPATH"; then
-   AC_MSG_ERROR([bash not found in \$PATH])
-else
-   SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"`
-fi
-AC_SUBST(SHELLPATH)
-
-dnl ===================================================================
-dnl  Checks for c compiler,
-dnl  The check for the c++ compiler is later on.
-dnl ===================================================================
-AC_MSG_CHECKING([gcc home])
-if test -z "$with_gcc_home"; then
-	GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,`
-else	
-	GCC_HOME="$with_gcc_home"
-fi
-AC_MSG_RESULT($GCC_HOME)
-AC_SUBST(GCC_HOME)
-
-save_CC=$CC
-save_CXX=$CXX
-
-if test -n "$with_gcc_home"; then
-   if test -z "$CC"; then
-      CC="$with_gcc_home/bin/gcc"
-   fi
-fi
-
-dnl The following checks for gcc, cc and then cl (if it weren't guarded for win32)
-if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
-   AC_PROG_CC
-fi
-
-COMPATH=`dirname "$CC"`
-if test "$COMPATH" = "." ; then
-    AC_PATH_PROGS(COMPATH, $CC)
-    dnl double square bracket to get single because of M4 quote...
-    COMPATH=`echo $COMPATH | $SED "s@/[[^/:]]*\\\$@@"`;
-fi
-COMPATH=`echo $COMPATH | $SED "s@/[[Bb]][[Ii]][[Nn]]\\\$@@"`;
-
-dnl ===================================================================
-dnl  Test the gcc version,  3 is OK
-dnl ===================================================================
-GCCVER=20995
-if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; then
-    AC_MSG_CHECKING([the GNU gcc compiler version])
-   _gcc_version=`$CC -dumpversion`
-   _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
-   GCCVER=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-
-   if test "$_gcc_major" -lt "3"; then
-      AC_MSG_ERROR([found version "$_gcc_version", use version 3+ of the gcc compiler])
-   else
-      if test "$GCCVER" -eq "030203"; then
-	    if test "$ENABLE_SYMBOLS" = "SMALL"; then
-           AC_MSG_ERROR([version "$_gcc_version" gives internal error with small.])
-	    fi
-      fi
-   fi
-   if test "$_os" = "Darwin" -a "$GCCVER" -ge "040100" ; then
-      if test -z "$save_CC" -a -x "$GCC_HOME/bin/gcc-4.0" ; then
-         export CC=$GCC_HOME/bin/gcc-4.0
-          dnl  export CC to have it available in set_soenv -> config.guess
-         GCCVER2=`"$CC" -dumpversion | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-         if test "$GCCVER2" -ge "040000" -a "$GCCVER2" -lt "040100" ; then
-            GCCVER=$GCCVER2
-         fi
-      fi
-      if test "$GCCVER" -ge "040100" ; then
-         AC_MSG_ERROR([You need to use the gcc-4.0 compiler (gcc $_gcc_version won't work with the MacOSX10.4u.sdk) - set CC accordingly])
-      else
-         AC_MSG_RESULT([implicitly using CC=$CC])
-      fi
-   else
-      AC_MSG_RESULT([checked (gcc $_gcc_version)])
-   fi
-   if test "$_os" = "SunOS"; then
-      AC_MSG_CHECKING([gcc linker])
-      if $CC -Wl,--version 2>&1 |head -n 1| grep -v GNU > /dev/null;then
-          AC_MSG_ERROR([failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris])
-      fi
-      AC_MSG_RESULT([ok (GNU ld)])
-   fi
-fi 
-AC_SUBST(GCCVER)
-
-HAVE_LD_BSYMBOLIC_FUNCTIONS=
-if test "$GCC" = "yes"; then
-   AC_MSG_CHECKING( for -Bsymbolic-functions linker support )
-   bsymbolic_functions_ldflags_save=$LDFLAGS
-   LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo"
-   AC_LINK_IFELSE([AC_LANG_PROGRAM([
-   #include <stdio.h>
-   ],[
-    printf ("hello world\n");
-   ])], HAVE_LD_BSYMBOLIC_FUNCTIONS=TRUE, [])
-   if test "z$HAVE_LD_BSYMBOLIC_FUNCTIONS" = "zTRUE"; then
-     AC_MSG_RESULT( found )
-   else
-     AC_MSG_RESULT( not found )
-   fi
-   LDFLAGS=$bsymbolic_functions_ldflags_save
-fi
-AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
-
 dnl ===================================================================
 dnl Set the ENABLE_PCH variable. (Activate --enable-pch)
 dnl ===================================================================
 AC_MSG_CHECKING([whether to enable pch feature])
 if test -n "$enable_pch" && test "$enable_pch" != "no"; then
-   if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
-	   ENABLE_PCH="TRUE"
-	   AC_MSG_RESULT([yes])
+   if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
+       ENABLE_PCH="TRUE"
+       AC_MSG_RESULT([yes])
 dnl There is no PCH support in GCC versions prior to this
-   elif test "$GCC" = "yes" -a "$GCCVER" -gt "030400"; then
-	   ENABLE_PCH="TRUE"
-	   AC_MSG_RESULT([yes])
+   elif test "$GCC" = "yes"; then
+       ENABLE_PCH="TRUE"
+       AC_MSG_RESULT([yes])
    else
-	   ENABLE_PCH=""
-	   AC_MSG_WARN([Precompiled header not yet supported for your platform/compiler])
+       ENABLE_PCH=""
+       AC_MSG_WARN([Precompiled header not yet supported for your platform/compiler])
    fi
 else
    ENABLE_PCH=""
@@ -1577,35 +2069,17 @@ if test -z "$GNUMAKE"; then
 fi
 
 AC_MSG_CHECKING([the GNU make version])
-_make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
+_make_version=`$GNUMAKE --version | grep GNU | grep -v GPL | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
 _make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
 if test "$_make_longver" -ge "038100" ; then
-   AC_MSG_RESULT([$GNUMAKE $_make_version])
+    AC_MSG_RESULT([$GNUMAKE $_make_version])
 else
    AC_MSG_ERROR([failed ($GNUMAKE version >= 3.81 needed])
 fi
 AC_SUBST(GNUMAKE)
 
 dnl ===================================================================
-dnl Search all the common names for GNU tar
-dnl ===================================================================
-AC_MSG_CHECKING([for GNU tar])
-for a in $GNUTAR gtar gnutar tar; do
-      $a --version 2> /dev/null | grep GNU  2>&1 > /dev/null
-      if test $? -eq 0;  then
-           GNUTAR=$a
-           break
-      fi
-done
-AC_MSG_RESULT($GNUTAR)
-if test -z "$GNUTAR"; then
-    AC_MSG_ERROR([not found. install GNU tar.])
-fi
-
-AC_SUBST(GNUTAR)
-
-dnl ===================================================================
-dnl  Test the solaris compiler version
+dnl  Test the Solaris compiler version
 dnl ===================================================================
 if test "$_os" = "SunOS"; then
    if test "$CC" = "cc"; then
@@ -1613,13 +2087,13 @@ if test "$_os" = "SunOS"; then
       COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
       AC_MSG_CHECKING([the SunStudio C/C++ compiler version])
       dnl cc -V outputs to standard error!!!!
-      _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'`
+      _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | $SED -e 's/.* C //'`
       _sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'`
-      _sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'` 
+      _sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'`
       if test "$_sunstudio_major" != "5"; then
          AC_MSG_ERROR([found version "$_sunstudio_version", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler])
       else
-         _sunstudio_minor=`echo $_sunstudio_version | $AWK -F. '{ if ($2 == 5) print "true"; else if ($2 == 7) print "true"; else if ($2 == 8) print "true"; else if ($2 == 9) print "true"; else print "false" }'` 
+         _sunstudio_minor=`echo $_sunstudio_version | $AWK -F. '{ if ($2 == 5) print "true"; else if ($2 == 7) print "true"; else if ($2 == 8) print "true"; else if ($2 == 9) print "true"; else print "false" }'`
          if test "$_sunstudio_minor" = "false"; then
             AC_MSG_ERROR([found version "$_sunstudio_version", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler])
          else
@@ -1630,44 +2104,47 @@ if test "$_os" = "SunOS"; then
    fi
 fi
 
-if test "$GCC" = "yes"; then
-   AC_MSG_CHECKING( for --hash-style=both linker support )
-   hash_style_ldflags_save=$LDFLAGS
-   LDFLAGS="$LDFLAGS -Wl,--hash-style=both"
-   AC_LINK_IFELSE([AC_LANG_PROGRAM([
-   #include <stdio.h>
-   ],[
-    printf ("hello world\n");
-   ])], HAVE_LD_HASH_STYLE=TRUE, HAVE_LD_HASH_STYLE=FALSE)
-   if test "z$HAVE_LD_HASH_STYLE" = "zTRUE"; then
-     AC_MSG_RESULT( found )
+HAVE_LD_HASH_STYLE=FALSE
+WITH_LINKER_HASH_STYLE=
+AC_MSG_CHECKING( for --hash-style gcc linker support )
+if test "$GCC" = "yes" ; then
+   if test -z "$with_linker_hash_style" -o "$with_linker_hash_style" = "yes" ; then
+      hash_styles="gnu sysv"
+   elif test "$with_linker_hash_style" = "no" ; then
+      hash_styles=
    else
-     AC_MSG_RESULT( not found )
+      hash_styles="$with_linker_hash_style"
    fi
-   LDFLAGS=$hash_style_ldflags_save
-fi
-AC_SUBST(HAVE_LD_HASH_STYLE)
 
-dnl ===================================================================
-dnl  Test the Compaq compiler for OSF1
-dnl ===================================================================
-if test "$_os" = "OSF1"; then
-   if test "$CC" = "cc"; then
-      AC_PATH_PROGS(_cc, cc)
-      COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
-      AC_MSG_WARN([******* $_cc , $COMPATH])
-      AC_MSG_CHECKING([the Compaq C compiler version])
-      dnl cc -V outputs to standard error!!!!
-      _compaqc_version=`$CC -V 2>&1 | $AWK '{ print $3 }'`
-      _compaqc_major=`echo $_compaqc_version | $AWK -F. '{ print $1 }'`
-      if test "$_compaqc_major" != "T6"; then
-         AC_MSG_ERROR([found version "$_compaqc_version", use version 6 of the Compaq C compiler])
-      else
-         dnl compiler will do
-         AC_MSG_RESULT([checked])
-      fi
+   for hash_style in $hash_styles ; do
+      test "$HAVE_LD_HASH_STYLE" = "TRUE" && continue
+      hash_style_ldflags_save=$LDFLAGS
+      LDFLAGS="$LDFLAGS -Wl,--hash-style=$hash_style"
+
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([
+	  #include <stdio.h>
+	],[
+	  printf ("");
+	])],
+	[ if ./conftest$EXEEXT; then
+	    HAVE_LD_HASH_STYLE=TRUE
+	    WITH_LINKER_HASH_STYLE=$hash_style
+          fi],
+	[HAVE_LD_HASH_STYLE=FALSE])
+       LDFLAGS=$hash_style_ldflags_save
+   done
+
+   if test "$HAVE_LD_HASH_STYLE" = "TRUE"; then
+     AC_MSG_RESULT( $WITH_LINKER_HASH_STYLE )
+   else
+     AC_MSG_RESULT( no )
    fi
+   LDFLAGS=$hash_style_ldflags_save
+else
+    AC_MSG_RESULT( no )
 fi
+AC_SUBST(HAVE_LD_HASH_STYLE)
+AC_SUBST(WITH_LINKER_HASH_STYLE)
 
 dnl ===================================================================
 dnl Check whether there's a Perl version available.
@@ -1675,9 +2152,7 @@ dnl ===================================================================
 if test -z "$with_perl_home"; then
    AC_PATH_PROG(PERL, perl)
 else
-   if test "$_os" = "WINNT"; then
-      with_perl_home=`cygpath -u "$with_perl_home"`
-   fi
+   test "$build_os" = "cygwin" && with_perl_home=`cygpath -u "$with_perl_home"`
    _perl_path="$with_perl_home/bin/perl"
    if test -x "$_perl_path"; then
       PERL=$_perl_path
@@ -1688,7 +2163,7 @@ fi
 
 dnl ===================================================================
 dnl Testing for Perl version 5 or greater.
-dnl $] is the perl version variable, it is returned as an integer
+dnl $] is the Perl version variable, it is returned as an integer
 dnl ===================================================================
 if test "$PERL"; then
    AC_MSG_CHECKING([the Perl version])
@@ -1696,7 +2171,7 @@ if test "$PERL"; then
    _perl_version=$?
    if test "$_perl_version" -lt 5; then
       AC_MSG_ERROR([found Perl version "$_perl_version", use version 5 of Perl])
-   fi 
+   fi
    AC_MSG_RESULT([checked (perl $_perl_version)])
 else
    AC_MSG_ERROR([Perl not found, install version 5 of Perl])
@@ -1706,274 +2181,474 @@ AC_SUBST(PERL)
 dnl ===================================================================
 dnl Testing for required Perl modules
 dnl ===================================================================
+
 AC_MSG_CHECKING([for required Perl modules])
 if `$PERL -e 'use Archive::Zip;'`; then
-	AC_MSG_RESULT([all modules found])
+    AC_MSG_RESULT([all modules found])
 else
-	AC_MSG_ERROR([Failed to find some modules])
+    AC_MSG_ERROR([Failed to find some modules])
 fi
 
 dnl ===================================================================
 dnl  Check which Microsoft C/C++ or MinGW compiler is used for WINNT
 dnl ===================================================================
+SHOWINCLUDES_PREFIX=
 if test "$_os" = "WINNT"; then
-	if test "$WITH_MINGWIN" != "yes"; then
-		AC_MSG_CHECKING([for friendly registry keys])
-		# VS.Net 2003, VS.Net 2005
-		if test -z "$with_cl_home"; then
-			vctest=`./oowintool --msvc-productdir`;
-			if test -x "$vctest/bin/cl.exe"; then
-				with_cl_home=$vctest;
-			fi
-		else
-			with_cl_home=`cygpath -u "$with_cl_home"`
-		fi
-		AC_MSG_RESULT([done])
-
-		dnl ===========================================================
-		dnl  Check for mspdb71.dll/mspdb80.dll
-		dnl ===========================================================
-		dnl  .NET 2003/5/8 Compiler
-		if test -n "$with_mspdb_path";then
-			with_mspdb_path=`cygpath -u "$with_mspdb_path"`
-		fi
-		if test -e "$with_mspdb_path/mspdb71.dll" -o -e "$with_mspdb_path/mspdb80.dll"; then
-			MSPDB_PATH="$with_mspdb_path"
-		fi
-		dnl .NET 2003 case
-		if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb71.dll"; then
-			MSPDB_PATH="$with_cl_home/../Common7/IDE"
-		fi
-		dnl .NET 2005/2008 case
-		if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb80.dll"; then
-			MSPDB_PATH="$with_cl_home/../Common7/IDE"
-		fi
-		dnl Windows SDK 6.0 case
-		if test -z "$MSPDB_PATH" -a -e "$with_cl_home/bin/mspdb80.dll"; then
-			MSPDB_PATH="$with_cl_home/bin"
-		fi
-
-		if test -z "$MSPDB_PATH";then
-			dnl AC_PATH_PROG only checks if MSPDB_PATH is still empty
-			AC_PATH_PROG(MSPDB_PATH, mspdb80.dll)
-			AC_PATH_PROG(MSPDB_PATH, mspdb71.dll)
-			MSPDB_PATH=`dirname "$MSPDB_PATH"`
-		fi
-
-		if test -z "$MSPDB_PATH"; then
-			AC_MSG_ERROR([You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path])
-		fi
-		MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
-		MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
-		dnl The path needs to be added before cl is called
-		PATH="$MSPDB_PATH:$PATH"
-
-		AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
-   		if test -x "$with_cl_home/bin/cl.exe"; then
-   			CC="$with_cl_home/bin/cl.exe"
-   		else
-   			AC_PATH_PROG(CC, cl.exe)
-   		fi
-  		if test -e "$CC"; then
-			# This gives us a posix path with 8.3 filename restrictions
-			CC=`cygpath -d "$CC"`
-			CC=`cygpath -u "$CC"`
-			# Remove /cl.exe from CC case insensitive
-			AC_MSG_RESULT([found ($CC)])
-			COMPATH=`echo $CC | $SED 's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'`
-			export INCLUDE=`cygpath -d "$COMPATH/Include"`
-			dnl  Check which Microsoft C/C++ compiler is found
-			AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler])
-dnl      The following find microsoft, matches nn.nn.nnnn then pulls numbers out.         
-			CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
-							x = match( \\\$0, /..\\...\\...../ )
-							CCversion = substr( \\\$0, RSTART, RLENGTH)
-							tokencount = split (CCversion,vertoken,\".\")
-							for ( i = 1 ; i <= tokencount ; i++ ) {
-								printf (\"%04d\",vertoken[[i]] )
-							}
-							}"`
-			AC_MSG_RESULT([found Compiler version $CCNUMVER.])
-			if test "$CCNUMVER" -ge "001500000000"; then
-				COMEX=12
-				MSVSVER=2008
-				AC_MSG_RESULT([found .NET 2008 / VS 9.0.])
-			elif test "$CCNUMVER" -ge "001400000000"; then
-				COMEX=11
-				MSVSVER=2005
-				AC_MSG_RESULT([found .NET 2005.])
-			elif test "$CCNUMVER" -ge "001300102240"; then
-				COMEX=10
-				MSVSVER=2003
-				AC_MSG_RESULT([found .NET 2003.])
-			else
-				AC_MSG_ERROR([Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler.])
-			fi
-		else
-			AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe.])
-		fi
-	else
-		AC_MSG_CHECKING([the Mingwin32 C++ Compiler])
-		if test `$CC -dumpmachine | $SED -e 's/^.*-//'` = "mingw32"; then
-			AC_MSG_RESULT([found.])
-			if $CC -dumpspecs | grep -q "mno-cygwin"; then
-				USE_MINGW="cygwin"
-			else
-				USE_MINGW="pure-mingw"
-			fi
-		else
-			AC_MSG_ERROR([Mingwin32 C++ Compiler not found.])
-		fi
+    if test "$WITH_MINGW" != "yes"; then
+        AC_MSG_CHECKING([for a friendly Microsoft C/C++ compiler installation path])
+        if test -z "$with_cl_home"; then
+            vctest=`./oowintool --msvc-productdir`;
+            if test "$CL_X64" = ""; then
+                if test -x "$vctest/bin/cl.exe"; then
+                    with_cl_home=$vctest;
+                fi
+            else
+                if test -x "$vctest/bin/amd64/cl.exe"; then
+                    with_cl_home=$vctest;
+                fi
+            fi
+        else
+            with_cl_home=`cygpath -u "$with_cl_home"`
+        fi
+        with_cl_home=`cygpath -d "$with_cl_home"`
+        with_cl_home=`cygpath -u "$with_cl_home"`
+        AC_MSG_RESULT([$with_cl_home])
+
+        dnl ===========================================================
+        dnl  Check for mspdb80.dll/mspdb100.dll
+        dnl ===========================================================
+        dnl MSVS 2008/10 Compiler
+        if test -n "$with_mspdb_path";then
+            with_mspdb_path=`cygpath -u "$with_mspdb_path"`
+        fi
+        if test -e "$with_mspdb_path/mspdb80.dll" -o -e "$with_mspdb_path/mspdb100.dll"; then
+            MSPDB_PATH="$with_mspdb_path"
+        fi
+        dnl MSVS 2008 case
+        if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb80.dll"; then
+            MSPDB_PATH="$with_cl_home/../Common7/IDE"
+        fi
+        dnl Windows SDK 6.0 case
+        if test -z "$MSPDB_PATH" -a -e "$with_cl_home/bin/mspdb80.dll"; then
+            MSPDB_PATH="$with_cl_home/bin"
+        fi
+        dnl MSVS 2010 case
+        if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb100.dll"; then
+            MSPDB_PATH="$with_cl_home/../Common7/IDE"
+        fi
+
+        if test -z "$MSPDB_PATH";then
+            dnl AC_PATH_PROG only checks if MSPDB_PATH is still empty
+            AC_PATH_PROG(MSPDB_PATH, mspdb80.dll)
+            AC_PATH_PROG(MSPDB_PATH, mspdb100.dll)
+            MSPDB_PATH=`dirname "$MSPDB_PATH"`
+        fi
+
+        if test -z "$MSPDB_PATH"; then
+            AC_MSG_ERROR([You need a mspdb80.dllor mspdb100.dll, make sure it is in the path or use --with-mspdb-path])
+        fi
+        MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
+        MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
+        dnl The path needs to be added before cl is called
+        PATH="$MSPDB_PATH:$PATH"
+
+        AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
+        if test -z "$CC"; then
+            if test "$CL_X64" = ""; then
+                if test -x "$with_cl_home/bin/cl.exe"; then
+                    CC="$with_cl_home/bin/cl.exe"
+                fi
+            else
+                if test -x "$with_cl_home/bin/amd64/cl.exe"; then
+                    CC="$with_cl_home/bin/amd64/cl.exe"
+                fi
+            fi
+            if test -z "$CC"; then
+                AC_PATH_PROG(CC, cl.exe)
+            fi
+            # This gives us a posix path with 8.3 filename restrictions
+            CC=`cygpath -d "$CC"`
+            CC=`cygpath -u "$CC"`
+        fi
+
+        if test -n "$CC"; then
+            # Remove /cl.exe from CC case insensitive
+            AC_MSG_RESULT([found ($CC)])
+            if test "$CL_X64" = ""; then
+                COMPATH=`echo $CC | $SED -e 's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]].*@@' -e 's@^.* @@'`
+            else
+                if test -n "$with_cl_home"; then
+                    COMPATH=`echo $with_cl_home`
+                fi
+            fi
+            export INCLUDE=`cygpath -d "$COMPATH/Include"`
+            dnl  Check which Microsoft C/C++ compiler is found
+            AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler])
+	    # The following finds Microsoft, matches nn.nn.nnnn then pulls numbers out.
+            CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
+                            x = match( \\\$0, /..\\...\\...../ )
+                            CCversion = substr( \\\$0, RSTART, RLENGTH)
+                            tokencount = split (CCversion,vertoken,\".\")
+                            for ( i = 1 ; i <= tokencount ; i++ ) {
+                                printf (\"%04d\",vertoken[[i]] )
+                            }
+                            }"`
+            if test "$CCNUMVER" -ge "001600000000"; then
+                COMEX=13
+                MSVSVER=2010
+            elif test "$CCNUMVER" -ge "001500000000"; then
+                COMEX=12
+                MSVSVER=2008
+            else
+                AC_MSG_ERROR([Compiler too old. Use Microsoft Visual Studio 2008 or 2010.])
+            fi
+            AC_MSG_RESULT([found compiler version $CCNUMVER (MSVS $MSVSVER).])
+        else
+            AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe.])
+        fi
+
+        dnl We need to guess the prefix of the -showIncludes output, it can be
+        dnl localized
+        AC_MSG_CHECKING([the dependency generation prefix (cl.exe -showIncludes)])
+        echo "#include <stdlib.h>" > conftest.c
+        SHOWINCLUDES_PREFIX=`$CC -c -showIncludes conftest.c 2>/dev/null | \
+            grep 'stdlib\.h' | head -n1 | sed 's/ [[[:alpha:]]]:.*//'`
+        rm -f conftest.c conftest.obj
+        if test -z "$SHOWINCLUDES_PREFIX" ; then
+            AC_MSG_ERROR([cannot determine the -showIncludes prefix])
+        else
+            AC_MSG_RESULT(["$SHOWINCLUDES_PREFIX"])
+        fi
+
+	# Check for 64-bit (cross-)compiler to use to build the 64-bit
+	# version of the Explorer extension (and maybe other small
+	# bits, too) needed when installing a 32-bit LibreOffice on a
+	# 64-bit OS. The 64-bit Explorer extension is a feature that
+	# has been present since long in OOo. Don't confuse it with
+	# building LibreOffice itself as 64-bit code, which is
+	# unfished work and highly experimental.
+
+	BUILD_X64=
+	CC_X64_BINARY=
+	LINK_X64_BINARY=
+	LIBMGR_X64_BINARY=
+
+	if test "$CL_X64" = ""; then
+	    AC_MSG_CHECKING([for a x64 compiler])
+
+	    # Prefer native x64 compiler to cross-compiler, in case we are running
+	    # the build on a 64-bit OS.
+	    if "$with_cl_home/bin/amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
+		BUILD_X64=TRUE
+		CC_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
+		CXX_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
+		LINK_X64_BINARY="$with_cl_home/bin/amd64/link.exe"
+		LIBMGR_X64_BINARY="$with_cl_home/bin/amd64/lib.exe"
+	    elif "$with_cl_home/bin/x86_amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
+		BUILD_X64=TRUE
+		CC_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
+		CXX_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
+		LINK_X64_BINARY="$with_cl_home/bin/x86_amd64/link.exe"
+		LIBMGR_X64_BINARY="$with_cl_home/bin/x86_amd64/lib.exe"
+	    fi
+	    if test "$BUILD_X64" = TRUE; then
+		AC_MSG_RESULT([found])
+	    else
+		AC_MSG_RESULT([not found])
+		AC_MSG_WARN([Installation set will not contain the 64-bit Explorer extension])
+	    fi
 	fi
+	AC_SUBST(BUILD_X64)
+
+	# These are passed to the environment through set_soenv.in as usual, and then
+	# used in set_wntx64.mk
+	AC_SUBST(CC_X64_BINARY)
+	AC_SUBST(CXX_X64_BINARY)
+	AC_SUBST(LINK_X64_BINARY)
+	AC_SUBST(LIBMGR_X64_BINARY)
+
+    else
+        AC_MSG_CHECKING([the compiler is MinGW])
+        MACHINE_PREFIX=`$CC -dumpmachine`
+        if echo $MACHINE_PREFIX | grep -q mingw32; then
+            AC_MSG_RESULT([yes])
+            if $CC -dumpspecs | grep -q "mno-cygwin"; then
+                USE_MINGW="cygwin"
+            else
+                USE_MINGW="pure-mingw"
+            fi
+        else
+            AC_MSG_ERROR([Compiler is not MinGW.])
+        fi
+    fi
 fi
 AC_SUBST(COMEX)
 AC_SUBST(MSPDB_PATH)
 AC_SUBST(USE_MINGW)
+AC_SUBST(SHOWINCLUDES_PREFIX)
 
 dnl ===================================================================
-dnl  .NET needs special treatment
+dnl Check for pkg-config
 dnl ===================================================================
-if test "$_os" = "WINNT"; then
-if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
-	dnl Check midl.exe
-	AC_PATH_PROG(MIDL_PATH, midl.exe)
-	if test -n "$MIDL_PATH";then
-		MIDL_PATH=`dirname "$MIDL_PATH"`
-	fi
-	if test -n "$with_midl_path";then
-		with_midl_path=`cygpath -u "$with_midl_path"`
-	fi
-	if test -x "$with_midl_path/midl.exe"; then
-		MIDL_PATH="$with_midl_path"
-	fi
-	if test -z "$MIDL_PATH" -a -e "$with_cl_home/../Common7/Tools/Bin/midl.exe"; then
-		MIDL_PATH="$with_cl_home/../Common7/Tools/Bin"
-	fi
-	if test -z "$MIDL_PATH" ; then
+if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
+    PKG_PROG_PKG_CONFIG
+fi
+
+if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
+
+   # If you use CC=/path/to/compiler/foo-gcc or even CC="ccache
+   # /path/to/compiler/foo-gcc" you need to set the AR etc env vars
+   # explicitly. Or put /path/to/compiler in PATH yourself.
+
+   AC_CHECK_TOOL(AR,ar)
+   AC_CHECK_TOOL(NM,nm)
+   AC_CHECK_TOOL(OBJDUMP,objdump)
+   AC_CHECK_TOOL(RANLIB,ranlib)
+   AC_CHECK_TOOL(STRIP,strip)
+   if test "$_os" = "WINNT"; then
+      AC_CHECK_TOOL(DLLTOOL,dlltool)
+      AC_CHECK_TOOL(WINDRES,windres)
+   fi
+fi
+AC_SUBST(AR)
+AC_SUBST(DLLTOOL)
+AC_SUBST(NM)
+AC_SUBST(OBJDUMP)
+AC_SUBST(PKG_CONFIG)
+AC_SUBST(RANLIB)
+AC_SUBST(STRIP)
+AC_SUBST(WINDRES)
+
+dnl ===================================================================
+dnl pkg-config checks on Mac OS X
+dnl ===================================================================
+
+if test $_os = Darwin; then
+   AC_MSG_CHECKING([for bogus pkg-config])
+   if test -n "$PKG_CONFIG"; then
+      if test "$PKG_CONFIG" = /usr/bin/pkg-config && ls -l /usr/bin/pkg-config | grep -q Mono.framework; then
+         AC_MSG_RESULT([yes, from Mono])
+      else
+         AC_MSG_RESULT([yes, from unknown origin])
+      fi
+      AC_MSG_WARN([This might have unexpected consequences, please consider hiding $PKG_CONFIG])
+      echo "Having a $PKG_CONFIG might have unexpected consequences, please consider hiding it" >>warn
+   else
+      AC_MSG_RESULT([no])
+   fi
+fi
+
+dnl ===================================================================
+dnl  .NET needs special treatment
+dnl (does the above comment really mean .NET, or is it misusing
+dnl that to mean Visual Studio .NET 2003 ? And does this also
+dnl in fact apply equally to what we actually support, i.e.
+dnl Visual Studio 2008 and 2010?)
+dnl ===================================================================
+if test "$build_os" = "cygwin"; then
+    dnl Check midl.exe
+    AC_PATH_PROG(MIDL_PATH, midl.exe)
+    if test -n "$MIDL_PATH";then
+        MIDL_PATH=`dirname "$MIDL_PATH"`
+    fi
+    if test -n "$with_midl_path";then
+        with_midl_path=`cygpath -u "$with_midl_path"`
+    fi
+    if test -x "$with_midl_path/midl.exe"; then
+        MIDL_PATH="$with_midl_path"
+    fi
+    if test -z "$MIDL_PATH" -a -e "$with_cl_home/../Common7/Tools/Bin/midl.exe"; then
+        MIDL_PATH="$with_cl_home/../Common7/Tools/Bin"
+    fi
+    if test -z "$MIDL_PATH" ; then
       vstest=`./oowintool --msvs-productdir`;
       if test -x "$vstest/Common7/Tools/Bin/midl.exe" ; then
-		  MIDL_PATH="$vstest/Common7/Tools/Bin"
+          MIDL_PATH="$vstest/Common7/Tools/Bin"
       fi
-	fi
-	if test -z "$MIDL_PATH" ; then
-		psdktest=`./oowintool --psdk-home`
-		if test -x "$psdktest/Bin/midl.exe" ; then
-			MIDL_PATH="$psdktest/Bin"
-		fi
-	fi
-	if test ! -x "$MIDL_PATH/midl.exe"; then
-		AC_MSG_ERROR([midl.exe not found. Make sure it's in the path or use --with-midl-path])
-	fi
-	# Convert to posix path with 8.3 filename restrictions ( No spaces )
-	MIDL_PATH=`cygpath -d "$MIDL_PATH"`
-	MIDL_PATH=`cygpath -u "$MIDL_PATH"`
-
-	dnl Check csc.exe
-	AC_PATH_PROG(CSC_PATH, csc.exe)
-	if test -n "$CSC_PATH";then
-		CSC_PATH=`dirname "$CSC_PATH"`
-	fi
-	if test -n "$with_csc_path";then
-		with_csc_path=`cygpath -u "$with_csc_path"`
-	fi
-	if test -x "$with_csc_path/csc.exe"; then
-		CSC_PATH="$with_csc_path"
-	else
-	   csctest=`./oowintool --csc-compilerdir`;
-	   if test -x "$csctest/csc.exe"; then
-	      CSC_PATH="$csctest"
-	   fi
-	fi
-	if test ! -x "$CSC_PATH/csc.exe"; then
-		AC_MSG_ERROR([csc.exe not found. Make sure it's in the path or use --with-csc-path])
-	fi
-	# Convert to posix path with 8.3 filename restrictions ( No spaces )
-	CSC_PATH=`cygpath -d "$CSC_PATH"`
-	CSC_PATH=`cygpath -u "$CSC_PATH"`
-
-    dnl Check mscoree.lib / .NET Frameworks dir
-    dnl For VS2003/2005 $with_frame_home has to point to the directory with lib/mscoree.lib.
-       AC_MSG_CHECKING(.NET Framework)
-	    if test -n "$with_frame_home"; then
-		with_frame_home=`cygpath -u "$with_frame_home"`
-	    fi
-	    if test -f "$with_frame_home/lib/mscoree.lib"; then
-		    FRAME_HOME="$with_frame_home"
-	    fi
-	    if test -z "$FRAME_HOME" -a -e "$with_cl_home/../SDK/v1.1/lib/mscoree.lib"; then
-		    FRAME_HOME="$with_cl_home/../SDK/v1.1"
-	    fi
-	    if test -z "$FRAME_HOME" ; then
+    fi
+    if test -z "$MIDL_PATH" ; then
+        winsdktest=`./oowintool --windows-sdk-home`
+        if test -x "$winsdktest/Bin/midl.exe" ; then
+            MIDL_PATH="$winsdktest/Bin"
+        fi
+    fi
+    if test ! -x "$MIDL_PATH/midl.exe"; then
+        AC_MSG_ERROR([midl.exe not found. Make sure it's in PATH or use --with-midl-path])
+    fi
+    # Convert to posix path with 8.3 filename restrictions ( No spaces )
+    MIDL_PATH=`cygpath -d "$MIDL_PATH"`
+    MIDL_PATH=`cygpath -u "$MIDL_PATH"`
+
+    dnl Check csc.exe
+    AC_PATH_PROG(CSC_PATH, csc.exe)
+    if test -n "$CSC_PATH";then
+        CSC_PATH=`dirname "$CSC_PATH"`
+    fi
+    if test -n "$with_csc_path";then
+        with_csc_path=`cygpath -u "$with_csc_path"`
+    fi
+    if test -x "$with_csc_path/csc.exe"; then
+        CSC_PATH="$with_csc_path"
+    else
+       csctest=`./oowintool --csc-compilerdir`;
+       if test -x "$csctest/csc.exe"; then
+          CSC_PATH="$csctest"
+       fi
+    fi
+    if test ! -x "$CSC_PATH/csc.exe"; then
+        AC_MSG_ERROR([csc.exe not found. Make sure it's in the path or use --with-csc-path])
+    fi
+    # Convert to posix path with 8.3 filename restrictions ( No spaces )
+    CSC_PATH=`cygpath -d "$CSC_PATH"`
+    CSC_PATH=`cygpath -u "$CSC_PATH"`
+
+    dnl Check mscoree.lib / .NET Framework dir
+        AC_MSG_CHECKING(.NET Framework)
+        if test -n "$with_dotnet_framework_home"; then
+        with_dotnet_framework_home=`cygpath -u "$with_dotnet_framework_home"`
+        fi
+        if test -f "$with_dotnet_framework_home/lib/mscoree.lib"; then
+            DOTNET_FRAMEWORK_HOME="$with_dotnet_framework_home"
+        fi
+        if test -z "$DOTNET_FRAMEWORK_HOME" ; then
           frametest=`./oowintool --dotnetsdk-dir`
           if test -f "$frametest/lib/mscoree.lib"; then
-             FRAME_HOME="$frametest"
+             DOTNET_FRAMEWORK_HOME="$frametest"
           else
-             frametest=`./oowintool --psdk-home`
+             frametest=`./oowintool --windows-sdk-home`
              if test -f "$frametest/lib/mscoree.lib"; then
-                FRAME_HOME="$frametest"
+                DOTNET_FRAMEWORK_HOME="$frametest"
              fi
           fi
-	    fi
-	    if test ! -f "$FRAME_HOME/lib/mscoree.lib"; then
-		AC_MSG_ERROR([mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home])
-	    fi
-	    AC_MSG_RESULT(found)
-	# Convert to posix path with 8.3 filename restrictions ( No spaces )
-	FRAME_HOME=`cygpath -d "$FRAME_HOME"`
-	FRAME_HOME=`cygpath -u "$FRAME_HOME"`
-fi
-AC_SUBST(MIDL_PATH)
-AC_SUBST(CSC_PATH)
-AC_SUBST(FRAME_HOME)
+        fi
+        if test ! -f "$DOTNET_FRAMEWORK_HOME/lib/mscoree.lib"; then
+            AC_MSG_ERROR([mscoree.lib (.NET Framework) not found. Make sure you use --with-dotnet-framework-home])
+        fi
+        AC_MSG_RESULT(found)
+    # Convert to posix path with 8.3 filename restrictions ( No spaces )
+    DOTNET_FRAMEWORK_HOME=`cygpath -d "$DOTNET_FRAMEWORK_HOME"`
+    DOTNET_FRAMEWORK_HOME=`cygpath -u "$DOTNET_FRAMEWORK_HOME"`
+    AC_SUBST(MIDL_PATH)
+    AC_SUBST(CSC_PATH)
+    AC_SUBST(DOTNET_FRAMEWORK_HOME)
 fi
 
 dnl ===================================================================
-dnl Check if stdc headers are available excluding windows.
+dnl Check if stdc headers are available excluding MSVC.
 dnl ===================================================================
-if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
+if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
    AC_HEADER_STDC
 fi
 
-dnl ===================================================================
-dnl Find pre-processors.
-dnl ===================================================================
-if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
+if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
+   dnl ===================================================================
+   dnl Find pre-processors.
+   dnl ===================================================================
+
    AC_PROG_CXXCPP
 
-dnl Check whether there's a C pre-processor.
-dnl ===================================================================
-dnl When using SunStudio compiler, there is a bug with the cc
-dnl preprocessor, so use CC preprocessor as the cc preprocessor
-dnl See Issuezilla #445.
-dnl ===================================================================
+   dnl Check whether there's a C pre-processor.
+   dnl ===================================================================
+   dnl When using SunStudio compiler, there is a bug with the cc
+   dnl preprocessor, so use CC preprocessor as the cc preprocessor
+   dnl See Issuezilla #445.
+   dnl ===================================================================
    if test "$_os" = "SunOS"; then
       CPP=$CXXCPP
    else
       AC_PROG_CPP
    fi
-fi
-
-AC_CHECK_SIZEOF(long)
-SIZEOF_LONG=$ac_cv_sizeof_long
-AC_SUBST(SIZEOF_LONG)
-AC_C_BIGENDIAN
-WORDS_BIGENDIAN=$ac_cv_c_bigendian
-AC_SUBST(WORDS_BIGENDIAN)
 
-dnl Check for large file support
-AC_SYS_LARGEFILE
-if test -n "$ac_cv_sys_file_offset_bits"; then
-   LFS_CFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
-fi
-if test -n "$ac_cv_sys_large_files" && test "$ac_cv_sys_large_files" != "no"; then
-   LFS_CFLAGS="$LFS_CFLAGS -D_LARGE_FILES"
+   dnl Find integral type sizes and alignments
+
+   AC_CHECK_SIZEOF(long)
+   AC_CHECK_SIZEOF(short)
+   AC_CHECK_SIZEOF(int)
+   AC_CHECK_SIZEOF(long long)
+   AC_CHECK_SIZEOF(double)
+   AC_CHECK_SIZEOF(void*)
+
+   SIZEOF_SHORT=$ac_cv_sizeof_short
+   SIZEOF_INT=$ac_cv_sizeof_int
+   SIZEOF_LONG=$ac_cv_sizeof_long
+   SIZEOF_LONGLONG=$ac_cv_sizeof_long_long
+   SIZEOF_DOUBLE=$ac_cv_sizeof_double
+   SIZEOF_POINTER=$ac_cv_sizeof_voidp
+
+   dnl Allow build without AC_CHECK_ALIGNOF, grrr
+   m4_pattern_allow([AC_CHECK_ALIGNOF])
+   m4_ifdef([AC_CHECK_ALIGNOF],
+      ,
+      [
+         dnl We know that the ALIGNOF_ variables are used only when cross-compiling
+         dnl in sal/typesconfig/makefile.mk...
+         if test "$cross_compiling" = "yes"; then
+            AC_MSG_ERROR([When cross-compiling you must use a recent Autoconf with [AC_][CHECK_ALIGNOF]])
+         fi
+         m4_define([AC_CHECK_ALIGNOF],
+            [
+               AC_MSG_WARN([Cannot determine alignment of $1])
+               AS_TR_SH([ac_cv_alignof_$3])=unknown
+            ])
+      ])
+
+   AC_CHECK_ALIGNOF(short,[#include <stddef.h>])
+   AC_CHECK_ALIGNOF(int,[#include <stddef.h>])
+   AC_CHECK_ALIGNOF(long,[#include <stddef.h>])
+   AC_CHECK_ALIGNOF(double,[#include <stddef.h>])
+
+   ALIGNOF_SHORT=$ac_cv_alignof_short
+   ALIGNOF_INT=$ac_cv_alignof_int
+   ALIGNOF_LONG=$ac_cv_alignof_long
+   ALIGNOF_DOUBLE=$ac_cv_alignof_double
+
+   AC_C_BIGENDIAN
+   WORDS_BIGENDIAN=$ac_cv_c_bigendian
+
+   dnl Check for large file support
+   AC_SYS_LARGEFILE
+   if test -n "$ac_cv_sys_file_offset_bits"; then
+      LFS_CFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
+   fi
+   if test -n "$ac_cv_sys_large_files" && test "$ac_cv_sys_large_files" != "no"; then
+      LFS_CFLAGS="$LFS_CFLAGS -D_LARGE_FILES"
+   fi
+else
+   # Hardcode for MSVC
+   SIZEOF_SHORT=2
+   SIZEOF_INT=4
+   SIZEOF_LONG=4
+   SIZEOF_LONGLONG=8
+   if test "$CL_X64" = ""; then
+     SIZEOF_POINTER=4
+   else
+     SIZEOF_POINTER=8
+   fi
+   ALIGNOF_SHORT=2
+   ALIGNOF_INT=4
+   ALIGNOF_LONG=4
+   ALIGNOF_DOUBLE=8
+   WORDS_BIGENDIAN=no
+   LFS_CFLAGS=''
 fi
+AC_SUBST(WORDS_BIGENDIAN)
 AC_SUBST(LFS_CFLAGS)
 
+AC_SUBST(SIZEOF_SHORT)
+AC_SUBST(SIZEOF_INT)
+AC_SUBST(SIZEOF_LONG)
+AC_SUBST(SIZEOF_LONGLONG)
+AC_SUBST(SIZEOF_DOUBLE)
+AC_SUBST(SIZEOF_POINTER)
+AC_SUBST(ALIGNOF_SHORT)
+AC_SUBST(ALIGNOF_INT)
+AC_SUBST(ALIGNOF_LONG)
+AC_SUBST(ALIGNOF_DOUBLE)
+
 dnl ===================================================================
-dnl Check if valgrind.h is available 
+dnl Check if valgrind.h is available
 dnl ===================================================================
-if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then
+if test "$cross_compiling" != "yes" -a "$enable_dbgutil" != "no"; then
    dnl Test $prefix (currently only testing for /usr and /usr/local)
    dnl so that VALGRIND_CFLAGS = -I$prefix/include/valgrind
    VALGRIND_CFLAGS=""
@@ -1995,76 +2670,16 @@ fi
 AC_SUBST([VALGRIND_CFLAGS])
 
 dnl ===================================================================
-dnl Check if cups/cups.h is available 
-dnl ===================================================================
-if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then
-    AC_CHECK_HEADER(cups/cups.h, [],
-                    [AC_MSG_ERROR([cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?])], [])
-fi
-
-dnl ===================================================================
-dnl Check if PAM/pam_appl.h is available on Linux or FreeBSD
+dnl Testing for C++ compiler and version...
 dnl ===================================================================
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "GNU"; then
-  AC_MSG_CHECKING([whether to enable pam support])
-  if test -z "$enable_pam" || test "$enable_pam" != "no"; then
-    AC_MSG_RESULT([yes])
-    PAM=YES
-    AC_CHECK_HEADER(security/pam_appl.h, [],
-                    [AC_MSG_ERROR([pam_appl.h could not be found. libpam-dev or pam-devel missing?])], [])
-    AC_MSG_CHECKING([whether to link to libpam])
-    if test -n "$enable_pam_link" -a "$enable_pam_link" != "no"; then
-      AC_MSG_RESULT([yes])
-      PAM_LINK=YES
-      AC_CHECK_LIB(pam, pam_start, [],
-          [AC_MSG_ERROR(libpam not found or functional)], [])
-    else
-      AC_MSG_RESULT([no, dynamically open it])
-      PAM_LINK=NO
-    fi
-  else
-    AC_MSG_RESULT([no])
-    PAM=NO
-    PAM_LINK=NO
-    dnl check getspnam_r for needed args (4 or 5)
-    AX_FUNC_WHICH_GETSPNAM_R
-  fi
-fi
-AC_SUBST(PAM)
-AC_SUBST(NEW_SHADOW_API)
-AC_SUBST(PAM_LINK)
-
-if test "$_os" = "Linux"; then
-    AC_MSG_CHECKING([whether to link to libcrypt])
-    if test -n "$enable_crypt_link" -a "$enable_crypt_link" != "no"; then
-        AC_MSG_RESULT([yes])
-        CRYPT_LINK=YES
-        AC_CHECK_LIB(crypt, crypt, [],
-            [AC_MSG_ERROR(libcrypt not found or functional)], [])
-    else
-        AC_MSG_RESULT([no, dynamically open it])
-        CRYPT_LINK=NO
-    fi
-fi
-AC_SUBST(CRYPT_LINK)
-
-dnl ===================================================================
-dnl Testing for c++ compiler and version...
-dnl ===================================================================
-if test -n "$with_gcc_home"; then
-   if test -z "$CXX"; then
-      CXX="$with_gcc_home/bin/g++"
-   fi
-fi
-
-if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
-   if test -e "$CC"; then
+if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
+   if test -n "$CC" -a -z "$CXX"; then
       CXX="$CC"
    fi
 fi
 
 dnl Autoconf 2.53 can do this test for cl.exe, 2.13 can't!
-if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
+if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
    AC_PROG_CXX
 fi
 
@@ -2115,7 +2730,7 @@ main (void)
   test (E0);
   return 0;
 }
-],[AC_MSG_ERROR([your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details.])], [AC_MSG_RESULT([no])])
+],[AC_MSG_ERROR([your version of the GNU C++ compile has a bug which prevents LibreOffice from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details.])], [AC_MSG_RESULT([no])])
    fi
 fi
 
@@ -2123,7 +2738,7 @@ dnl ===================================================================
 dnl Set the gcc/gxx include directories
 dnl ===================================================================
 # Removed the special FreeBSD treatment. The problem was that with_gxx_include_path
-# often contains an i386 which is expanded as a macro. Solved in stlport.
+# often contains an i386 which is expanded as a macro.
 if test "$GXX" = "yes"; then
    AC_MSG_CHECKING([for g++ include path])
    if test -z "$with_gxx_include_path"; then
@@ -2131,7 +2746,7 @@ if test "$GXX" = "yes"; then
       if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then
           with_gxx_include_path="/usr/include"
       fi
-      if test "$WITH_MINGWIN" = "yes"; then
+      if test "$build_os" = "cygwin" -a "$WITH_MINGW" = "yes"; then
          with_gxx_include_path=`cygpath -d "$with_gxx_include_path"`
          with_gxx_include_path=`cygpath -u "$with_gxx_include_path"`
       fi
@@ -2140,30 +2755,32 @@ if test "$GXX" = "yes"; then
          with_gxx_include_path=`cd $with_gxx_include_path && pwd`
       fi
    fi
-fi
-dnl This is the original code...
-dnl with_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include 
-if test -z "$with_gxx_include_path"; then
-   with_gxx_include_path="NO_GXX_INCLUDE"
-   AC_MSG_RESULT([no g++ includes])
+   dnl This is the original code...
+   dnl with_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
+   if test -z "$with_gxx_include_path"; then
+      with_gxx_include_path="NO_GXX_INCLUDE"
+      AC_MSG_RESULT([none])
+   else
+      AC_MSG_RESULT([$with_gxx_include_path])
+   fi
 else
-   AC_MSG_RESULT([$with_gxx_include_path])
+   with_gxx_include_path="NO_GXX_INCLUDE"
 fi
 GXX_INCLUDE_PATH="$with_gxx_include_path"
 AC_SUBST(GXX_INCLUDE_PATH)
 
 dnl ===================================================================
-dnl Set the mingw runtime library include directories
+dnl Set the MinGW include directories
 dnl ===================================================================
-if test "$WITH_MINGWIN" = "yes"; then
-   AC_MSG_CHECKING([for mingwin runtime include path])
+if test "$WITH_MINGW" = "yes"; then
+   AC_MSG_CHECKING([for MinGW runtime include path])
    cat >conftest.$ac_ext <<_ACEOF
 #include <stddef.h>
 #include <bits/c++config.h>
 _ACEOF
    _mingw_lib_include_path=`$CXX -E -xc++ conftest.$ac_ext | $SED -n -e '/.*1*"\(.*\)\/stddef.h".*/s//\1/p' -e '/.*1*"\(.*\)\/bits\/c++config.h".*/s//\1/p' | sort -u | xargs echo`
    rm conftest.$ac_ext
-   if test -n "$_mingw_lib_include_path"; then
+   if test "$build_os" = "cygwin" -a -n "$_mingw_lib_include_path"; then
       _temp=""
       for a in $_mingw_lib_include_path
          do
@@ -2174,35 +2791,37 @@ _ACEOF
    fi
    if test -z "$_mingw_lib_include_path"; then
       _mingw_lib_include_path="NO_LIB_INCLUDE"
-      AC_MSG_RESULT([no mingwin runtime includes])
+      AC_MSG_RESULT([no MinGW include path])
    else
       AC_MSG_RESULT([$_mingw_lib_include_path])
    fi
   MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path"
   AC_SUBST(MINGW_LIB_INCLUDE_PATH)
 dnl mingw gcc 4.4.0 needs backward in include path to use hash_set/hash_map
-   AC_MSG_CHECKING([for mingwin c++ backward include path])
+   AC_MSG_CHECKING([for MinGW C++ backward include path])
    cat >conftest.$ac_ext <<_ACEOF
 #include <hash_set>
 _ACEOF
    _mingw_backward_include_path=`$CXX -E -xc++ -Wno-deprecated conftest.$ac_ext 2>&5| $SED -n -e '/.*1*"\(.*\)\/hash_set".*/s//\1/p' | sort -u | xargs echo`
    rm conftest.$ac_ext
-   if test -n "$_mingw_backward_include_path"; then
+   if test "$build_os" = "cygwin" -a -n "$_mingw_backward_include_path"; then
       _mingw_backward_include_path=`cygpath -d $_mingw_backward_include_path`
       _mingw_backward_include_path=`cygpath -u $_mingw_backward_include_path`
       AC_MSG_RESULT([$_mingw_backward_include_path])
    else
       _mingw_backward_include_path="NO_BACKWARD_INCLUDE"
-      AC_MSG_RESULT([no mingwin c++ backward includes])
+      AC_MSG_RESULT([no MinGW C++ backward includes])
    fi
   MINGW_BACKWARD_INCLUDE_PATH="$_mingw_backward_include_path"
   AC_SUBST(MINGW_BACKWARD_INCLUDE_PATH)
   mingw_crtbegin=`$CC -print-file-name=crtbegin.o`
   MINGW_CLIB_DIR=`dirname $mingw_crtbegin`
+
+  # How to do this crack when cross-compiling?
   AC_MSG_CHECKING([whether to use dynamic libgcc])
-  if test -e "$MINGW_CLIB_DIR/libgcc_s.a"; then
+  if test "$build_os" = "cygwin" -a -e "$MINGW_CLIB_DIR/libgcc_s.a"; then
     AC_MSG_CHECKING([dynamic libgcc name])
-    MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | sed -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | sed -e 's@_@?@g'`
+    MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | $SED -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | $SED -e 's@_@?@g'`
     MINGW_GCCDLL=`cd $COMPATH/bin && ls $MINGW_GCCDLL_pattern 2>/dev/null`
     if test -n "$MINGW_GCCDLL"; then
         MINGW_SHARED_GCCLIB=YES
@@ -2216,6 +2835,7 @@ _ACEOF
   if test -e "$MINGW_CLIB_DIR/libgcc_eh.a"; then
       MINGW_GCCLIB_EH=YES
   fi
+
   AC_MSG_CHECKING([whether to use dynamic libstdc++])
   MINGW_SHARED_LIBSTDCPP=
   if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then
@@ -2224,7 +2844,7 @@ _ACEOF
   if test -e "$MINGW_CLIB_DIR/libstdc++.dll.a" ; then
     MINGW_SHARED_LIBSTDCPP=stdc++.dll
   fi
-  if test -n "$MINGW_SHARED_LIBSTDCPP" ; then
+  if test "$build_os" = "cygwin" -a -n "$MINGW_SHARED_LIBSTDCPP" ; then
     AC_MSG_CHECKING([dynamic libstdc++ name])
     MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/lib$MINGW_SHARED_LIBSTDCPP.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'`
     MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`
@@ -2239,7 +2859,7 @@ _ACEOF
   else
     AC_MSG_RESULT([no])
   fi
-  MINGW_CLIB_DIR=`cygpath $MINGW_CLIB_DIR`
+  test "$build_os" = "cygwin" && MINGW_CLIB_DIR=`cygpath $MINGW_CLIB_DIR`
   AC_SUBST(MINGW_CLIB_DIR)
   AC_SUBST(MINGW_SHARED_GCCLIB)
   AC_SUBST(MINGW_GCCLIB_EH)
@@ -2250,7 +2870,7 @@ _ACEOF
 fi
 
 dnl ===================================================================
-dnl Extra checking for the SUN OS compiler
+dnl Extra checking for the SunOS compiler
 dnl ===================================================================
 if test "$_os" = "SunOS"; then
    dnl SunStudio C++ compiler packaged with SunStudio C compiler
@@ -2260,173 +2880,90 @@ if test "$_os" = "SunOS"; then
          AC_MSG_WARN([SunStudio C++ was not found])
          echo "SunStudio C++ was not found" >> warn
       else
-         AC_MSG_RESULT([checked]) 
+         AC_MSG_RESULT([checked])
       fi
-   fi 
-fi
-dnl ===================================================================
-dnl Extra checking for the OSF compiler
-dnl ===================================================================
-if test "$_os" = "OSF1"; then
-   AC_MSG_CHECKING([Compaq C++ compiler version])
-   dnl cxx -V outputs to standard error!!!!
-   _compaqcxx_version=`$CXX -V 2>&1 | $AWK '{ print $3 }'`
-   _compaqcxx_major=`echo $_compaqcxx_version | $AWK -F. '{ print $1 }'`
-   if test "$_compaqcxx_major" != "V6"; then
-      AC_MSG_WARN([found version "$_compaqc_version", use version 6 of the Compaq C++ compiler])
-      echo "found version $_compaqc_version, use version 6 of the Compaq C++ compiler" >> warn
-   else
-      dnl compiler will do
-      AC_MSG_RESULT([checked])
    fi
 fi
 
 dnl *************************************************************
 dnl Testing for exception handling - dwarf2 or sjlj exceptions...
 dnl *************************************************************
-AC_MSG_CHECKING([exception type])
-AC_LANG_PUSH([C++])
-if test "$WITH_MINGWIN" = "yes"; then
+if test "$WITH_MINGW" = "yes"; then
+  AC_MSG_CHECKING([exception type])
+  AC_LANG_PUSH([C++])
   AC_TRY_LINK(
-	[#include <iostream>
+    [#include <iostream>
 
 extern "C" void _Unwind_SjLj_RaiseException(void) __attribute__ ((__noreturn__));
 
-	],
-	[_Unwind_SjLj_RaiseException() ],
-	[exceptions_type="sjlj"],
-	[exceptions_type="dwarf2"]
+    ],
+    [_Unwind_SjLj_RaiseException() ],
+    [exceptions_type="sjlj"],
+    [exceptions_type="dwarf2"]
   )
+  AC_MSG_RESULT($exceptions_type)
+  AC_LANG_POP([C++])
 fi
 
-AC_MSG_RESULT($exceptions_type)
-AC_LANG_POP([C++])
 EXCEPTIONS="$exceptions_type"
 AC_SUBST(EXCEPTIONS)
 
 dnl ===================================================================
 dnl Checks for what the default STL should be
 dnl ===================================================================
-   AC_MSG_CHECKING([what the default STL should be])
-   DEFAULT_TO_STLPORT="no"
-   if test "$_os" = "Linux"; then
-     case "$build_cpu" in
-       i?86)
-	 case "$build_os" in k*bsd*-gnu*)
-	 	DEFAULT_TO_STLPORT="no"
-		;;
-	 *) 
-         	DEFAULT_TO_STLPORT="yes"
-		;;
-	  esac
-         ;;
-       *)
-         DEFAULT_TO_STLPORT="no"
-         ;;
-     esac
-   elif test "$_os" = "SunOS"; then
-      DEFAULT_TO_STLPORT="yes"
-   elif test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
-      DEFAULT_TO_STLPORT="yes"
-   elif test "$_os" = "OS2"; then
-      DEFAULT_TO_STLPORT="yes" 
-   elif test "$_os" = "FreeBSD"; then
-      DEFAULT_TO_STLPORT="yes"
-   fi
-   if test "$DEFAULT_TO_STLPORT" = "yes"; then
-      AC_MSG_RESULT([stlport])
-   else
-      AC_MSG_RESULT([system])
-   fi
-   if test "$WITH_STLPORT" = "auto"; then
-      WITH_STLPORT=$DEFAULT_TO_STLPORT
-   fi
-
-dnl ===================================================================
-dnl Checks for STLPORT
-dnl ===================================================================
-   AC_MSG_CHECKING([for STL providing headers])
-   STLPORT4=""
-   USE_SYSTEM_STL=""
-   if test "$WITH_STLPORT" = "yes"; then
-      AC_MSG_RESULT([using internal stlport.])
-      if test "$DEFAULT_TO_STLPORT" != "yes"; then
-         AC_MSG_WARN([using stlport. Warning, breaks your ABI compatability!])
-         echo "using stlport. Warning, breaks your ABI compatability!" >>warn
-      fi
-   elif test "$WITH_STLPORT" = "no"; then
-      AC_MSG_RESULT([using system STL])
-      USE_SYSTEM_STL="YES"
-      if test "$DEFAULT_TO_STLPORT" != "no"; then
-         AC_MSG_WARN([using system STL. Warning, breaks your ABI compatability!])
-         echo "using system STL. Warning, breaks your ABI compatability!" >>warn
-      fi
-   else
-      STLPORT4=$WITH_STLPORT
-      if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
-         AC_TRY_CPP($STLPORT4/stlport/hash_map, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([STLport headers not found.]))
-      else
-         dnl AC_TRY_CPP doesn't work for MSVC because C++ preprocessor is not found by autoconf.
-         if test -f "$STLPORT4/stlport/hash_map"; then
-            AC_MSG_RESULT([checked.])
-         else
-            AC_MSG_ERROR([STLport headers not found.])
-         fi
-      fi
-      if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
-         AC_MSG_CHECKING([for STLport libraries])
-         if test "$_os" = "SunOS"; then
-		      if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then
-			      AC_MSG_RESULT([checked])
-		      elif test -f "$STLPORT4/lib/libstlport.so"; then
-			      AC_MSG_RESULT([checked])
-			      STLPORT_VER=500
-		      else
-			      AC_MSG_ERROR([STLport libraries not found])
-		      fi
-	      elif test "$_os" = "Darwin"; then
-		      if test -f "$STLPORT4/lib/libstlport_gcc.dylib"; then
-			      AC_MSG_RESULT([checked])
-		      elif test -f "$STLPORT4/lib/libstlport.dylib"; then
-			      AC_MSG_RESULT([checked])
-			      STLPORT_VER=500
-		      else
-			      AC_MSG_ERROR([STLport libraries not found])
-		      fi
-		   else
-			   if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
-				   AC_MSG_RESULT([checked])
-			   elif test -f "$STLPORT4/lib/libstlport.so"; then
-				   AC_MSG_RESULT([checked])
-				   STLPORT_VER=500
-			   else
-				   AC_MSG_ERROR([STLport libraries not found])
-			   fi
-		   fi
-	   fi
-      if test "$DEFAULT_TO_STLPORT" != "yes"; then
-         AC_MSG_WARN([using stlport. Warning, breaks your ABI compatability!])
-         echo "using stlport. Warning, breaks your ABI compatability!" >>warn
-      fi
-   fi
+AC_MSG_CHECKING([Whether building STLPort library makes sense])
+BUILD_STLPORT="no"
+if test "$_os" = "Linux"; then
+  case "$host_cpu" in
+    i?86)
+      case "$host_os" in k*bsd*-gnu*)
+        BUILD_STLPORT="no"
+        ;;
+      *)
+        BUILD_STLPORT="yes"
+        ;;
+      esac
+      ;;
+    *)
+      BUILD_STLPORT="no"
+      ;;
+  esac
+elif test "$_os" = "SunOS"; then
+   BUILD_STLPORT="yes"
+elif test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
+   BUILD_STLPORT="yes"
+elif test "$_os" = "FreeBSD"; then
+   BUILD_STLPORT="yes"
+fi
+if test "$BUILD_STLPORT" = "yes" ; then
+   AC_MSG_RESULT([yes])
+else
+   AC_MSG_RESULT([no])
+fi
 
-if test -z "$STLPORT4"; then
-  STLPORT4="NO_STLPORT4"
+AC_MSG_CHECKING([Whether STLPort library will be actually built])
+if test "$with_stlport" = "auto" -o "$BUILD_STLPORT" = "no"; then
+   with_stlport=$BUILD_STLPORT
 fi
-if test -z "$STLPORT_VER"; then
-  STLPORT_VER=400
+if test "$with_stlport" = "yes" ; then
+   AC_MSG_RESULT([yes])
+       WITH_STLPORT=YES
+       SCPDEFS="$SCPDEFS -DWITH_STLPORT"
+       BUILD_TYPE="$BUILD_TYPE STLPORT"
+else
+   WITH_STLPORT=NO
+   AC_MSG_RESULT([no])
 fi
-AC_SUBST(STLPORT4)
-AC_SUBST(STLPORT_VER)
-AC_SUBST(USE_SYSTEM_STL)
+
+AC_SUBST(WITH_STLPORT)
 
 dnl ===================================================================
-dnl visibility feature
+dnl visibility and c++0x features
 dnl ===================================================================
 if test "$GCC" = "yes"; then
    AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
    save_CFLAGS=$CFLAGS
-   CFLAGS="$CFLAGS -fvisibility=hidden"
+   CFLAGS="$CFLAGS -Werror -fvisibility=hidden"
    AC_TRY_LINK([], [ return 0; ], [ HAVE_GCC_VISIBILITY_FEATURE=TRUE ], [])
    CFLAGS=$save_CFLAGS
    if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
@@ -2434,39 +2971,76 @@ if test "$GCC" = "yes"; then
    else
       AC_MSG_RESULT([no])
    fi
+
+   AC_MSG_CHECKING([whether $CC supports -std=c++0x without Language Defect 757])
+   save_CXXFLAGS=$CFLAGS
+   CXXFLAGS="$CXXFLAGS -std=c++0x"
+   AC_LANG_PUSH([C++])
+
+   AC_TRY_COMPILE([
+#include <stddef.h>
+
+template <typename T, size_t S> char (&sal_n_array_size( T(&)[S] ))[S];
+
+namespace
+{
+	struct b
+	{
+		int i;
+		int j;
+	};
+}
+],[
+struct a
+{
+	int i;
+	int j;
+};
+a thinga[]={{0,0}, {1,1}};
+b thingb[]={{0,0}, {1,1}};
+size_t i = sizeof(sal_n_array_size(thinga));
+size_t j = sizeof(sal_n_array_size(thingb));
+return !(i != 0 && j != 0);
+], HAVE_CXX0X=TRUE,)
+
+   AC_LANG_POP([C++])
+   CXXFLAGS=$save_CXXFLAGS
+   if test "$HAVE_CXX0X" = "TRUE"; then
+      AC_MSG_RESULT([yes])
+   else
+      AC_MSG_RESULT([no])
+   fi
 fi
 
+AC_SUBST(HAVE_CXX0X)
+
 # ===================================================================
-# use --ccache-skip?
+# use ccache?
 # ===================================================================
-dnl used to escape compiler options for ccache that otherwise prevent 
+dnl need to check for ccache version: otherwise prevents
 dnl caching of the results (like "-x objective-c++" for Mac)
-AC_MSG_CHECKING([whether we are allowed and able to use --ccache-skip])
+AC_MSG_CHECKING([whether we are able to use --ccache-skip])
 if test "$_os" != "Darwin" ; then
    AC_MSG_RESULT([only used on Mac currently, skipping])
-elif test "$enable_ccache_skip" = "no" ; then
-   AC_MSG_RESULT([no - diabled explicitly])
-elif test "$enable_ccache_skip" = "yes" ; then
-   AC_MSG_RESULT([yes - enabled explicitly, skipping checks])
-   AC_SUBST([USE_CCACHE], [YES])
-elif test "$enable_ccache_skip" = "auto" ; then
+else
    # checking for ccache presence/version
    AC_MSG_RESULT([probing...])
    AC_PATH_PROG([CCACHE],[ccache],[not_found])
    if test "$CCACHE" = "not_found" ; then
       AC_MSG_NOTICE([not enabling --ccache-skip (ccache not found)])
    else
-      # check ccache version 
+      # check ccache version
       AC_MSG_CHECKING([whether version of ccache is suitable])
       CCACHE_VERSION=`"$CCACHE" -V | "$AWK" '/^ccache version/{print $3}'`
-      if test "$CCACHE_VERSION" = "2.4_OOo"; then
+      CCACHE_NUMVER=`echo $CCACHE_VERSION | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
+      if test "$CCACHE_VERSION" = "2.4_OOo" -o "$CCACHE_NUMVER" -ge "030100"; then
          AC_MSG_RESULT([yes])
          AC_MSG_CHECKING([whether ccache is actually used for the build])
          AC_LANG_PUSH([C++])
          save_CXXFLAGS=$CXXFLAGS
          CXXFLAGS="$CXXFLAGS --ccache-skip -O2"
          dnl an empty program will do, we're checking the compiler flags
-         AC_COMPILE_IFELSE(AC_LANG_PROGRAM([],[]), 
+         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
             [use_ccache=yes], [use_ccache=no])
          if test $use_ccache = yes ; then
             AC_MSG_RESULT([yes, will enable --ccache-skip])
@@ -2478,30 +3052,18 @@ elif test "$enable_ccache_skip" = "auto" ; then
          AC_LANG_POP([C++])
       else
          AC_MSG_RESULT([no])
-         AC_MSG_NOTICE([ccache version $CCACHE_VERSION not accepted. See description for --enable-ccache-skip])
+         AC_MSG_NOTICE([ccache version $CCACHE_VERSION not accepted. ccache will not be used.])
       fi
    fi
-else
-   AC_MSG_ERROR([invalid option to --enable-ccache-skip. Valid values are "auto", "yes" and "no"])
 fi
 
 dnl ===================================================================
 dnl system stl sanity tests
 dnl ===================================================================
-if test "$USE_SYSTEM_STL" = "YES"; then
-   AC_MSG_CHECKING([if hash_map will be in __gnu_cxx namespace])
-   AC_LANG_PUSH([C++])
+HAVE_GCC_VISIBILITY_BROKEN=
+if test \( "$_os" != "WINNT" -o "$WITH_MINGW" = "yes" \) ; then
 
-   AC_TRY_COMPILE([#include <ext/hash_map>
-using namespace __gnu_cxx;
-],[hash_map<int, int> t; return 0;],
-  ac_cv_cxx_have_ext_hash_map=yes, ac_cv_cxx_have_ext_hash_map=no)
-
-   if test "$ac_cv_cxx_have_ext_hash_map" = "no"; then
-      AC_MSG_ERROR([Can't find hash_map. Try with --with-stlport])
-   else
-      AC_MSG_RESULT([$ac_cv_cxx_have_ext_hash_map])
-   fi
+   AC_LANG_PUSH([C++])
 
    if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
       AC_MSG_CHECKING([if STL headers are visibility safe])
@@ -2523,13 +3085,13 @@ using namespace __gnu_cxx;
 using namespace std;
 ],[istringstream strm( "test" ); return 0;],
       $EGREP -q  unresolvable conftest.err;
-      if test $? -eq 0; then gccvisok=no; else gccvisok=yes; fi, 
+      if test $? -eq 0; then gccvisok=no; else gccvisok=yes; fi,
       gccvisok=no)
       AC_MSG_RESULT([$gccvisok])
       if test "$gccvisok" = "no"; then
-         AC_MSG_WARN([Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility])
-         echo "Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >> warn
-         unset HAVE_GCC_VISIBILITY_FEATURE
+         AC_MSG_WARN([Your gcc is not -fvisibility-inlines-hidden safe, disabling that.])
+         echo "Your gcc is not -fvisibility-inlines-hidden safe, disabling that." >> warn
+         HAVE_GCC_VISIBILITY_BROKEN="TRUE"
       fi
 
       LDFLAGS=$sharedlink_ldflags_save
@@ -2549,12 +3111,16 @@ _ACEOF
       if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx 2>/dev/null > /dev/null; then
          gccvisbroken=yes
       else
-         case "$build_cpu" in
+         case "$host_cpu" in
             i?86|x86_64)
-               if $EGREP -q '@PLT' visibility.s; then
+               if test "$_os" = "Darwin"; then
                   gccvisbroken=no
-               else 
-                  gccvisbroken=yes
+               else
+                  if $EGREP -q '@PLT' visibility.s; then
+                     gccvisbroken=no
+                  else
+                     gccvisbroken=yes
+                  fi
                fi
                ;;
             *)
@@ -2576,6 +3142,7 @@ _ACEOF
 fi
 
 AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
+AC_SUBST(HAVE_GCC_VISIBILITY_BROKEN)
 
 dnl ===================================================================
 dnl allocator
@@ -2588,7 +3155,7 @@ if test "$with_alloc" = "system"; then
 fi
 if test "$with_alloc" = "tcmalloc"; then
     AC_MSG_RESULT(tcmalloc)
-    if ! echo $build_cpu | grep -E 'i[[3456]]86' 2>/dev/null >/dev/null; then
+    if ! echo $host_cpu | grep -E 'i[[3456]]86' 2>/dev/null >/dev/null; then
         AC_MSG_ERROR([tcmalloc only available/usable on ix86])
     fi
     AC_CHECK_LIB(tcmalloc, malloc, [],
@@ -2633,61 +3200,105 @@ dnl ===================================================================
 dnl Java support enable
 dnl ===================================================================
 AC_MSG_CHECKING([whether to build with Java support])
-if test "$WITH_JAVA" != "no"; then
+if test "$with_java" != "no"; then
    AC_MSG_RESULT([yes])
    SOLAR_JAVA="TRUE"
 else
    AC_MSG_RESULT([no])
    SOLAR_JAVA=""
-
-   AC_MSG_WARN([building without java will mean some features will not be available])
-   echo "building without java will mean some features will not be available" >>warn
 fi
+
 AC_SUBST(SOLAR_JAVA)
 
-if test "$_os" = "Linux" && test "$build_cpu" = "powerpc"; then
+dnl SOLAR_JAVA (yes, silly name, should rename) indicates whether we
+dnl want there to be *run-time* support for Java extensions in the
+dnl built LibreOffice. We might need a different test for whether
+dnl there is Java at *build-time*.
+
+dnl If we don't have access to Java at build-time we can't have
+dnl run-time Java support either. But I think there are some uses of
+dnl Java at build-time even if no run-time Java support is wanted. Or
+dnl is there? This is a bit unclear to me.
+
+if test "$_os" = "Linux" && test "$host_cpu" = "powerpc"; then
    # IBMs JDK needs this...
    JITC_PROCESSOR_TYPE=6
    export JITC_PROCESSOR_TYPE
 fi
 
-if test "$_os" = "WINNT"; then
-   if test -z "$with_jdk_home"; then
-      _jdk_home=`./oowintool --jdk-home`
-       if test -d "$_jdk_home"; then
-          with_jdk_home="$_jdk_home"
-       fi
-   else
-      with_jdk_home=`cygpath -u "$with_jdk_home"`
-   fi
+if test $_os = "WINNT"; then
+   WITH_VC_REDIST="TRUE"
 fi
+AC_SUBST(WITH_VC_REDIST)
 
 dnl ===================================================================
-dnl Checks for java
+dnl Checks for Java
 dnl ===================================================================
 if test "$SOLAR_JAVA" != ""; then
+
+   # Windows-specific tests
+   if test "$build_os" = "cygwin" -a "$_os" = "WINNT"; then
+      if test "$CL_X64" != ""; then
+	 bitness="64-bit"
+	 otherbitness="32-bit"
+      else
+	 bitness="32-bit"
+	 otherbitness="64-bit"
+      fi
+
+      if test -z "$with_jdk_home"; then
+
+	 # Unfortunately apparently no way to find, if needed, the 64-bit
+	 # JDK in the Registry from the 32-bit Perl oowintool
+
+	 _jdk_home=`./oowintool --jdk-home`
+	 if test -f "$_jdk_home/lib/jvm.lib" -a -f "$_jdk_home/bin/java.exe"; then
+	    with_jdk_home="$_jdk_home"
+	    howfound="found by oowintool"
+	 else
+	    AC_MSG_ERROR([No JDK found by oowintool, pass the --with-jdk-home option pointing to a $bitness JDK])
+	 fi
+      else
+	 test "$build_os" = "cygwin" && with_jdk_home=`cygpath -u "$with_jdk_home"`
+	 howfound="you passed"
+      fi
+   fi
+
    JAVA_HOME=; export JAVA_HOME
    if test -z "$with_jdk_home"; then
-      AC_PATH_PROG(JAVAINTERPRETER, $WITH_JAVA)
+      AC_PATH_PROG(JAVAINTERPRETER, $with_java)
    else
-      _java_path="$with_jdk_home/bin/$WITH_JAVA"
-      dnl Check if there is a java interpreter at all.
+      _java_path="$with_jdk_home/bin/$with_java"
+      dnl Check if there is a Java interpreter at all.
       if test -x "$_java_path"; then
          JAVAINTERPRETER=$_java_path
       else
-         AC_MSG_ERROR([$_java_path not found set with_jdk_home])
+         AC_MSG_ERROR([$_java_path not found, pass --with-jdk-home])
       fi
    fi
-   if test "$_os" = "WINNT"; then
+
+   if test "$build_os" = "cygwin" -a "$_os" = "WINNT"; then
+      # Check that the JDK found is correct architecture
+      # Why is this necessary, we don't link with any library from the JDK I think,
+
+      shortjdkhome=`cygpath -d "$with_jdk_home"`
+      if test "$CL_X64" != "" -a -f "$with_jdk_home/bin/java.exe" -a "`$shortjdkhome/bin/java.exe -version 2>&1 | grep -i 64-bit`" = "" >/dev/null; then
+	 AC_MSG_WARN([You are building 64-bit binaries but the JDK $howfound is 32-bit])
+	 AC_MSG_ERROR([You should pass the --with-jdk-home option pointing to a 64-bit JDK])
+      elif test "$CL_X64" = "" -a -f "$_jdk_home/bin/java.exe" -a "`$shortjdkhome/bin/java.exe -version 2>&1 | grep -i 64-bit`" != ""  >/dev/null; then
+	 AC_MSG_WARN([You are building 32-bit binaries but the JDK $howfound is 64-bit])
+	 AC_MSG_ERROR([You should pass the --with-jdk-home option pointing to a (32-bit) JDK])
+      fi
+
       if test x`echo "$JAVAINTERPRETER" | grep -i '\.exe$'` = x; then
           JAVAINTERPRETER="${JAVAINTERPRETER}.exe"
       fi
       JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"`
       JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"`
    elif test "$_os" = "Darwin"; then
-      dnl HACK:  There currently is only a 32 bit version of OOo for Mac OS X,
-      dnl and Tiger java complains about -d32 while Snow Leopard java needs it
-      dnl to run in 32 bit mode and be able to load OOo jnilibs:
+      dnl HACK:  There currently is only a 32 bit version of LibreOffice for Mac OS X,
+      dnl and Tiger Java complains about -d32 while Snow Leopard Java needs it
+      dnl to run in 32 bit mode and be able to load LibreOffice jnilibs:
       AC_MSG_CHECKING([whether to pass -d32 to Java interpreter])
       if "$JAVAINTERPRETER" -d32 >&5 2>&5; then
          AC_MSG_RESULT([yes])
@@ -2708,60 +3319,21 @@ if test "$SOLAR_JAVA" != ""; then
       dnl java -version sends output to stderr!
       if test `$JAVAINTERPRETER -version 2>&1 | grep -c "Kaffe"` -gt 0; then
          AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in])
-#        dnl Kaffe specific tests
-#        KAFFE_VER=`$JAVAINTERPRETER -version 2>&1 | $EGREP "  Version:" | $SED -r "s/.*  Version: ([[0-9\.]]*).*/\1/"`
-#        if test -z "$KAFFE_VER"; then
-#          AC_MSG_ERROR([looks like Kaffe but version detection failed])
-#        fi
-#        _kaffe_ver=`echo "$KAFFE_VER" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
-#        if test "$_kaffe_ver" -lt 10100; then
-#           AC_MSG_ERROR([Kaffe is too old ($KAFFE_VER - $_kaffe_ver), you need at least 1.1.0])
-#        fi
-#        JDK=kaffe
-#        
-#        dnl TODO: define some project exclusion variables
-#        
-#        AC_MSG_RESULT([checked (Kaffe $KAFFE_VER)])
-#        AC_MSG_WARN([EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile])
-#        echo "EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile" >>warn
-#        JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
       elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then
         JDK=gcj
-        AC_MSG_RESULT([checked (gcj)]) 
+        AC_MSG_RESULT([checked (gcj)])
         _gij_version=`$JAVAINTERPRETER --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
         _gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
 
-      elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "BEA"` -gt 0; then
+      elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | grep -c "BEA"` -gt 0; then
          AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in])
-#        JDK=bea
-#
-#        dnl BEA JDK specific tests
-#        _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
-#        _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
-#
-#        if test "$_jdk_ver" -lt 10500; then
-#          AC_MSG_ERROR([JDK is too old, you need at least BEA JDK 1.5.0])
-#        fi
-#
-#        AC_MSG_RESULT([checked (BEA JDK $_jdk)])
-#
-#        if test "$with_jdk_home" = ""; then
-#             AC_MSG_ERROR([In order to successfully build OpenOffice.org using the BEA JDK,
-#you must use the "--with-jdk-home" configure option explicitly])
-#        fi
-#
-#        AC_MSG_WARN([A bug in certain BEA JREs can prevent you from successfully compiling some modules])
-#        echo "A bug in certain BEA JREs can prevent you from successfully compiling some modules" >>warn
-#
-#        JAVA_HOME=$with_jdk_home
-#
-      elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "IBM"` -gt 0; then
+      elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | grep -c "IBM"` -gt 0; then
         JDK=ibm
 
         dnl IBM JDK specific tests
         _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
         _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
-   
+
         if test "$_jdk_ver" -lt 10500; then
              AC_MSG_ERROR([IBM JDK is too old, you need at least 1.5])
         fi
@@ -2769,19 +3341,19 @@ if test "$SOLAR_JAVA" != ""; then
         AC_MSG_RESULT([checked (IBM JDK $_jdk)])
 
         if test "$with_jdk_home" = ""; then
-             AC_MSG_ERROR([In order to successfully build OpenOffice.org using the IBM JDK,
+             AC_MSG_ERROR([In order to successfully build LibreOffice using the IBM JDK,
 you must use the "--with-jdk-home" configure option explicitly])
         fi
 
         JAVA_HOME=$with_jdk_home
-	
-      else	
+
+      else
         JDK=sun
 
-        dnl SUN JDK specific tests
+        dnl Sun JDK specific tests
         _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
         _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
-   
+
         if test "$_jdk_ver" -lt 10500; then
              AC_MSG_ERROR([JDK is too old, you need at least 1.5])
         fi
@@ -2790,37 +3362,67 @@ you must use the "--with-jdk-home" configure option explicitly])
         if test "$_os" = "WINNT"; then
           JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[[eE]][[xX]][[eE]]$,,"`
         fi
-        if test "$_os" = "OS2"; then
-          JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[[eE]][[xX]][[eE]]$,,"`
-        fi
       fi
    else
-      AC_MSG_ERROR([JAVA not found. You need at least jdk-1.5, or gcj-4])
+      AC_MSG_ERROR([Java not found. You need at least jdk-1.5, or gcj-4])
    fi
 else
    dnl Java disabled
    JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
 fi
 
+_java_target_ver="1.5"
+dnl ===================================================================
+dnl Check for target Java bytecode version
+dnl ===================================================================
+if test "$SOLAR_JAVA" != ""; then
+    AC_MSG_CHECKING([for target Java bytecode version])
+    if test "$JDK" = "gcj" -o "$JDK" = "kaffe"; then
+    AC_MSG_RESULT([default by $JDK])
+    if test -n "$with_java_target_version" -a "$with_java_target_version" != "no" ; then
+        AC_MSG_WARN([Value defined by --with-java-target-version is ignored!])
+    fi
+    else
+    if test -n "$with_java_target_version" -a "$with_java_target_version" != "no" ; then
+        _java_target_ver="$with_java_target_version"
+        AC_MSG_RESULT([$_java_target_ver])
+    elif test $_jdk_ver -gt 10000 ; then
+        _java_target_ver=`echo "$_jdk_ver" | $AWK '{ maj=substr($0,1,1); min=substr($0,2,2); print int(maj)"."int(min) }'`
+        AC_MSG_RESULT([$_java_target_ver])
+    else
+            AC_MSG_ERROR([Unable to guess Java bytecode version from Java version!])
+    fi
+    fi
+
+    if ! test -z "$_java_target_ver" -o \
+        "$_java_target_ver" = "1.1" -o \
+            "$_java_target_ver" = "1.2" -o \
+        "$_java_target_ver" = "1.3" -o \
+        "$_java_target_ver" = "1.4" -o \
+        "$_java_target_ver" = "1.5" -o \
+        "$_java_target_ver" = "1.6" -o \
+        "$_java_target_ver" = "5" ; then
+        AC_MSG_ERROR([$_java_target_ver is not a supported Java bytecode version!])
+    fi
+
+    JAVA_SOURCE_VER="$_java_target_ver"
+    JAVA_TARGET_VER="$_java_target_ver"
+fi
+
 dnl ===================================================================
 dnl Checks for javac
 dnl ===================================================================
 if test "$SOLAR_JAVA" != ""; then
-    if test "$JDK" = "gcj"; then 
-        javacompiler=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
+    if test "$JDK" = "gcj"; then
+        javacompiler=`echo $with_java | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
     else
         javacompiler="javac"
     fi
-    if test "$_os" = "OS2"; then
-      if test x`echo "$javacompiler" | grep -i '\.exe$'` = x; then
-          javacompiler="${javacompiler}.exe"
-      fi
-    fi
     if test -z "$with_jdk_home"; then
         AC_PATH_PROG(JAVACOMPILER, $javacompiler)
     else
         _javac_path="$with_jdk_home/bin/$javacompiler"
-        dnl Check if there is a java compiler at all.
+        dnl Check if there is a Java compiler at all.
         if test -x "$_javac_path"; then
             JAVACOMPILER=$_javac_path
         fi
@@ -2828,18 +3430,13 @@ if test "$SOLAR_JAVA" != ""; then
     if test -z "$JAVACOMPILER"; then
       AC_MSG_ERROR([$javacompiler not found set with_jdk_home])
     fi
-    if test "$_os" = "WINNT"; then
+    if test "$build_os" = "cygwin" -a "$_os" = "WINNT"; then
        if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then
           JAVACOMPILER="${JAVACOMPILER}.exe"
        fi
        JAVACOMPILER=`cygpath -d "$JAVACOMPILER"`
        JAVACOMPILER=`cygpath -u "$JAVACOMPILER"`
     fi
-    if test "$_os" = "OS2"; then
-       if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then
-          JAVACOMPILER="${JAVACOMPILER}.exe"
-       fi
-    fi
 
     if test `$JAVACOMPILER -version 2>&1 | grep -c "Eclipse Java Compiler"` -gt 0; then
         AC_MSG_CHECKING([re-checking JDK])
@@ -2862,6 +3459,17 @@ if test "$SOLAR_JAVA" != ""; then
 fi
 AC_SUBST(JAVACISGCJ)
 
+JAVACISKAFFE=""
+dnl ===================================================================
+dnl Checks that javac is kaffe
+dnl ===================================================================
+if test "$SOLAR_JAVA" != ""; then
+    if test `$JAVACOMPILER -version 2>&1 | grep -c "Kaffe"` -gt 0; then
+        JAVACISKAFFE="yes"
+    fi
+fi
+AC_SUBST(JAVACISKAFFE)
+
 dnl ===================================================================
 dnl Checks for javadoc
 dnl ===================================================================
@@ -2870,11 +3478,6 @@ if test "$SOLAR_JAVA" != ""; then
         AC_PATH_PROG(JAVADOC, javadoc)
     else
         _javadoc_path="$with_jdk_home/bin/javadoc"
-        if test "$_os" = "OS2"; then
-          if test x`echo "$_javadoc_path" | grep -i '\.exe$'` = x; then
-              _javadoc_path="${_javadoc_path}.exe"
-          fi
-        fi
         dnl Check if there is a javadoc at all.
         if test -x "$_javadoc_path"; then
             JAVADOC=$_javadoc_path
@@ -2885,24 +3488,56 @@ if test "$SOLAR_JAVA" != ""; then
     if test -z "$JAVADOC"; then
       AC_MSG_ERROR([$_javadoc_path not found set with_jdk_home])
     fi
-    if test "$_os" = "WINNT"; then
+    if test "$build_os" = "cygwin" -a "$_os" = "WINNT"; then
         if test x`echo "$JAVADOC" | grep -i '\.exe$'` = x; then
             JAVADOC="${JAVADOC}.exe"
         fi
         JAVADOC=`cygpath -d "$JAVADOC"`
         JAVADOC=`cygpath -u "$JAVADOC"`
     fi
-    if test "$_os" = "OS2"; then
-        if test x`echo "$JAVADOC" | grep -i '\.exe$'` = x; then
-            JAVADOC="${JAVADOC}.exe"
-        fi
-    fi
 fi
 
 if test "$SOLAR_JAVA" != ""; then
-    dnl first check if we have been asked to autodetect JAVA_HOME with a recent gij
-    if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then
-      if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
+   # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
+   if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
+
+   if basename $(readlink $(readlink $JAVACOMPILER)) >/dev/null 2>/dev/null; then
+       # try to recover first by looking whether we have a alternatives
+       # system as in Debian or newer SuSEs where following /usr/bin/javac
+       # over /etc/alternatives/javac leads to the right bindir where we
+       # just need to strip a bit away to get a valid JAVA_HOME
+       JAVA_HOME=$(readlink $(readlink $JAVACOMPILER))
+   elif readlink $JAVACOMPILER >/dev/null 2>/dev/null; then
+       # maybe only one level of symlink (e.g. on Mac)
+       JAVA_HOME=$(readlink $JAVACOMPILER)
+       if test "$(dirname $JAVA_HOME)" = "."; then
+           # we've got no path to trim back
+           JAVA_HOME=""
+       fi
+   else
+       # else warn
+       AC_MSG_WARN([JAVA_HOME is set to /usr - this is very likely to be incorrect])
+       AC_MSG_WARN([if this is the case, please inform the correct JAVA_HOME with --with-jdk-home])
+       echo "JAVA_HOME is set to /usr - this is very likely to be incorrect" >> warn
+       echo "if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >> warn
+   fi
+   dnl now that we have the path to the real javac, make a JAVA_HOME out of it..
+   if test "$JAVA_HOME" != "/usr"; then
+       if test "$_os" = "Darwin"; then
+           dnl Leopard returns a non-suitable path with readlink - points to "Current" only
+           JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/Current/Commands/javac$,/CurrentJDK/Home,)
+           dnl Tiger already returns a JDK path..
+           JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/CurrentJDK/Commands/javac$,/CurrentJDK/Home,)
+       else
+           JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/bin/javac$,,)
+       fi
+   fi
+fi
+# as we drop out of this, JAVA_HOME may have been set to the empty string by readlink
+
+dnl now if JAVA_HOME has been set to empty, then call findhome to find it
+    if test -z "$JAVA_HOME"; then
+      if test "x$with_jdk_home" = "x"; then
         cat > findhome.java <<_ACEOF
 [import java.io.File;
 
@@ -2937,45 +3572,12 @@ _ACEOF
           AC_MSG_ERROR([gij does not know its java.home - use --with-jdk-home])
         fi
       else
-        JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$WITH_JAVA,,p"`
+        JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$with_java,,p"`
       fi
     fi
 
     dnl second sanity check JAVA_HOME if possible
     if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then
-      # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
-      if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
-         javac_link_f=`readlink -f "$JAVACOMPILER" 2>/dev/null`
-         if test $? == 0 && test "$JAVACOMPILER" != "$javac_link_f"; then
-          # try to recover first by looking whether we have a alternatives 
-          # system as in Debian or newer SuSEs where following /usr/bin/javac
-          # over /etc/alternatives/javac leads to the right bindir where we
-          # just need to strip a bit away to get a valid JAVA_HOME
-          # Solaris 11 is even worse, because target is relative, so use -f
-            JAVA_HOME="$javac_link_f"
-         elif readlink $JAVACOMPILER >/dev/null 2>/dev/null; then
-          # Darwin readlink(1) is so primitive it doesn't even support -f
-          # maybe only one level of symlink (e.g. on Mac)
-            JAVA_HOME=`readlink $JAVACOMPILER`
-         else
-          # else warn
-          AC_MSG_WARN([JAVA_HOME is set to /usr - this is very likely to be incorrect])
-          AC_MSG_WARN([if this is the case, please inform the correct JAVA_HOME with --with-jdk-home])
-          echo "JAVA_HOME is set to /usr - this is very likely to be incorrect" >> warn
-          echo "if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >> warn
-          fi
-         dnl now that we have the path to the real javac, make a JAVA_HOME out of it..
-         if test "$JAVA_HOME" != "/usr"; then
-            if test "$_os" = "Darwin"; then
-               dnl Leopard returns a non-suitable path with readlink - points to "Current" only
-               JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/Current/Commands/javac$,/CurrentJDK/Home,)
-               dnl Tiger already returns a JDK path..
-               JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/CurrentJDK/Commands/javac$,/CurrentJDK/Home,)
-            else
-               JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/bin/javac$,,)
-            fi
-         fi
-      fi
       # now check if $JAVA_HOME is really valid
       if test "$_os" = "Darwin"; then
          if test ! -f "$JAVA_HOME/lib/jvm.cfg" -a "x$with_jdk_home" = "x"; then
@@ -2991,17 +3593,14 @@ _ACEOF
          echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn
          echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
          echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
-#         if test "$JDK" = "gcj"; then
-#             echo "e.g. install java-1.4.2-gcj-compat-devel and use --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn
-#         fi
       fi
     fi
+    AC_MSG_NOTICE([JAVA_HOME=$JAVA_HOME])
 fi
-
 AWTLIB=
 if test "$SOLAR_JAVA" != ""; then
    AC_MSG_CHECKING([for jawt lib name])
-   if test "$JDK" = "gcj"; then 
+   if test "$JDK" = "gcj"; then
       save_CFLAGS=$CFLAGS
       save_LDFLAGS=$LDFLAGS
       CFLAGS="$CFLAGS -I$JAVA_HOME/include"
@@ -3044,44 +3643,14 @@ if test "$SOLAR_JAVA" != ""; then
    AC_SUBST(AWTLIB)
 fi
 
-dnl ===================================================================
-dnl Check for optional gcj for AOT
-dnl ===================================================================
-if test "$SOLAR_JAVA" != ""; then
-  AC_MSG_CHECKING([whether to enable gcj aot compilation])
-  if test -n "$enable_gcjaot" && test "$enable_gcjaot" != "no"; then
-     AC_MSG_RESULT([yes])
-     if test `echo $WITH_JAVA | grep -c "gij"` -eq 0; then
-        gcjaot="gcj"
-     else
-        gcjaot=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g"`
-     fi
-     AC_MSG_RESULT([$gcjaot])
-     if test -n "$with_jdk_home"; then
-        _javac_path="$with_jdk_home/bin/$gcjaot"
-        dnl Check if there is a gcj at all.
-        if test -x "$_javac_path"; then
-           JAVAAOTCOMPILER=$_javac_path
-        fi
-     fi
-     if test -z "$JAVAAOTCOMPILER"; then
-        AC_PATH_PROG(JAVAAOTCOMPILER, $gcjaot)
-     fi
-     if test -z "$JAVAAOTCOMPILER"; then
-        AC_MSG_WARN([$gcjaot not found, set with_jdk_home])
-     fi
-  else
-     AC_MSG_RESULT([no])
-  fi
-fi
-
 AC_SUBST(JAVA_HOME)
 AC_SUBST(JDK)
 AC_SUBST(JAVAFLAGS)
+AC_SUBST(JAVA_SOURCE_VER)
+AC_SUBST(JAVA_TARGET_VER)
 AC_SUBST(JAVAINTERPRETER)
 AC_SUBST(JAVAIFLAGS)
 AC_SUBST(JAVACOMPILER)
-AC_SUBST(JAVAAOTCOMPILER)
 AC_SUBST(JAVADOC)
 
 dnl ===================================================================
@@ -3107,20 +3676,20 @@ else
     # This test _should_ work because the one accepts -V (ours) and one
     # (the other) not...
     $DMAKE -V 2>/dev/null | grep 'dmake .* Version .*' >/dev/null
-    if test $? -eq 0; then 
+    if test $? -eq 0; then
        BUILD_DMAKE=NO
        AC_MSG_RESULT([yes])
        AC_MSG_CHECKING([the dmake version])
        DMAKE_VERSION=`$DMAKE -V | $AWK '$3 == "Version" {print $4}'`
        if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then
-	 AC_MSG_RESULT([OK, >= 4.11])
+     AC_MSG_RESULT([OK, >= 4.11])
        elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \
-	    test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "11"; then
-	 AC_MSG_RESULT([OK, >= 4.11])
+        test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "11"; then
+     AC_MSG_RESULT([OK, >= 4.11])
        else
-	 AC_MSG_RESULT([too old. >= 4.11 is needed])
-	 echo "A newer dmake will be built on ./bootstrap"
-	 BUILD_DMAKE=YES
+     AC_MSG_RESULT([too old. >= 4.11 is needed])
+     echo "A newer dmake will be built on ./bootstrap"
+     BUILD_DMAKE=YES
        fi
     else
        AC_MSG_RESULT([no])
@@ -3131,14 +3700,15 @@ fi
 AC_SUBST(BUILD_DMAKE)
 
 AC_MSG_CHECKING([whether to enable EPM for packing])
+BUILD_EPM=NO
 if test "$enable_epm" = "yes"; then
    AC_MSG_RESULT([yes])
    dnl ===================================================================
-   dnl Check for epm - not needed for windows
+   dnl Check for epm - not needed for Windows
    dnl ===================================================================
    if test "$_os" != "WINNT"; then
       if test -n "$with_epm"; then
-	      EPM=$with_epm
+          EPM=$with_epm
       else
          AC_PATH_PROG(EPM, epm, no)
       fi
@@ -3156,27 +3726,27 @@ if test "$enable_epm" = "yes"; then
          fi
          AC_MSG_CHECKING([epm version])
          EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//`
-	 if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \
-	       test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.' -f2`" -ge "7"; then
+     if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \
+           test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.' -f2`" -ge "7"; then
            AC_MSG_RESULT([OK, >= 3.7])
            BUILD_EPM=NO
-	        if test "$_os" = "Darwin"; then
+            if test "$_os" = "Darwin"; then
                AC_MSG_CHECKING([which PackageMaker EPM thinks to use])
-        	      _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1`
-        	      if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then
-          		      AC_MSG_ERROR([$_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)])
-        	      elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then
-          		    AC_MSG_RESULT([$_pm, ok])
-        	      else # we never should get here, but go safe
-			          AC_MSG_ERROR([$_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)])
-		          fi
-	       fi
-	 else
+                  _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1`
+                  if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then
+                        AC_MSG_ERROR([$_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)])
+                  elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then
+                      AC_MSG_RESULT([$_pm, ok])
+                  else # we never should get here, but go safe
+                      AC_MSG_ERROR([$_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)])
+                  fi
+           fi
+     else
            AC_MSG_RESULT([too old. epm >= 3.7 is required.])
            echo "EPM will be built."
            BUILD_EPM=YES
            BUILD_TYPE="$BUILD_TYPE EPM"
-	 fi
+     fi
       fi
    fi
 
@@ -3185,47 +3755,44 @@ if test "$enable_epm" = "yes"; then
 
    # defaults
    case "$_os" in
-	OS2)
-		PKGFORMAT=native
-		;;
-	Darwin)
-		PKGFORMAT=dmg
-		;;
-	SunOS)
-		PKGFORMAT=pkg
-		;;
-	Linux)
+    Darwin)
+        PKGFORMAT=dmg
+        ;;
+    SunOS)
+        PKGFORMAT=pkg
+        ;;
+    Linux)
       # if building on Debian, default should be deb...
       if test -e /etc/debian_version; then
          PKGFORMAT=deb
       else
          PKGFORMAT=rpm
       fi
-		;;
-	AIX)
-		PKGFORMAT=aix
-		;;
-	*BSD)
-		PKGFORMAT=bsd
-		;;
-	OSF1)
-		PKGFORMAT=setld
-		;;
+        ;;
+    AIX)
+        PKGFORMAT=rpm
+        ;;
+    OpenBSD|DragonFly)
+        PKGFORMAT=portable
+        ;;
+    *BSD)
+        PKGFORMAT=bsd
+        ;;
     WINNT)
         PKGFORMAT=msi
         ;;
-	# we never should get here since we check the arciecture/os at the beginning,
-	# but go sure...
-	*)
-		AC_MSG_ERROR([unknown system])
+    # we never should get here since we check the arciecture/os at the beginning,
+    # but go sure...
+    *)
+        AC_MSG_ERROR([unknown system])
    esac
    if test -n "$with_package_format"; then
-	for i in $with_package_format; do 
-		case "$i" in
-			aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable | archive | dmg | installed | msi)
-			;;
-		*)
-			AC_MSG_ERROR([unsupported format $i. Supported by EPM are:
+    for i in $with_package_format; do
+        case "$i" in
+            aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable | archive | dmg | installed | msi)
+            ;;
+        *)
+            AC_MSG_ERROR([unsupported format $i. Supported by EPM are:
 aix - AIX software distribution
 bsd - FreeBSD, NetBSD, or OpenBSD software distribution
 depot or swinstall - HP-UX software distribution
@@ -3237,16 +3804,16 @@ rpm - RedHat software distribution
 setld - Tru64 (setld) software distribution
 native - "Native" software distribution for the platform
 portable - Portable software distribution
-OOo additionally supports:
+LibreOffice additionally supports:
 archive - .tar.gz or .zip
 dmg - Mac OS X .dmg
 installed - installation tree
 msi - Windows .msi
-			]) 
-			;;
-		esac
-	done
-	PKGFORMAT="$with_package_format"
+            ])
+            ;;
+        esac
+    done
+    PKGFORMAT="$with_package_format"
    fi
    AC_MSG_RESULT([$PKGFORMAT])
    if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null; then
@@ -3261,12 +3828,12 @@ msi - Windows .msi
             if test $? -eq 0; then
                RPM=$a
                break
-            fi 
+            fi
          fi
        done
        if test -z "$RPM" ; then
           AC_MSG_ERROR([not found])
-       elif "$RPM" --usage 2>&1 | $EGREP -- -bb >/dev/null; then
+       elif "$RPM" --help 2>&1 | $EGREP buildroot >/dev/null; then
           RPM_PATH=`which $RPM`
           AC_MSG_RESULT([$RPM_PATH])
        else
@@ -3293,10 +3860,10 @@ msi - Windows .msi
    fi
    if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
       echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
-      	if test "$EPM" != "no" && test "$EPM" != "internal"; then
+          if test "$EPM" != "no" && test "$EPM" != "internal"; then
            if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
-               AC_MSG_CHECKING([whether epm is patched for OOos needs])
-               if grep "Patched for OpenOffice.org" $EPM >/dev/null 2>/dev/null; then
+               AC_MSG_CHECKING([whether epm is patched for LibreOffice's needs])
+               if grep "Patched for LibreOffice" $EPM >/dev/null 2>/dev/null; then
                   AC_MSG_RESULT([yes])
                else
                   AC_MSG_RESULT([no])
@@ -3323,7 +3890,6 @@ msi - Windows .msi
          AC_MSG_ERROR([pkgmk needed for Solaris pkg creation. Install it.])
       fi
    fi
-   AC_SUBST(BUILD_EPM)
    AC_SUBST(RPM)
    AC_SUBST(DPKG)
    AC_SUBST(PKGMK)
@@ -3333,6 +3899,7 @@ else
    PKGFORMAT=native
 fi
 AC_SUBST(EPM)
+AC_SUBST(BUILD_EPM)
 AC_SUBST(PKGFORMAT)
 
 dnl ===================================================================
@@ -3340,14 +3907,15 @@ dnl Check for gperf
 dnl ===================================================================
 AC_PATH_PROG(GPERF, gperf)
 if test -z "$GPERF"; then
-	AC_MSG_ERROR([gperf not found but needed. Install it.])
+    AC_MSG_ERROR([gperf not found but needed. Install it.])
 fi
 AC_MSG_CHECKING([gperf version])
 if test "`$GPERF --version | $EGREP ^GNU\ gperf | $AWK '{ print $3 }' | cut -d. -f1`" -ge "3"; then
-	AC_MSG_RESULT([OK])
+    AC_MSG_RESULT([OK])
 else
-	AC_MSG_ERROR([too old, you need at least 3.0.0])
+    AC_MSG_ERROR([too old, you need at least 3.0.0])
 fi
+AC_SUBST(GPERF)
 
 dnl ===================================================================
 dnl Check for building stax
@@ -3368,75 +3936,44 @@ dnl ===================================================================
 AC_MSG_CHECKING([whether to build the ODK])
 if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; then
    AC_MSG_RESULT([yes])
-   if test "$WITH_JAVA" != "no"; then
-   AC_MSG_CHECKING([for external/unowinreg/unowinreg.dll])
-   if ! test -f "./external/unowinreg/unowinreg.dll"; then
-      HAVE_UNOWINREG_DLL=no
-   else
-      HAVE_UNOWINREG_DLL=yes
-   fi
-   if test "$HAVE_UNOWINREG_DLL" = "yes"; then
-      AC_MSG_RESULT([found])
-      BUILD_UNOWINREG=NO
-   else
-      if test "$_os" = "WINNT"; then
-         AC_MSG_RESULT([not found, will be built])
-      else
-         AC_MSG_WARN([not found, will be cross-built using mingw32])
-      fi
-      BUILD_UNOWINREG=YES
-   fi
-   if test "$_os" != "WINNT" && test "$BUILD_UNOWINREG" = "YES"; then
-      if test -z "$WITH_MINGWIN" || test "$WITH_MINGWIN" = "0"; then
-         AC_MSG_ERROR([for rebuilding unowinreg.dll you need the mingw32 C++ compiler.
-         Specify mingw32 g++ executable name with --with-mingwin.
-         Or use prebuilt one from http://tools.openoffice.org/unowinreg_prebuild/680/ and
-         put it into external/unowinreg])
-      fi
-      if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
-         if ! test -x "$WITH_MINGWIN"; then MINGWCXX=false; else MINGWCXX=`basename $WITH_MINGWIN`; fi
-      else
-         AC_CHECK_TOOL(MINGWCXX, $WITH_MINGWIN, false)
-      fi
-      if test "$MINGWCXX" = "false"; then
-         AC_MSG_ERROR(specified MinGW32 C++ cross-compiler not found. Install it or correct name.)
-      fi
-      AC_MSG_CHECKING(whether we are using the MinGW32 cross C++ compiler)
-      if ! echo "`$MINGWCXX -dumpmachine`" | grep -q mingw32; then
-         AC_MSG_ERROR(no)
-      else
-         AC_MSG_RESULT(yes)
+
+   if test "$with_java" != "no"; then
+      AC_MSG_CHECKING([whether to build unowinreg.dll])
+      if test "$_os" = "WINNT" -a "z$enable_build_unowinreg" = "z" ; then
+           # build on Win by default
+           enable_build_unowinreg=yes
       fi
-      if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
-         if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`"; then MINGWSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/)); fi
+      if test "z$enable_build_unowinreg" = "z" -o "$enable_build_unowinreg" = "no"; then
+         AC_MSG_RESULT([no])
+         BUILD_UNOWINREG=NO
       else
-         AC_CHECK_TOOL(MINGWSTRIP, `echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`, false)
-      fi
-      if test "$MINGWSTRIP" = "false"; then
-         AC_MSG_ERROR(MinGW32 binutils needed. Install them.)
+         AC_MSG_RESULT([yes])
+         BUILD_UNOWINREG=YES
       fi
-      AC_LANG_PUSH([C++])
-      save_CXX=$CXX
-      save_CXXCPP=$CXXCPP
-      CXX=$MINGWCXX
-      CXXCPP="$MINGWCXX -E"
-      save_CXXFLAGS=$CXXFLAGS
-      save_CPPFLAGS=$CPPFLAGS
-      CXXFLAGS="$CXXFLAGS -I$JAVA_HOME/include"
-      CPPFLAGS="$CPPFLAGS -I$JAVA_HOME/include"
-      # LIBS contains -lcrypt etc due to teh AC_CHECK_LIBS which obviously
-      # do not make sense here (and 'd make the check fail)
-      save_LIBS=$LIBS
-      LIBS=""
-      AC_HAVE_LIBRARY(kernel32)
-      AC_HAVE_LIBRARY(advapi32)
-      AC_CHECK_HEADER(windows.h, [], [AC_MSG_ERROR([windows.h missing])])
-      CXXFLAGS=$save_CXXFLAGS
-      CPPFLAGS=$save_CPPFLAGS
-      CXX=$save_CXX
-      CXXCPP=$save_CXXCPP
-      LIBS=$save_LIBS
-      AC_LANG_POP([C++])
+      if test "$_os" != "WINNT" -a "$BUILD_UNOWINREG" = "YES"; then
+         if test -z "$with_mingw_cross_compiler"; then
+            dnl Guess...
+            AC_CHECK_PROGS(MINGWCXX,i386-mingw32msvc-g++ i586-pc-mingw32-g++ i686-pc-mingw32-g++ i686-w64-mingw32-g++,false)
+         elif test -x "$with_mingw_cross_compiler"; then
+             MINGWCXX="$with_mingw_cross_compiler"
+         else
+            AC_CHECK_TOOL(MINGWCXX, "$with_mingw_cross_compiler", false)
+         fi
+
+         if test "$MINGWCXX" = "false"; then
+            AC_MSG_ERROR([MinGW32 C++ cross-compiler not found.])
+         fi
+
+         mingwstrip_test="`echo $MINGWCXX | $SED -e s/g++/strip/`"
+         if test -x "$mingwstrip_test"; then
+            MINGWSTRIP="$mingwstrip_test"
+         else
+            AC_CHECK_TOOL(MINGWSTRIP, "$mingwstrip_test", false)
+         fi
+
+         if test "$MINGWSTRIP" = "false"; then
+            AC_MSG_ERROR(MinGW32 binutils not found.)
+         fi
       fi
    fi
    BUILD_TYPE="$BUILD_TYPE ODK"
@@ -3465,12 +4002,10 @@ AC_SUBST(SYSTEM_STDLIBS)
 dnl ===================================================================
 dnl Check for system zlib
 dnl ===================================================================
-if test "$_os" = "Darwin" && test "$with_system_zlib" != "no"; then
-   with_system_zlib=yes
-fi
 AC_MSG_CHECKING([which zlib to use])
-if test -n "$with_system_zlib" -o -n "$with_system_libs" && \
-	test "$with_system_zlib" != "no"; then
+if test -n "$with_system_zlib" -o -n "$with_system_libs" -o \
+	"$_os" != "WINNT" && \
+    test "$with_system_zlib" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_ZLIB=YES
     AC_CHECK_HEADER(zlib.h, [],
@@ -3488,14 +4023,15 @@ dnl ===================================================================
 dnl Check for system jpeg
 dnl ===================================================================
 AC_MSG_CHECKING([which jpeg to use])
-if test -n "$with_system_jpeg" -o -n "$with_system_libs" && \
-	test "$with_system_jpeg" != "no"; then
+if test -n "$with_system_jpeg" -o -n "$with_system_libs" -o \
+        "$_os" = "Linux" && \
+    test "$with_system_jpeg" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_JPEG=YES
     AC_CHECK_HEADER(jpeglib.h, [],
         [AC_MSG_ERROR(jpeg.h not found. install libjpeg)], [])
     AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ],
-	[AC_MSG_CHECKING(jpeg library not found or fuctional)], [])
+    [AC_MSG_CHECKING(jpeg library not found or fuctional)], [])
 else
     AC_MSG_RESULT([internal])
     SYSTEM_JPEG=NO
@@ -3508,13 +4044,13 @@ dnl Check for system expat
 dnl ===================================================================
 AC_MSG_CHECKING([which expat to use])
 if test -n "$with_system_expat" -o -n "$with_system_libs" && \
-	test "$with_system_expat" != "no"; then
+    test "$with_system_expat" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_EXPAT=YES
     AC_CHECK_HEADER(expat.h, [],
         [AC_MSG_ERROR(expat.h not found. install expat)], [])
     AC_CHECK_LIB(expat, XML_ParserCreate, [],
-	[AC_MSG_RESULT(expat library not found or functional.)], [])
+    [AC_MSG_RESULT(expat library not found or functional.)], [])
 else
     AC_MSG_RESULT([internal])
     SYSTEM_EXPAT=NO
@@ -3523,6 +4059,24 @@ fi
 AC_SUBST(SYSTEM_EXPAT)
 
 dnl ===================================================================
+dnl Check for system libvisio
+dnl ===================================================================
+AC_MSG_CHECKING([which libvisio to use])
+if test -n "$with_system_libvisio" -a "$with_system_libvisio" = "yes"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_LIBVISIO=YES
+    PKG_CHECK_MODULES( LIBVISIO, libvisio-0.0 )
+else
+    AC_MSG_RESULT([internal])
+    SYSTEM_LIBVISIO=NO
+    BUILD_TYPE="$BUILD_TYPE LIBVISIO"
+fi
+AC_SUBST(SYSTEM_LIBVISIO)
+AC_SUBST(LIBVISIO_CFLAGS)
+AC_SUBST(LIBVISIO_LIBS)
+
+
+dnl ===================================================================
 dnl Check for system libwpd
 dnl ===================================================================
 AC_MSG_CHECKING([which libwpd to use])
@@ -3530,7 +4084,7 @@ if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \
         test "$with_system_libwpd" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_LIBWPD=YES
-    PKG_CHECK_MODULES( LIBWPD, libwpd-0.8 )
+    PKG_CHECK_MODULES( LIBWPD, libwpd-0.9 libwpd-stream-0.9 )
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBWPD=NO
@@ -3564,12 +4118,48 @@ dnl Check whether freetype is available
 dnl ===================================================================
 if test  "$test_freetype" = "yes"; then
    AC_MSG_CHECKING([whether freetype is available])
-	PKG_CHECK_MODULES( FREETYPE, freetype2 >= 2.0 )
+    PKG_CHECK_MODULES( FREETYPE, freetype2 >= 2.0 )
 fi
 AC_SUBST(FREETYPE_CFLAGS)
 AC_SUBST(FREETYPE_LIBS)
 
 dnl ===================================================================
+dnl Check for system libwps
+dnl ===================================================================
+AC_MSG_CHECKING([which libwps to use])
+if test -n "$with_system_libwps" -o -n "$with_system_libs" && \
+        test "$with_system_libwps" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_LIBWPS=YES
+    PKG_CHECK_MODULES( LIBWPS, libwps-0.2 )
+else
+    AC_MSG_RESULT([internal])
+    SYSTEM_LIBWPS=NO
+    BUILD_TYPE="$BUILD_TYPE LIBWPS"
+fi
+AC_SUBST(SYSTEM_LIBWPS)
+AC_SUBST(LIBWPS_CFLAGS)
+AC_SUBST(LIBWPS_LIBS)
+
+dnl ===================================================================
+dnl Check for system libwpg
+dnl ===================================================================
+AC_MSG_CHECKING([which libwpg to use])
+if test -n "$with_system_libwpg" -o -n "$with_system_libs" && \
+        test "$with_system_libwpg" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_LIBWPG=YES
+    PKG_CHECK_MODULES( LIBWPG, libwpg-0.2 )
+else
+    AC_MSG_RESULT([internal])
+    SYSTEM_LIBWPG=NO
+    BUILD_TYPE="$BUILD_TYPE LIBWPG"
+fi
+AC_SUBST(SYSTEM_LIBWPG)
+AC_SUBST(LIBWPG_CFLAGS)
+AC_SUBST(LIBWPG_LIBS)
+
+dnl ===================================================================
 dnl Check whether freetype2 supports emboldening
 dnl ===================================================================
 if test  "$test_freetype" = "yes"; then
@@ -3607,43 +4197,68 @@ if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
     fi
 fi
 
-dnl ===================================================================
-dnl Check for system libxslt
-dnl ===================================================================
+# ===================================================================
+# Check for system libxslt
+# ===================================================================
 AC_MSG_CHECKING([which libxslt to use])
 if test -n "$with_system_libxslt" -o -n "$with_system_libs" -o \
        "$_os" = "Darwin" && \
    test "$with_system_libxslt" != "no"; then
-   AC_MSG_RESULT([external])
-   SYSTEM_LIBXSLT=YES
-
-   PKG_CHECK_MODULES_MACHACK(LIBXSLT, xslt-config, libxslt)
+    AC_MSG_RESULT([external])
+    SYSTEM_LIBXSLT=YES
+    if test "$_os" = "Darwin"; then
+        dnl make sure to use SDK path
+        LIBXSLT_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/usr/include/libxml2"
+        dnl omit -L/usr/lib
+        LIBXSLT_LIBS="-lxslt -lxml2 -lz -lpthread -liconv -lm"
+    else
+        PKG_CHECK_MODULES(LIBXSLT, libxslt)
+    fi
 
-   dnl Check for xsltproc
-   AC_PATH_PROG(XSLTPROC, xsltproc, no)
-   if test "$XSLTPROC" = "no"; then
-      AC_MSG_ERROR([xsltproc is required])
-   fi
+    dnl Check for xsltproc
+    AC_PATH_PROG(XSLTPROC, xsltproc, no)
+    if test "$XSLTPROC" = "no"; then
+        AC_MSG_ERROR([xsltproc is required])
+    fi
 else
-   AC_MSG_RESULT([internal])
-   SYSTEM_LIBXSLT=NO
-   BUILD_TYPE="$BUILD_TYPE LIBXSLT"
+    AC_MSG_RESULT([internal])
+    SYSTEM_LIBXSLT=NO
+    BUILD_TYPE="$BUILD_TYPE LIBXSLT"
+
+    if test "$cross_compiling" = "yes"; then
+        AC_PATH_PROG(XSLTPROC, xsltproc, no)
+        if test "$XSLTPROC" = "no"; then
+            AC_MSG_ERROR([xsltproc is required])
+        fi
+    fi
 fi
 AC_SUBST(SYSTEM_LIBXSLT)
 AC_SUBST(LIBXSLT_CFLAGS)
 AC_SUBST(LIBXSLT_LIBS)
+AC_SUBST(XSLTPROC)
 
-
-dnl ===================================================================
-dnl Check for system libxml
-dnl ===================================================================
+# ===================================================================
+# Check for system libxml
+# ===================================================================
 AC_MSG_CHECKING([which libxml to use])
 if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \
-            "$_os" = "Darwin" && \
-	test "$with_system_libxml" != "no"; then
+            "$_os" = "Darwin" -o $_os = iOS && \
+    test "$with_system_libxml" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_LIBXML=YES
-    PKG_CHECK_MODULES_MACHACK(LIBXML, xml2-config, libxml-2.0 >= 2.0)
+    if test "$_os" = "Darwin"; then
+        dnl make sure to use SDK path
+        LIBXML_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/usr/include/libxml2"
+        dnl omit -L/usr/lib
+        LIBXML_LIBS="-lxml2 -lz -lpthread -liconv -lm"
+    elif test $_os = iOS; then
+        dnl make sure to use SDK path
+        usr=`echo '#include <stdlib.h>' | $CC -E -MD - | grep usr/include/stdlib.h | head -1 | sed -e 's,# 1 ",,' -e 's,/usr/include/.*,/usr,'`
+        LIBXML_CFLAGS="-I$usr/include/libxml2"
+        LIBXML_LIBS="-L$usr/lib -lxml2 -liconv"
+    else
+        PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.0)
+    fi
     BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
 else
     AC_MSG_RESULT([internal])
@@ -3655,82 +4270,232 @@ AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
 
 dnl ===================================================================
-dnl Check for system python
+dnl Checks for Python
 dnl ===================================================================
-AC_MSG_CHECKING([which python to use])
-if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
-   with_system_python=yes
-   AC_MSG_RESULT([compiling against MacOSX10.4u.sdk (python version 2.3)])
-   PYTHON_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3"
-   PYTHON_LIBS="-framework Python"
-elif test -n "$with_system_python" -o -n "$with_system_libs" && \
-	test "$with_system_python" != "no"; then
-   with_system_python=yes
-   AC_MSG_RESULT([external])
-   AM_PATH_PYTHON([2.2])
 
-   python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`
-   python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"`
-   PYTHON_CFLAGS="-I$python_include"
-   PYTHON_LIBS="-lpython$python_version"
+AC_MSG_CHECKING([which Python to use])
+
+case "$enable_python" in
+no|disable)
+   enable_python=no
+   AC_MSG_RESULT([none])
+   DISABLE_PYTHON=TRUE
+   ;;
+""|yes|auto)
+   if test $build_os = cygwin; then
+      dnl When building on Windows we don't attempt to use any installed
+      dnl "system"  Python.
+      dnl
+      dnl (When cross-compiling to Windows from Linux using the mingw32-cross
+      dnl compiler from OBS, use mingw32-python from OBS, and ditto for other
+      dnl MinGW cross-compilation setups.)
+      AC_MSG_RESULT([internal])
+      enable_python=internal
+   elif test $_os = Darwin; then
+      AC_MSG_RESULT([system, MacOSX10.4u.SDK (Python 2.3)])
+      enable_python=system
+      PYTHON_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3"
+      PYTHON_LIBS="-framework Python"
+   else
+      AC_MSG_RESULT([checking below])
+      enable_python=auto       
+   fi
+   ;;
+internal)
+   AC_MSG_RESULT([internal])
+   ;;
+system)
+   AC_MSG_RESULT([system])
+   ;;
+*)
+   AC_MSG_ERROR([Incorrect --enable-python option])
+   ;;
+esac
+
+AC_SUBST(DISABLE_PYTHON)
+
+if test $_os = WINNT -a "$WITH_MINGW" != yes -a $enable_python = system; then
+   AC_MSG_ERROR([Must use internal Python when building with MSVC])
 fi
-if test "$with_system_python" = "yes" ; then
+
+if test $enable_python != no; then
+   BUILD_TYPE="$BUILD_TYPE PYUNO"
+fi
+
+if test "$cross_compiling" != yes; then
+   if test $enable_python = system; then
+      dnl This causes an error if no Python found
+      AM_PATH_PYTHON([2.2])
+   elif test $enable_python = auto; then
+      dnl This allows lack of system Python
+      AM_PATH_PYTHON([2.2],, [:])
+
+      if test "$PYTHON" = :; then
+         enable_python=internal
+      else
+         enable_python=system
+      fi
+   fi
+fi
+
+if test $enable_python = system; then
+   if test -n "$PYTHON_CFLAGS" -a -n "$PYTHON_LIBS"; then
+      dnl Fallback: Accept these in the environment.
+      :
+   elif test "$cross_compiling" != yes; then
+      python_include=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
+      python_version=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('VERSION'));"`
+      python_libs=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBS'));"`
+      python_libdir=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBDIR'));"`
+      PYTHON_CFLAGS="-I$python_include"
+      PYTHON_LIBS="-L$python_libdir -lpython$python_version $python_libs"
+   elif test "$cross_compiling" = yes; then
+      dnl How to find out the cross-compilation Python installation path?
+      dnl Let's hardocode what we know for different distributions for now...
+
+      for python_sysroot in /usr/i686-w64-mingw32/sys-root/mingw ; do
+         for python_version in 2.6 ; do
+            if test -f ${python_sysroot}/include/python${python_version}/Python.h; then
+               PYTHON_CFLAGS="-I ${python_sysroot}/include/python$python_version"
+               PYTHON_LIBS="-L ${python_sysroot}lib -lpython$python_version $python_libs"
+               break
+            fi
+         done
+         test -n "$PYTHON_CFLAGS" && break
+      done
+   fi
+fi
+
+dnl By now enable_python should be "system", "internal" or "no"
+case $enable_python in
+system)
    SYSTEM_PYTHON=YES
-   dnl check if the headers really work:
+
+   dnl Check if the headers really work
    save_CPPFLAGS="$CPPFLAGS"
    CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
    AC_CHECK_HEADER(Python.h, [],
-       [AC_MSG_ERROR(Python headers not found)], [])
+       [AC_MSG_ERROR([Python headers not found. You probably want to set both the PYTHON_CFLAGS and PYTHON_LIBS environment variables.])],
+       [])
    CPPFLAGS="$save_CPPFLAGS"
-else
+
+   dnl FIXME Check if the Python library can be linked with, too?
+   ;;
+
+internal)
    SYSTEM_PYTHON=NO
    BUILD_TYPE="$BUILD_TYPE PYTHON"
-   AC_MSG_RESULT([internal])
-   # Embedded python dies without Home set
+   # Embedded Python dies without Home set
    if test "z$HOME" = "z"; then
       export HOME="";
    fi
    # bz2 tarball and bzip2 is not standard
    if test -z "$BZIP2"; then
-	AC_PATH_PROG( BZIP2, bzip2)
-	if test -z "$BZIP2"; then
-   		AC_MSG_ERROR([the internal Python module has a .tar.bz2. You need bzip2])
-   	fi
+      AC_PATH_PROG( BZIP2, bzip2)
+      if test -z "$BZIP2"; then
+         AC_MSG_ERROR([the internal Python module has a .tar.bz2. You need bzip2])
+      fi
    fi
-fi
+   ;;
+no)
+   SYSTEM_PYTHON=NO
+   ;;
+*)
+   AC_MSG_ERROR([Internal configure script error, invalid enable_python value "$enable_python"])
+   ;;
+esac
+
 AC_SUBST(SYSTEM_PYTHON)
 AC_SUBST(PYTHON_CFLAGS)
 AC_SUBST(PYTHON_LIBS)
-HOME=`echo $HOME | sed 's:\\\\:/:g'`
-AC_SUBST(HOME)
 
 dnl ===================================================================
-dnl Check for system berkley db
+dnl Check for system translate-toolkit
+dnl ===================================================================
+AC_MSG_CHECKING([which translate-toolkit to use])
+if test "$with_system_translate_toolkit" = "yes" ; then
+    AC_MSG_RESULT([system])
+    SYSTEM_TRANSLATE_TOOLKIT=YES
+
+    AC_PATH_PROGS(OO2PO, oo2po)
+    if test -z "$OO2PO"; then
+        AC_MSG_ERROR([install translate-toolkit or use --without-system-translate-toolkit])
+    fi
+
+    AC_PATH_PROGS(PO2OO, po2oo)
+    if test -z "$PO2OO"; then
+        AC_MSG_ERROR([install translate-toolkit or use --without-system-translate-toolkit])
+    fi
+
+    $PO2OO --help | grep -q '\-\-skipsource'
+    if test $? -ne 0 ;  then
+        AC_MSG_ERROR([$PO2OO does not support --skipsource; use translate-toolkit >= 1.9 or use --without-system-translate-toolkit])
+    fi
+else
+   AC_MSG_RESULT([internal])
+   SYSTEM_TRANSLATE_TOOLKIT=NO
+   BUILD_TYPE="$BUILD_TYPE TRANSLATE_TOOLKIT"
+fi
+AC_SUBST(SYSTEM_TRANSLATE_TOOLKIT)
+
+dnl ===================================================================
+dnl Check for system Berkeley db
 dnl ===================================================================
 AC_MSG_CHECKING([which db to use])
 if test -n "$with_system_db" -o -n "$with_system_libs" && \
-	test "$with_system_db" != "no"; then
+    test "$with_system_db" != "no"; then
     SYSTEM_DB=YES
     AC_MSG_RESULT([external])
-    AC_CHECK_HEADER(db.h, [ DB_INCLUDES=/usr/include ],
-        [
-             CFLAGS=-I/usr/include/db4
-             AC_CHECK_HEADER(db4/db.h,
-             [ DB_INCLUDES=/usr/include/db4 ],
-             [ AC_MSG_ERROR(no. install the db4 libraries) ], []+             )
-        ], []
-    )
+
+    db_header=
+    for dbver in 5.1 5.0 5 4.8 4.7 4; do
+        for dash in - ''; do
+            AC_CHECK_HEADER([db$dash$dbver/db.h],
+                [ db_header="db$dash$dbver/db.h"; break ])
+        done
+    done
+
+    if test -z "$db_header"; then
+        AC_CHECK_HEADER([db/db.h], [db_header='db/db.h'])
+    fi
+
+    if test -z "$db_header"; then
+       AC_CHECK_HEADER(db.h, [ db_header='db.h' ])
+    fi
+
+    if test -z "$db_header"; then
+        AC_MSG_ERROR([db.h not found. Use the correct -I flag, or install the Berkeley db development package.])
+    fi
+
     AC_MSG_CHECKING([whether db is at least 4.1])
-    AC_TRY_RUN([
-#include <db.h>
+    AC_TRY_COMPILE([#include <$db_header>],
+        [int array[(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1))-1];],
+        [AC_MSG_RESULT([yes])],
+        [AC_MSG_ERROR([no. you need at least db 4.1])])
+
+    SYSTEM_DB_CFLAGS="-DSYSTEM_DB_HEADER='<$db_header>'"
+
+    DB_LIB=
+    for dbver in 5.1 5.0 5 4.8 4.7 4 ''; do
+        for dash in - ''; do
+            AC_CHECK_LIB(db$dash$dbver, dbopen,
+                [ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ])
+            AC_CHECK_LIB(db$dash$dbver, __db185_open,
+                [ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ])
+         done
+        test -n "$DB_LIB" && break
+    done
+
+    if test -z "$DB_LIB"; then
+        AC_CHECK_LIB(db, dbopen,
+            [ DB_LIB="db"; DB_CPPLIB="db_cxx" ])
+    fi
+
+    if test -z "$DB_LIB" ; then
+        AC_MSG_ERROR([db library not found. Use the correct -L flag,
+or install the Berkeley db development package.])
+    fi
 
-int main(int argc, char **argv) {
-       if(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) return 0;
-       else return 1;
-}
-    ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
-    AC_HAVE_LIBRARY(db, [],
-      [AC_MSG_ERROR([db not installed or functional])], [])
     SCPDEFS="$SCPDEFS -DSYSTEM_DB"
 else
     AC_MSG_RESULT([internal])
@@ -3738,9 +4503,9 @@ else
     BUILD_TYPE="$BUILD_TYPE BERKELEYDB"
 fi
 AC_SUBST(SYSTEM_DB)
-AC_SUBST(DB_VERSION)
-AC_SUBST(DB_INCLUDES)
-AC_SUBST(DB_JAR)
+AC_SUBST(SYSTEM_DB_CFLAGS)
+AC_SUBST(DB_LIB)
+AC_SUBST(DB_CPPLIB)
 
 dnl ===================================================================
 dnl Check for system lucene
@@ -3751,12 +4516,12 @@ if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
         AC_MSG_RESULT([external])
         SYSTEM_LUCENE=YES
         if test -z $LUCENE_CORE_JAR; then
-          AC_CHECK_FILE(/usr/share/java/lucene-core-2.3.jar, 
+          AC_CHECK_FILE(/usr/share/java/lucene-core-2.3.jar,
             [ LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar ],
             [
-              AC_CHECK_FILE(/usr/share/java/lucene-core.jar, 
+              AC_CHECK_FILE(/usr/share/java/lucene-core.jar,
                 [ LUCENE_CORE_JAR=/usr/share/java/lucene-core.jar ],
-                [ AC_CHECK_FILE(/usr/share/java/lucene.jar, 
+                [ AC_CHECK_FILE(/usr/share/java/lucene.jar,
                    [ LUCENE_CORE_JAR=/usr/share/java/lucene.jar ],
                    [ AC_MSG_ERROR(lucene-core.jar replacement not found)]
                   )
@@ -3770,10 +4535,10 @@ if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
         fi
 
         if test -z $LUCENE_ANALYZERS_JAR; then
-          AC_CHECK_FILE(/usr/share/java/lucene-analyzers-2.3.jar, 
+          AC_CHECK_FILE(/usr/share/java/lucene-analyzers-2.3.jar,
             [ LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers-2.3.jar ],
             [
-              AC_CHECK_FILE(/usr/share/java/lucene-contrib/lucene-analyzers.jar, 
+              AC_CHECK_FILE(/usr/share/java/lucene-contrib/lucene-analyzers.jar,
                 [ LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-contrib/lucene-analyzers.jar ],
                 [ AC_MSG_ERROR(lucene-analyzers.jar replacement not found.)]
               )
@@ -3809,7 +4574,7 @@ AC_SUBST(LUCENE_CORE_JAR)
 AC_SUBST(LUCENE_ANALYZERS_JAR)
 
 AC_MSG_CHECKING([whether to build the MySQL Connector extension])
-if test -n "$enable_mysql_connector" -a "$enable_mysql_connector" != "no"; then
+if test -n "$enable_ext_mysql_connector" -a "$enable_ext_mysql_connector" != "no"; then
   AC_MSG_RESULT([yes])
   ENABLE_MYSQLC=YES
   AC_MSG_CHECKING([for mysqlc module])
@@ -3826,28 +4591,31 @@ fi
 AC_SUBST(ENABLE_MYSQLC)
 
 if test "$ENABLE_MYSQLC" = "YES"; then
+
+SCPDEFS="$SCPDEFS -DWITH_EXTENSION_MYSQLC"
+
 dnl ===================================================================
 dnl Check for system MySQL
 dnl ===================================================================
 AC_MSG_CHECKING([for mysql pre-requisites])
 if test -n "$with_system_mysql" -o -n "$with_system_libs" && \
        test "$with_system_mysql" != "no" && test "$with_system_libs" != "no"; then
-	AC_MSG_RESULT([external MySQL])
-	SYSTEM_MYSQL=YES
-	AC_PATH_PROG( MYSQLCONFIG, mysql_config)
-	AC_MSG_CHECKING([MySQL version])
-	MYSQL_VERSION=`$MYSQLCONFIG --version` 
-	MYSQL_MAJOR=`$MYSQLCONFIG --version | cut -d"." -f1`
-	if test "$MYSQL_MAJOR" -ge "5"; then
-		AC_MSG_RESULT([OK])
-	else
-		AC_MSG_ERROR([too old, use 5.0.x or 5.1.x])
-	fi
-	AC_MSG_CHECKING([for MySQL Client library])
-	MYSQL_INC=`$MYSQLCONFIG --include` 
-	MYSQL_LIB=`$MYSQLCONFIG --libs`
-	MYSQL_DEFINES=`$MYSQLCONFIG --cflags | sed -e s,$MYSQL_INC,,`
-	AC_MSG_RESULT([includes $MYSQL_INC, libraries $MYSQL_LIB])
+    AC_MSG_RESULT([external MySQL])
+    SYSTEM_MYSQL=YES
+    AC_PATH_PROG( MYSQLCONFIG, mysql_config)
+    AC_MSG_CHECKING([MySQL version])
+    MYSQL_VERSION=`$MYSQLCONFIG --version`
+    MYSQL_MAJOR=`$MYSQLCONFIG --version | cut -d"." -f1`
+    if test "$MYSQL_MAJOR" -ge "5"; then
+        AC_MSG_RESULT([OK])
+    else
+        AC_MSG_ERROR([too old, use 5.0.x or 5.1.x])
+    fi
+    AC_MSG_CHECKING([for MySQL Client library])
+    MYSQL_INC=`$MYSQLCONFIG --include`
+    MYSQL_LIB=`$MYSQLCONFIG --libs`
+    MYSQL_DEFINES=`$MYSQLCONFIG --cflags | $SED -e s,$MYSQL_INC,,`
+    AC_MSG_RESULT([includes $MYSQL_INC, libraries $MYSQL_LIB])
 else
     SYSTEM_MYSQL=NO
     if test -n "$with_libmysql_path"; then
@@ -3883,24 +4651,24 @@ dnl ===================================================================
 # who thought this too-generic cppconn dir was a good idea?
 AC_MSG_CHECKING([MySQL Connector/C++])
 if test -n "$with_system_mysql_cppconn" -o -n "$with_system_libs" && \
-		test "$with_system_mysql_cppconn" != "no" && test "$with_system_libs" != "no"; then
-	AC_MSG_RESULT([external])
-	SYSTEM_MYSQL_CPPCONN=YES
+        test "$with_system_mysql_cppconn" != "no" && test "$with_system_libs" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_MYSQL_CPPCONN=YES
         AC_LANG_PUSH([C++])
-	AC_CHECK_HEADER(mysql_driver.h, [],
-					[AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++ Connectivity)], [])
-	AC_CHECK_LIB(mysqlcppconn, main, [],
-					[AC_MSG_ERROR(MySQL C++ Connectivity lib not found or functional)], [])
+    AC_CHECK_HEADER(mysql_driver.h, [],
+                    [AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++ Connectivity)], [])
+    AC_CHECK_LIB(mysqlcppconn, main, [],
+                    [AC_MSG_ERROR(MySQL C++ Connectivity lib not found or functional)], [])
    AC_MSG_CHECKING([version])
       AC_TRY_RUN([
 #include <mysql_driver.h>
 
 int main(int argc, char **argv) {
-	sql::Driver *driver;
-	driver = get_driver_instance();
-	if (driver->getMajorVersion() > 1 || \
-	   (driver->getMajorVersion() == 1 && driver->getMinorVersion() > 0) || \
-	   (driver->getMajorVersion() == 1 && driver->getMinorVersion() == 0 && driver->getPatchVersion() >= 6)) 
+    sql::Driver *driver;
+    driver = get_driver_instance();
+    if (driver->getMajorVersion() > 1 || \
+       (driver->getMajorVersion() == 1 && driver->getMinorVersion() > 0) || \
+       (driver->getMajorVersion() == 1 && driver->getMinorVersion() == 0 && driver->getPatchVersion() >= 6))
         return 0;
       else
         return 1;
@@ -3909,15 +4677,15 @@ int main(int argc, char **argv) {
         AC_LANG_POP([C++])
 
 else
-	AC_MSG_RESULT([internal])
+    AC_MSG_RESULT([internal])
         AC_MSG_CHECKING([for mysqlcppconn module])
         if test -d mysqlcppconn; then
           AC_MSG_RESULT([OK])
         else
           AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
         fi
-	BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN"
-	SYSTEM_MYSQL_CPPCONN=NO
+    BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN"
+    SYSTEM_MYSQL_CPPCONN=NO
 fi
 AC_LANG_POP([C++])
 AC_SUBST(SYSTEM_MYSQL_CPPCONN)
@@ -4002,10 +4770,10 @@ if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
         AC_MSG_RESULT([external])
         SYSTEM_SAXON=YES
         if test -z $SAXON_JAR; then
-          AC_CHECK_FILE(/usr/share/java/saxon9.jar, 
+          AC_CHECK_FILE(/usr/share/java/saxon9.jar,
             [ SAXON_JAR=/usr/share/java/saxon9.jar ],
             [
-              AC_CHECK_FILE(/usr/share/java/saxon.jar, 
+              AC_CHECK_FILE(/usr/share/java/saxon.jar,
                 [ SAXON_JAR=/usr/share/java/saxon.jar ],
                 [ AC_CHECK_FILE(/usr/share/java/saxon9.jar,
                     [ SAXON_JAR=/usr/share/java/saxon9.jar ],
@@ -4026,9 +4794,9 @@ if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
         fi
 
 dnl Saxon comes in two practically available versions, the out-of-date saxonb which
-dnl supports the java extensions that OOo uses, and the up-to-date saxon he 
-dnl "home edition" version, which is crippled to not support those java extensions.
-dnl And as an aside the he one also needs to be tweaked to include 
+dnl supports the Java extensions that LibreOffice uses, and the up-to-date saxon he
+dnl "home edition" version, which is crippled to not support those Java extensions.
+dnl And as an aside the he one also needs to be tweaked to include
 dnl a META-INF/services to broadcast that it supports the jaxp transform factory
 
         AC_MSG_CHECKING([if saxon works])
@@ -4046,9 +4814,9 @@ class saxontest {
         "net.sf.saxon.TransformerFactoryImpl");
       try {
         TransformerFactory tfactory = TransformerFactory.newInstance();
-	// some external saxons (Debian, Ubuntu, ...) have this disabled
-	// per default
-	tfactory.setAttribute(FeatureKeys.ALLOW_EXTERNAL_FUNCTIONS, new Boolean(true));
+    // some external saxons (Debian, Ubuntu, ...) have this disabled
+    // per default
+    tfactory.setAttribute(FeatureKeys.ALLOW_EXTERNAL_FUNCTIONS, new Boolean(true));
         System.out.println("TransformerFactory is" +
           tfactory.getClass().getName());
         Transformer transformer = tfactory.newTransformer(
@@ -4103,31 +4871,47 @@ fi
 dnl ===================================================================
 dnl Check for system curl
 dnl ===================================================================
-if test "$_os" = "Darwin" && test "$with_system_curl" != "no"; then
+if test "$_os" = "Darwin" -a "$with_system_curl" != "no"; then
    with_system_curl=yes
 fi
-AC_MSG_CHECKING([which curl to use])
+AC_MSG_CHECKING([which libcurl to use])
 if test -n "$with_system_curl" -o -n "$with_system_libs" && \
-	test "$with_system_curl" != "no"; then
+    test "$with_system_curl" != "no"; then
    AC_MSG_RESULT([external])
    SYSTEM_CURL=YES
 
-   AC_PATH_PROG( CURLCONFIG, curl-config)
-   if test -z "$CURLCONFIG"; then
-      AC_MSG_ERROR([install curl to run this script])
+   curl_version=""
+   if test "$cross_compiling" = "yes"; then
+      dnl At least the OBS mingw32-libcurl-devel package
+      dnl comes with a proper .pc file
+      PKG_CHECK_MODULES(CURL, libcurl,, [:])
+      if test -n "CURL_PKG_ERRORS"; then
+         AC_MSG_RESULT([no])
+      else
+         curl_version=`$PKG_CONFIG --modversion libcurl`
+      fi
    fi
-
-   # check curl version
-   AC_MSG_CHECKING([whether curl is >= 7.13.1])
-   if test "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $1 }'`" -gt "7" -a \
-	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "13" -a \
-	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "1"; then 
-      AC_MSG_ERROR([no, you need at least curl 7.13,1])
-   else
-      AC_MSG_RESULT([yes])
+   if test -z "$curl_version"; then
+      AC_PATH_PROG(CURLCONFIG, curl-config)
+      if test -z "$CURLCONFIG"; then
+         AC_MSG_ERROR([install the libcurl development package])
+      fi
+      CURL_LIBS=`$CURLCONFIG --libs`
+      CURL_CFLAGS=`$CURLCONFIG --cflags`
+      curl_version=`$CURLCONFIG --version | $SED -e 's/^libcurl //'`
    fi
-   CURL_LIBS=`$CURLCONFIG --libs`
-   CURL_CFLAGS=`$CURLCONFIG --cflags`
+
+   AC_MSG_CHECKING([whether libcurl is >= 7.13.1])
+   case $curl_version in
+   dnl brackets doubled below because Autoconf uses them as m4 quote characters,
+   dnl so they need to be doubled to end up in the configure script
+   7.13.1|7.1[[4-9]].*|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*)
+      AC_MSG_RESULT([yes, you have $curl_version])
+      ;;
+   *)
+      AC_MSG_ERROR([no, you have $curl_version])
+      ;;
+   esac
 else
    AC_MSG_RESULT([internal])
    SYSTEM_CURL=NO
@@ -4138,30 +4922,11 @@ AC_SUBST(CURL_CFLAGS)
 AC_SUBST(CURL_LIBS)
 
 dnl ===================================================================
-dnl Check for system mdds
-dnl ===================================================================
-AC_MSG_CHECKING([which mdds to use])
-if test -n "$with_system_mdds" -o -n "$with_system_headers" && \
-	test "$with_system_mdds" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_MDDS=YES
-    AC_LANG_PUSH([C++])
-    AC_CHECK_HEADER(mdds/flat_segment_tree.hpp, [],
-        [AC_MSG_ERROR(mdds/flat_segment_tree.hpp not found. install mdds)], [])
-    AC_LANG_POP([C++])
-else
-   AC_MSG_RESULT([internal])
-   BUILD_TYPE="$BUILD_TYPE MDDS"
-   SYSTEM_MDDS=NO
-fi
-AC_SUBST(SYSTEM_MDDS)
-
-dnl ===================================================================
 dnl Check for system boost
 dnl ===================================================================
 AC_MSG_CHECKING([which boost to use])
 if test -n "$with_system_boost" -o -n "$with_system_headers" && \
-	test "$with_system_boost" != "no"; then
+    test "$with_system_boost" != "no"; then
    AC_MSG_RESULT([external])
    SYSTEM_BOOST=YES
    AC_LANG_PUSH([C++])
@@ -4171,18 +4936,20 @@ if test -n "$with_system_boost" -o -n "$with_system_headers" && \
        [AC_MSG_ERROR(boost/spirit/include/classic_core.hpp not found. install boost >= 1.36)], [])
    AC_CHECK_HEADER(boost/function.hpp, [],
        [AC_MSG_ERROR(boost/function.hpp not found. install boost)], [])
+   AC_CHECK_HEADER([boost/unordered_map.hpp], [HAVE_BOOST_UNORDERED_MAP=TRUE],
+                   [AC_MSG_WARN([boost/unordered_map.hpp not found])], [])
 
    save_CXXFLAGS=$CXXFLAGS
    CXXFLAGS="$CXXFLAGS -fno-exceptions"
    AC_MSG_CHECKING([whether boost/function.hpp compiles with -fno-exceptions])
    AC_TRY_COMPILE([#include <boost/function.hpp>
 ], [],
-   ac_cv_cxx_boost_no_exceptons_broken=no, ac_cv_cxx_boost_no_exceptons_broken=yes)
+   ac_cv_cxx_boost_no_exceptions_broken=no, ac_cv_cxx_boost_no_exceptions_broken=yes)
 
-   if test "$ac_cv_cxx_boost_no_exceptons_broken" = "yes"; then
-	AC_MSG_ERROR([no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131])
+   if test "$ac_cv_cxx_boost_no_exceptions_broken" = "yes"; then
+    AC_MSG_ERROR([no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131])
    else
-  	AC_MSG_RESULT([yes])
+      AC_MSG_RESULT([yes])
    fi
    CXXFLAGS=$save_CXXFLAGS
    AC_LANG_POP([C++])
@@ -4190,15 +4957,82 @@ else
    AC_MSG_RESULT([internal])
    BUILD_TYPE="$BUILD_TYPE BOOST"
    SYSTEM_BOOST=NO
+   HAVE_BOOST_UNORDERED_MAP=TRUE
 fi
+AC_SUBST([HAVE_BOOST_UNORDERED_MAP])
 AC_SUBST(SYSTEM_BOOST)
 
 dnl ===================================================================
+dnl Check for system mdds
+dnl ===================================================================
+AC_MSG_CHECKING([which mdds to use])
+if test -n "$with_system_mdds" -o -n "$with_system_headers" && \
+    test "$with_system_mdds" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_MDDS=YES
+
+    dnl ===================================================================
+    dnl Determine which hash container mdds shall use
+    dnl ===================================================================
+    AC_MSG_CHECKING([which hash container mdds shall use])
+    if test "x$HAVE_CXX0X" = "xTRUE"; then
+        MDDS_CPPFLAGS="-std=c++0x"
+        AC_MSG_RESULT([std::unordered_map])
+    else
+        MDDS_CPPFLAGS="-DMDDS_HASH_CONTAINER_BOOST"
+        AC_MSG_RESULT([boost::unordered_map])
+    fi
+
+    AC_LANG_PUSH([C++])
+    save_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $MDDS_CPPFLAGS"
+    AC_CHECK_HEADER(mdds/flat_segment_tree.hpp, [],
+        [AC_MSG_ERROR(mdds/flat_segment_tree.hpp not found. install mdds)], [])
+    AC_CHECK_HEADER(mdds/mixed_type_matrix.hpp, [],
+        [AC_MSG_ERROR(mdds/mixed_type_matrix.hpp not found. install mdds >= 0.4.0)], [])
+    CPPFLAGS="$save_CPPFLAGS"
+    save_CXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS $MDDS_CPPFLAGS"
+    AC_MSG_CHECKING([for correct signature of ::mdds::flat_segment_tree])
+    AC_TRY_RUN([#include <mdds/flat_segment_tree.hpp>
+
+    int main(int argc, char **argv) {
+        ::mdds::flat_segment_tree<long, short> db(0, 100, 0);
+        short val;
+        if (!db.search(5, val).second)
+            return 1;
+        return 0;
+    }
+], ac_cv_cxx_mdds_flat_segment_tree_correct=yes, ac_cv_cxx_mdds_flat_segment_tree_correct=no)
+
+    if test "$ac_cv_cxx_mdds_flat_segment_tree_correct" = "yes"; then
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_ERROR([no, install mdds >= 0.5.0])
+    fi
+    CXXFLAGS=$save_CXXFLAGS
+    AC_LANG_POP([C++])
+else
+    AC_MSG_RESULT([internal])
+    BUILD_TYPE="$BUILD_TYPE MDDS"
+    SYSTEM_MDDS=NO
+
+    dnl ===================================================================
+    dnl Determine which hash container mdds shall use
+    dnl ===================================================================
+    AC_MSG_CHECKING([which hash container mdds shall use])
+    MDDS_CPPFLAGS="-DMDDS_HASH_CONTAINER_BOOST"
+    AC_MSG_RESULT([boost::unordered_map])
+fi
+AC_SUBST(SYSTEM_MDDS)
+AC_SUBST([MDDS_CPPFLAGS])
+
+dnl ===================================================================
 dnl Check for system vigra
 dnl ===================================================================
 AC_MSG_CHECKING([which vigra to use])
 if test -n "$with_system_vigra" -o -n "$with_system_headers" && \
-	test "$with_system_vigra" != "no"; then
+    test "$with_system_vigra" != "no"; then
    AC_MSG_RESULT([external])
    SYSTEM_VIGRA=YES
    AC_LANG_PUSH([C++])
@@ -4216,8 +5050,8 @@ dnl ===================================================================
 dnl Check for system odbc
 dnl ===================================================================
 AC_MSG_CHECKING([which odbc headers to use])
-if test -n "$with_system_odbc_headers" -o -n "$with_system_headers" && \
-	test "$with_system_odbc_headers" != "no"; then
+if test -n "$with_system_odbc" -o -n "$with_system_headers" && \
+    test "$with_system_odbc" != "no"; then
    AC_MSG_RESULT([external])
    SYSTEM_ODBC_HEADERS=YES
 
@@ -4277,30 +5111,32 @@ if test "$WITH_LDAP" = "YES"; then
    dnl ===================================================================
    AC_MSG_CHECKING([which LDAP SDK to use])
    if test -n "$with_openldap" && test "$with_openldap" != "no"; then
-  	   AC_MSG_RESULT([OpenLDAP])
-	   WITH_OPENLDAP=YES
-	   AC_CHECK_HEADERS(ldap.h, [],
-		   [AC_MSG_ERROR(ldap.h not found. install openldap libs)], [])
-	   AC_CHECK_LIB(ldap, ldap_simple_bind_s, [],
-		   [AC_MSG_ERROR(openldap lib not found or functional)], [])
-	   # rumours say that OpenLDAP doesn't have that function. I looked and
-	   # it has it. Test for it to be sure
+         AC_MSG_RESULT([OpenLDAP])
+       WITH_OPENLDAP=YES
+       AC_CHECK_HEADERS(ldap.h, [],
+           [AC_MSG_ERROR(ldap.h not found. install openldap libs)], [])
+       AC_CHECK_LIB(ldap, ldap_simple_bind_s, [],
+           [AC_MSG_ERROR(openldap lib not found or functional)], [])
+       # rumours say that OpenLDAP doesn't have that function. I looked and
+       # it has it. Test for it to be sure
          AC_CHECK_LIB(ldap, ldap_set_option, [],
                 [AC_MSG_ERROR(openldap lib not found or functional)], [])
    else
-	   AC_MSG_RESULT([Netscape/Mozilla])
-	   # TODO. Actually do a sanity check and check for
-	   # LDAP_OPT_SIZELIMIT and LDAP_X_OPT_CONNECT_TIMEOUT 
-	   WITH_OPENLDAP=NO
+       AC_MSG_RESULT([Netscape/Mozilla])
+       # TODO. Actually do a sanity check and check for
+       # LDAP_OPT_SIZELIMIT and LDAP_X_OPT_CONNECT_TIMEOUT
+       WITH_OPENLDAP=NO
    fi
 fi
 AC_SUBST(WITH_LDAP)
 AC_SUBST(WITH_OPENLDAP)
 
+AC_OUTPUT([ooo.lst])
+
 dnl ===================================================================
 dnl Check for system mozilla
 dnl ===================================================================
-AC_MSG_CHECKING([which mozilla to use])
+AC_MSG_CHECKING([which Mozilla to use])
 if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_MOZILLA=YES
@@ -4362,7 +5198,7 @@ if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then
     save_LIBS="$LIBS"
     CPPFLAGS="$CPPFLAGS $MOZ_NSS_CFLAGS"
     LDFLAGS="$LDFLAGS $MOZ_NSS_LIBS"
-    AC_CHECK_LIB(nss3, PK11_GetCertFromPrivateKey, [], 
+    AC_CHECK_LIB(nss3, PK11_GetCertFromPrivateKey, [],
       [AC_MSG_ERROR(PK11_GetCertFromPrivateKey missing but needed.
 See https://bugzilla.mozilla.org/show_bug.cgi?id=262274.
 Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5))], [])
@@ -4401,7 +5237,7 @@ else
 if test -z "$with_mozilla_version"; then
    MOZILLA_VERSION=
 else
-   AC_MSG_CHECKING([which mozilla version to build])
+   AC_MSG_CHECKING([which Mozilla version to build])
    MOZILLA_VERSION=$with_mozilla_version
    enable_build_mozilla=1
    AC_MSG_RESULT([$MOZILLA_VERSION])
@@ -4409,11 +5245,11 @@ fi
 
 AC_SUBST(MOZILLA_VERSION)
 
-AC_MSG_CHECKING([for toolkit mozilla should use])
+AC_MSG_CHECKING([for toolkit Mozilla should use])
 if test -z "$with_mozilla_toolkit"; then
    if test "$_os" != "WINNT" ; then
       if test "$_os" = "Darwin" ; then
-         MOZILLA_TOOLKIT=mac  
+         MOZILLA_TOOLKIT=mac
          AC_MSG_RESULT([mac])
       else
          MOZILLA_TOOLKIT=gtk2
@@ -4445,7 +5281,7 @@ if test -n "$enable_build_mozilla"; then
    BUILD_MOZAB="TRUE"
    AC_MSG_RESULT([yes])
 else
-   BUILD_MOZAB=""	
+   BUILD_MOZAB=""
    AC_MSG_RESULT([no])
 fi
 
@@ -4454,14 +5290,14 @@ if test "$enable_nss_module" != "no"; then
    ENABLE_NSS_MODULE="YES"
    BUILD_TYPE="$BUILD_TYPE NSS"
    AC_MSG_RESULT([yes])
-   if test "$_os" = "WINNT"; then
+   if test "$build_os" = "cygwin"; then
       AC_MSG_CHECKING([for Mozilla build tooling])
       if test -z "$MOZILLABUILD" ; then
 AC_MSG_ERROR([Mozilla build tooling not found.
-Use the --with-mozilla-build option after installling the tools obtained
+Use the --with-mozilla-build option after installing the tools obtained
 from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32])
       else
-         if test \( "$WITH_MINGWIN" = "yes" \) ; then
+         if test \( "$WITH_MINGW" = "yes" \) ; then
             if test ! -d "$MOZILLABUILD" ; then
 AC_MSG_ERROR([Mozilla build tooling incomplete!])
             else
@@ -4482,16 +5318,17 @@ else
    AC_MSG_RESULT([no])
 fi
 
+
 if test "$BUILD_MOZAB" = "TRUE"; then
   if test "$_os" = "WINNT"; then
-    if test "$WITH_MINGWIN" != "yes"; then
+    if test "$WITH_MINGW" != "yes"; then
       # compiling with MSVC. Only supported platform here is MSVS2005 at the moment.
       if test "$MSVSVER" != "2005"; then
-        AC_MSG_ERROR([Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only.])
+        AC_MSG_ERROR([Building SeaMonkey is supported with Microsoft Visual Studio 2005 only.])
       fi
     else
-      AC_MSG_WARN([Building SeaMonkey with mingwin is not tested, and likely to break.])
-      echo "Building SeaMonkey with mingwin is not tested, and likely to break." >> warn
+      AC_MSG_WARN([Building SeaMonkey with MinGW is not tested, and likely to break.])
+      echo "Building SeaMonkey with MinGW is not tested, and likely to break." >> warn
     fi
   fi
 
@@ -4500,7 +5337,7 @@ if test "$BUILD_MOZAB" = "TRUE"; then
    fi
    MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source"
    MOZILLA_FETCH_FILE=`grep $MOZILLA_SOURCE_VERSION ooo.lst`
-   AC_MSG_CHECKING([for mozilla sources])
+   AC_MSG_CHECKING([for Mozilla sources])
    if test -z "$MOZILLA_FETCH_FILE"; then
       AC_MSG_RESULT([not found])
       HAVE_MOZILLA_TARBALL=n
@@ -4521,7 +5358,7 @@ if test "$BUILD_MOZAB" = "TRUE"; then
    fi
    if test "$HAVE_MOZILLA_TARBALL" != "y"; then
       AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found.
-Use "./fetch_tarballs.sh ooo.lst" to download.])
+Use "./download" to download.])
    fi
    if test "$_os" = "WINNT"; then
       AC_MSG_CHECKING([for moztools binaries])
@@ -4533,12 +5370,12 @@ Use "./fetch_tarballs.sh ooo.lst" to download.])
       fi
    elif test "$_os" = "Darwin"; then
       if test "$MOZILLA_TOOLKIT" = "gtk2"; then
-         AC_MSG_NOTICE([checking whether mozilla can be built...])
-         PKG_CHECK_MODULES(MOZGTK2, gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8, AC_MSG_NOTICE([OK - can build mozilla]), AC_MSG_ERROR([Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages]))
+         AC_MSG_NOTICE([checking whether Mozilla can be built...])
+         PKG_CHECK_MODULES(MOZGTK2, gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8, AC_MSG_NOTICE([OK - can build Mozilla]), AC_MSG_ERROR([Prerequisites to build Mozilla not met. Either use the precompiled Mozilla binaries or install the missing packages]))
       else
          PKG_CHECK_MODULES(MOZLIBREQ, libIDL-2.0 >= 0.6.3,  MOZIDL="TRUE", MOZIDL="")
          if test -z "$MOZIDL"; then
-            AC_MSG_ERROR([libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit.])
+            AC_MSG_ERROR([libIDL 0.6.3 or newer is needed to build Mozilla with Mac toolkit.])
          fi
       fi
    else
@@ -4546,20 +5383,20 @@ Use "./fetch_tarballs.sh ooo.lst" to download.])
       if test "$MOZILLA_TOOLKIT" = "gtk2"; then
          PKG_CHECK_MODULES(MOZLIBREQ, gtk+-2.0, MOZGTK="TRUE", MOZGTK="")
          if test -z "$MOZGTK"; then
-            AC_MSG_ERROR([GTK2 is needed to build mozilla.])
+            AC_MSG_ERROR([GTK2 is needed to build Mozilla.])
          fi
          PKG_CHECK_MODULES(MOZLIBREQ, libIDL-2.0 >= 0.8.0, MOZIDL="TRUE", MOZIDL="")
          if test -z "$MOZIDL"; then
-            AC_MSG_ERROR([libIDL >= 0.8.0 is needed when using GTK2 to build mozilla.])
-         fi 
+            AC_MSG_ERROR([libIDL >= 0.8.0 is needed when using GTK2 to build Mozilla.])
+         fi
       else
          PKG_CHECK_MODULES(MOZLIBREQ, gtk+ >= 1.2.3, MOZGTK="TRUE", MOZGTK="")
          if test -z "$MOZGTK"; then
-            AC_MSG_ERROR([gtk 1.2 is needed when not using GTK2 to build mozilla.])
+            AC_MSG_ERROR([GTK+ 1.2 is needed when not using GTK2 to build Mozilla.])
          fi
          PKG_CHECK_MODULES(MOZLIBREQ, libidl >= 0.6.3 libidl <= 0.6.8, MOZIDL="TRUE", MOZIDL="")
          if test -z "$MOZIDL"; then
-            AC_MSG_ERROR([libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla.])
+            AC_MSG_ERROR([libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build Mozilla.])
          fi
       fi
    fi
@@ -4584,7 +5421,7 @@ dnl Check for system sane
 dnl ===================================================================
 AC_MSG_CHECKING([which sane header to use])
 if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \
-	test "$with_system_sane_header" != "no"; then
+    test "$with_system_sane_header" != "no"; then
    AC_MSG_RESULT([external])
    SYSTEM_SANE_HEADER=YES
    AC_CHECK_HEADER(sane/sane.h, [],
@@ -4601,7 +5438,7 @@ dnl Check for system icu
 dnl ===================================================================
 AC_MSG_CHECKING([which icu to use])
 if test -n "$with_system_icu" -o -n "$with_system_libs" && \
-	test "$with_system_icu" != "no"; then
+    test "$with_system_icu" != "no"; then
    AC_MSG_RESULT([external])
    SYSTEM_ICU=YES
    AC_LANG_PUSH([C++])
@@ -4612,11 +5449,11 @@ if test -n "$with_system_icu" -o -n "$with_system_libs" && \
    if test -z "$SYSTEM_GENBRK"; then
       AC_MSG_ERROR([\"genbrk\" not found in \$PATH, install the icu development tool \"genbrk"\])
    fi
-   AC_PATH_PROG(SYSTEM_GENCCODE, genccode, [], [$PATH:/usr/sbin:/sbin])
+   AC_PATH_PROG(SYSTEM_GENCCODE, genccode, [], [$PATH:/usr/sbin:/sbin:/usr/local/sbin])
    if test -z "$SYSTEM_GENCCODE"; then
       AC_MSG_ERROR([\"genccode\" not found in \$PATH, install the icu development tool \"genccode"\])
    fi
-   AC_PATH_PROG(SYSTEM_GENCMN, gencmn, [], [$PATH:/usr/sbin:/sbin])
+   AC_PATH_PROG(SYSTEM_GENCMN, gencmn, [], [$PATH:/usr/sbin:/sbin:/usr/local/sbin])
    if test -z "$SYSTEM_GENCMN"; then
       AC_MSG_ERROR([\"gencmn\" not found in \$PATH, install the icu development tool \"gencmn"\])
    fi
@@ -4660,7 +5497,7 @@ if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" = "z" -
         test "$with_system_graphite" != "no"; then
         AC_MSG_RESULT([external])
         SYSTEM_GRAPHITE=YES
-        PKG_CHECK_MODULES( GRAPHITE, silgraphite )
+        PKG_CHECK_MODULES( GRAPHITE, graphite2 >= 0.9.3 )
     else
         AC_MSG_RESULT([internal])
         SYSTEM_GRAPHITE=NO
@@ -4704,14 +5541,9 @@ dnl ***************************************
 dnl testing for X libraries and includes...
 dnl ***************************************
 if test "$_os" = "Darwin" -a "x$x_includes" = "xno_x_includes"; then
-   echo "Do Nothing for _os = Darwin"
    dnl Mac OS X using Aqua graphics. Don't check for X11.
    :
-elif test "$_os" = "OS2" ; then
-   echo "Do Nothing for _os = OS2. Don't check for X11."
-   dnl OS/2 uses native graphics. Don't check for X11.
-   :
-elif test "$_os" != "WINNT" ; then
+elif test "$_os" != "WINNT" -a "$_os" != "Android" -a "$_os" != "iOS"; then
    AC_PATH_X
    AC_PATH_XTRA
    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
@@ -4729,8 +5561,8 @@ elif test "$_os" != "WINNT" ; then
    if test -z "$x_includes"; then
       AC_MSG_ERROR([No X includes found]) # Exit
    fi
-   CFLAGS=$X_CFLAGS
-   LDFLAGS="$X_LDFLAGS $X_LIBS"
+   CFLAGS="$CFLAGS $X_CFLAGS"
+   LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS"
    AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", [AC_MSG_ERROR([X Development libraries not found])])
    dnl Check if the XauDisposeAuth symbol is provided by libXau.
    AC_CHECK_LIB(Xau, XauDisposeAuth, XAU_LIBS="-lXau", [])
@@ -4761,44 +5593,14 @@ fi
 AC_SUBST(XLIB)
 AC_SUBST(XAU_LIBS)
 
-if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then
+if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "Android" -a "$_os" != "iOS"; then
    dnl ===================================================================
-   dnl Check for using Xaw
+   dnl Check for Composite.h for Mozilla plugin
    dnl ===================================================================
-   AC_MSG_CHECKING([whether to use Xaw])
-   if test "$enable_Xaw" = "no"; then
-       DISABLE_XAW=TRUE
-       AC_MSG_RESULT([no])
-       AC_CHECK_HEADERS(X11/Composite.h,[],[AC_MSG_ERROR([Xt include headers not found])],
-         [#include <X11/Intrinsic.h>])
-   else
-       AC_MSG_RESULT([yes])
-       AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])],
-         [#include <X11/Intrinsic.h>])
-       AC_CHECK_LIB(Xaw, main, [],
-           [AC_MSG_ERROR(Xaw library not found or functional)], [])
-   fi
+   AC_CHECK_HEADERS(X11/Composite.h,[],[AC_MSG_ERROR([Xt headers not found])],
+     [#include <X11/Intrinsic.h>])
 fi
-AC_SUBST(DISABLE_XAW)
-
-
-
-dnl ===================================================================
-dnl Check if fontconfig/fontconfig.h is available 
-dnl ===================================================================
-if test "$ENABLE_FONTCONFIG" = "TRUE" ; then
-    AC_CHECK_HEADER(fontconfig/fontconfig.h, [],
-                    [AC_MSG_ERROR([fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?])], [])
-    AC_MSG_CHECKING([whether fontconfig is >= 2.2.0])
-    AC_TRY_RUN([
-#include <fontconfig/fontconfig.h>
 
-int main(int argc, char **argv) {
-	if(FC_MAJOR > 2 || (FC_MAJOR == 2 && FC_MINOR >= 2)) return 0;
-	else return 1;
-}
-], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no, fontconfig >= 2.2.0 needed])])
-fi
 
 dnl ===================================================================
 dnl Check for system Xrender
@@ -4814,7 +5616,7 @@ else
 fi
 AC_MSG_CHECKING([which Xrender headers to use])
 if test -n "$with_system_xrender_headers" -o -n "$with_system_headers" && \
-	test "$with_system_xrender_headers" != "no"; then
+    test "$with_system_xrender_headers" != "no"; then
    AC_MSG_RESULT([external])
    SYSTEM_XRENDER_HEADERS=YES
    AC_CHECK_HEADER(X11/extensions/Xrender.h, [],
@@ -4837,10 +5639,11 @@ dnl ===================================================================
 AC_MSG_CHECKING([whether to enable RandR support])
 if test "$test_randr" = "yes" -a \( "$enable_randr" = "yes" -o "$enable_randr" = "TRUE" \) ; then
    if test -z "$enable_randr_link" -o "$enable_randr_link" = "no"; then
-	  XRANDR_DLOPEN="TRUE"
-	  AC_MSG_RESULT([resorting to dlopen libXrandr at runtime])
+      XRANDR_DLOPEN="TRUE"
+      AC_MSG_RESULT([configured to dlopen libXrandr at runtime])
    else
-	  XRANDR_DLOPEN="FALSE"
+      AC_MSG_RESULT([yes])
+      XRANDR_DLOPEN="FALSE"
       PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2, ENABLE_RANDR="TRUE", ENABLE_RANDR="")
       if test "$ENABLE_RANDR" != "TRUE"; then
          AC_CHECK_HEADER(X11/extensions/Xrandr.h, [],
@@ -4850,7 +5653,6 @@ if test "$test_randr" = "yes" -a \( "$enable_randr" = "yes" -o "$enable_randr" =
               [ AC_MSG_ERROR(libXrandr not found or functional) ], [])
          XRANDR_LIBS="-lXrandr "
          ENABLE_RANDR="TRUE"
-	     AC_MSG_RESULT([enabling RandR support])
       fi
    fi
 else
@@ -4877,7 +5679,7 @@ dnl Check for system neon
 dnl ===================================================================
 AC_MSG_CHECKING([which neon to use])
 if test -n "$with_system_neon" -o -n "$with_system_libs" && \
-	test "$with_system_neon" != "no"; then
+    test "$with_system_neon" != "no"; then
         AC_MSG_RESULT([external])
         PKG_CHECK_MODULES(NEON, neon >= 0.26.0, , AC_MSG_ERROR([you need neon >= 0.26.x for system-neon]))
         NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
@@ -4899,7 +5701,8 @@ fi
 dnl ===================================================================
 dnl Check for system openssl
 dnl ===================================================================
-if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
+if test "$_os" = "Darwin" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \
+        "$_os" = "DragonFly" && test "$with_system_openssl" != "no"; then
    with_system_openssl=yes
 fi
 AC_MSG_CHECKING([which libssl to use])
@@ -4908,11 +5711,12 @@ if test -n "$with_system_openssl" -o -n "$with_system_libs" && \
     AC_MSG_RESULT([external])
     # Mac OS builds should get out without extra stuff is the Mac porters'
     # wish. And pkg-config is although Xcode ships a .pc for openssl
-    if test "$_os" = "Darwin"; then
+    if test "$_os" = "Darwin" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \
+            "$_os" = "DragonFly"; then
         OPENSSL_CFLAGS=
         OPENSSL_LIBS="-lssl -lcrypto"
     else
-    	PKG_CHECK_MODULES( OPENSSL, openssl )
+        PKG_CHECK_MODULES( OPENSSL, openssl )
     fi
     SYSTEM_OPENSSL=YES
 else
@@ -4925,70 +5729,19 @@ AC_SUBST(OPENSSL_CFLAGS)
 AC_SUBST(OPENSSL_LIBS)
 
 dnl ===================================================================
-dnl Test for disabling agg
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable agg])
-if test "$with_agg" = "no"; then
-  AC_MSG_RESULT([no])
-else
-  AC_MSG_RESULT([yes])
-  ENABLE_AGG=YES
-  AC_SUBST(ENABLE_AGG)
-
-  dnl ===================================================================
-  dnl Check for system AGG
-  dnl ===================================================================
-  AC_MSG_CHECKING([which AGG to use])
-  if test -n "$with_system_agg" -o -n "$with_system_libs" && \
-     test "$with_system_agg" != "no"; then
-         AC_MSG_RESULT([external])
-         PKG_CHECK_MODULES(AGG, libagg >= 2.3)
-         AC_MSG_CHECKING([agg version])
-         # workaround; if AGG_CFLAGS is empty (broken libagg.pc in 2.3), add /usr/include/agg2 anyway
-         # (/usr/include gets stripped from pkg-config output)
-         if test -z "$AGG_CFLAGS" || test "$AGG_CFLAGS" = " "; then
-            AGG_INCDIR="`$PKG_CONFIG --variable includedir libagg`/agg2"
-         else
-            AGG_INCDIR="`echo $AGG_CFLAGS | $SED -e s/-I//`"
-         fi
-	 if $PKG_CONFIG --modversion libagg | grep -q 2.3 || \
-	 	$PKG_CONFIG --modversion libagg | grep -q 2.4; then
-            # 2.4's libagg.pc.in still contains 2.3 :/
-            if $EGREP -q "Version 2.4" `echo $AGG_INCDIR`/agg_basics.h; then
-               AC_MSG_RESULT([2.4])
-               AGG_VERSION=2400
-            else
-               AC_MSG_RESULT([2.3])
-               AGG_VERSION=2300
-            fi
-            SYSTEM_AGG=YES
-	 else
-	    AC_MSG_ERROR([only agg 2.3 and 2.4 are supported])
-	 fi
-  else
-         AC_MSG_RESULT([internal])
-         SYSTEM_AGG=NO
-         AGG_VERSION=2300
-         BUILD_TYPE="$BUILD_TYPE AGG"
-  fi
-  AC_SUBST(SYSTEM_AGG)
-  AC_SUBST(AGG_VERSION)
-fi
-
-dnl ===================================================================
 dnl Check for system redland
 dnl ===================================================================
 AC_MSG_CHECKING([which redland library to use])
 if test -n "$with_system_redland" -o -n "$with_system_libs" && \
-	test "$with_system_redland" != "no"; then
-	AC_MSG_RESULT([external])
-	SYSTEM_REDLAND=YES
+    test "$with_system_redland" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_REDLAND=YES
    dnl versions before 1.0.8 write RDF/XML that is useless for ODF (@xml:base)
    PKG_CHECK_MODULES(REDLAND, redland >= 1.0.8)
 else
-	AC_MSG_RESULT([internal])
-	BUILD_TYPE="$BUILD_TYPE REDLAND"
-	SYSTEM_REDLAND=NO
+    AC_MSG_RESULT([internal])
+    BUILD_TYPE="$BUILD_TYPE REDLAND"
+    SYSTEM_REDLAND=NO
 fi
 AC_SUBST(SYSTEM_REDLAND)
 AC_SUBST(REDLAND_CFLAGS)
@@ -4999,7 +5752,7 @@ dnl Check for system hunspell
 dnl ===================================================================
 AC_MSG_CHECKING([which libhunspell to use])
 if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \
-	test "$with_system_hunspell" != "no"; then
+    test "$with_system_hunspell" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_HUNSPELL=YES
     AC_LANG_PUSH([C++])
@@ -5029,7 +5782,7 @@ dnl Checking for altlinuxhyph
 dnl ===================================================================
 AC_MSG_CHECKING([which altlinuxhyph to use])
 if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \
-	test "$with_system_altlinuxhyph" != "no"; then
+    test "$with_system_altlinuxhyph" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_HYPH=YES
     AC_CHECK_HEADER(hyphen.h, [],
@@ -5059,7 +5812,8 @@ dnl ===================================================================
 dnl Checking for mythes
 dnl ===================================================================
 AC_MSG_CHECKING([which mythes to use])
-if test -n "$with_system_mythes" && test "$with_system_mythes" != "no"; then
+if test -n "$with_system_mythes" -o -n "$with_system_libs" && \
+   test "$with_system_mythes" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_MYTHES=YES
     AC_LANG_PUSH([C++])
@@ -5069,13 +5823,13 @@ if test -n "$with_system_mythes" && test "$with_system_mythes" != "no"; then
             [ AC_MSG_ERROR(mythes.hxx headers not found.)], [])
         AC_CHECK_LIB(mythes-1.2, main, [],
             [ MYTHES_FOUND=no], [])
- 	if test "$MYTHES_FOUND" = "no"; then
+     if test "$MYTHES_FOUND" = "no"; then
             AC_CHECK_LIB(mythes, main, [MYTHES_FOUND=yes],
                 [ MYTHES_FOUND=no], [])
-	fi
-	if test "$MYTHES_FOUND" = "no"; then
-		AC_MSG_ERROR([mythes library not found!.])
-	fi
+    fi
+    if test "$MYTHES_FOUND" = "no"; then
+        AC_MSG_ERROR([mythes library not found!.])
+    fi
     fi
     AC_LANG_POP([C++])
 else
@@ -5092,7 +5846,7 @@ dnl Checking for lpsolve
 dnl ===================================================================
 AC_MSG_CHECKING([which lpsolve to use])
 if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
-	test "$with_system_lpsolve" != "no"; then
+    test "$with_system_lpsolve" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_LPSOLVE=YES
     AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
@@ -5128,11 +5882,11 @@ fi
 AC_SUBST(SYSTEM_LIBTEXTCAT)
 
 AC_MSG_CHECKING([which libtextcat data directory to use])
-if test -n "$with_system_libtextcat_data" && test "$with_system_libtextcat_data" != "no"; then
-    if test "$with_system_libtextcat_data" = "yes"; then
+if test -n "$with_external_libtextcat_data" && test "$with_external_libtextcat_data" != "no"; then
+    if test "$with_external_libtextcat_data" = "yes"; then
         SYSTEM_LIBTEXTCAT_DATA=file:///usr/share/libtextcat
     else
-        SYSTEM_LIBTEXTCAT_DATA=file://$with_system_libtextcat_data
+        SYSTEM_LIBTEXTCAT_DATA=file://$with_external_libtextcat_data
     fi
     AC_MSG_RESULT([$SYSTEM_LIBTEXTCAT_DATA])
 else
@@ -5156,11 +5910,11 @@ if test "$_os" = "Linux"; then
    fi
 fi
 
-if test "$_os" != "WNT"; then
+if test "$_os" != "WINNT"; then
   AC_CHECK_FUNCS(getopt, HAVE_GETOPT=YES, [HAVE_GETOPT=NO])
   AC_CHECK_FUNCS(readdir_r, HAVE_READDIR_R=YES, [HAVE_READDIR_R=NO])
   if test "$HAVE_GETOPT" = "YES" -a "$HAVE_READDIR_R" = "YES"; then
-	SYSTEM_LIBC=YES
+    SYSTEM_LIBC=YES
   fi
 else
   HAVE_GETOPT=NO
@@ -5172,121 +5926,129 @@ AC_SUBST(HAVE_READDIR_R)
 AC_SUBST(SYSTEM_LIBC)
 
 dnl =========================================
-dnl Check for the Microsoft Platform SDK.
+dnl Check for the Windows  SDK.
 dnl =========================================
-dnl FIXME: I don't know yet if PSDK works with MinGW, keep it until I know better,
-dnl and add "-a \( "$WITH_MINGWIN" != "yes" \)" then
-if test \( "$_os" = "WINNT" \) ; then
-	AC_MSG_CHECKING([for PSDK files])
-	if test -z "$with_psdk_home"; then
-		# This first line will detect a February 2003 Microsoft Platform SDK
-		PSDK_HOME=`./oowintool --psdk-home`
-        # But there might be also an April 2005 PSDK, unfortunately MS changed
-        # the registry entry. (we prefer the old version!?)
-        if test -z "$PSDK_HOME"; then
-          PSDK_HOME=`cat /proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install\ Dir 2> /dev/null | tr '\000' '\n' | head -n 1`
-        fi
+dnl FIXME: I don't know yet if the Windows SDK works with MinGW, keep it until I know better,
+dnl and add "-a \( "$WITH_MINGW" != "yes" \)" then
+if test "$_os" = "WINNT"; then
+    AC_MSG_CHECKING([for Windows SDK])
+    if test "$build_os" = "cygwin"; then
+        if test -z "$with_windows_sdk_home"; then
+            # This first line will detect a February 2003 Microsoft Platform SDK
+            WINDOWS_SDK_HOME=`./oowintool --windows-sdk-home`
+            # But there might be also an April 2005 PSDK, unfortunately MS changed
+            # the registry entry. (we prefer the old version!?)
+            if test -z "$WINDOWS_SDK_HOME"; then
+                WINDOWS_SDK_HOME=`cat /proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install\ Dir 2> /dev/null | tr '\000' '\n' | head -n 1`
+            fi
             # normalize if found
-            if test -n "$PSDK_HOME"; then
-              PSDK_HOME=`cygpath -d "$PSDK_HOME"`
-              PSDK_HOME=`cygpath -u "$PSDK_HOME"`
-           fi
-	else
-           PSDK_HOME=`cygpath -u "$with_psdk_home"`
-	fi
+            if test -n "$WINDOWS_SDK_HOME"; then
+                WINDOWS_SDK_HOME=`cygpath -d "$WINDOWS_SDK_HOME"`
+                WINDOWS_SDK_HOME=`cygpath -u "$WINDOWS_SDK_HOME"`
+            fi
+        else
+            WINDOWS_SDK_HOME=`cygpath -u "$with_windows_sdk_home"`
+        fi
+    fi
+    if test -n "$WINDOWS_SDK_HOME"; then
         # Remove a possible trailing backslash
-        PSDK_HOME=`echo $PSDK_HOME | $SED 's/\/$//'`
-    # Problem with current PSDK (iz 49865)
-    if test -f "$PSDK_HOME/Lib/libcp.lib"; then
-        AC_MSG_ERROR([
-
+        WINDOWS_SDK_HOME=`echo $WINDOWS_SDK_HOME | $SED 's/\/$//'`
+        # Problem with current PSDK (iz 49865)
+        # (What "current" does that mean?)
+        if test -f "$WINDOWS_SDK_HOME/Lib/libcp.lib"; then
+            AC_MSG_ERROR([
 Some modules do not build correctly with MS Platform SDK - April 2005
-Edition if the library ($PSDK_HOME/Lib/libcp.lib) is found.
+Edition if the library ($WINDOWS_SDK_HOME/Lib/libcp.lib) is found.
 Remove/rename/backup that file and restart configure. Details about this
 problem can be found in issue 49856.])
+        fi
+
+        if test -f "$WINDOWS_SDK_HOME/Include/adoint.h" \
+             -a -f "$WINDOWS_SDK_HOME/Include/SqlUcode.h" \
+             -a -f "$WINDOWS_SDK_HOME/Include/usp10.h"; then
+            HAVE_PSDK_H="yes"
+        else
+            HAVE_PSDK_H="no"
+        fi
+        if test -f "$WINDOWS_SDK_HOME/lib/user32.lib"; then
+            HAVE_PSDK_LIB="yes"
+        else
+            HAVE_PSDK_LIB="no"
+        fi
+
+        if test "$HAVE_PSDK_H" = "no" -o "$HAVE_PSDK_LIB" = "no"; then
+            AC_MSG_ERROR([Some (all?) Windows SDK files not found, please check if all needed parts of
+the  Windows SDK are installed.])
+        fi
+
+        if test ! -x "$WINDOWS_SDK_HOME/bin/msiinfo.exe" \
+             -o ! -x "$WINDOWS_SDK_HOME/bin/msidb.exe" \
+             -o ! -x "$WINDOWS_SDK_HOME/bin/uuidgen.exe" \
+             -o ! -x "$WINDOWS_SDK_HOME/bin/msitran.exe" ; then
+            AC_MSG_ERROR([Some (all) files of the Windows Installer SDK are missing, please install.])
+        fi
     fi
-# WIndows SDK has different headers
-	if test \( -f "$PSDK_HOME/Include/adoint.h" \) \
-		 -a \( -f "$PSDK_HOME/Include/SqlUcode.h" \) \
-		 -a \( -f "$PSDK_HOME/Include/usp10.h" \); then
-		HAVE_PSDK_H="yes"
-	else
-		HAVE_PSDK_H="no"
-	fi
-	if test -f "$PSDK_HOME/lib/unicows.lib"; then
-		HAVE_PSDK_LIB="yes"
-	else
-		HAVE_PSDK_LIB="no"
-	fi
-    if test "$HAVE_PSDK_H" = "no" -o "$HAVE_PSDK_LIB" = "no"; then
-        AC_MSG_ERROR([Some (all?) PSDK files not found, please check if all needed Platform SDKs
-are installed or use --with-psdk-home .])
-    fi
-    if test ! -x "$PSDK_HOME/bin/msiinfo.exe" \
-         -o ! -x "$PSDK_HOME/bin/msidb.exe" \
-         -o ! -x "$PSDK_HOME/bin/uuidgen.exe" \
-         -o ! -x "$PSDK_HOME/bin/msitran.exe" ; then
-        AC_MSG_ERROR([Some (all) files of the Windows Installer SDK are missing, please install.])
-    fi
-    AC_MSG_RESULT([SDK files found ...)])
-dnl Check if this is the right SDK.
-    if echo $PSDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then
-        AC_MSG_RESULT([Found Windows SDK 6.1 ($PSDK_HOME)])
-        WINDOWS_VISTA_PSDK=TRUE
-    elif echo $PSDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then
-        AC_MSG_RESULT([Found Windows SDK 6.0 ($PSDK_HOME)])
-        WINDOWS_VISTA_PSDK=TRUE
+
+    if test -z "$WINDOWS_SDK_HOME"; then
+        AC_MSG_RESULT([no, hoping the necessary headers and libraries will be found anyway])
+    elif echo $WINDOWS_SDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then
+        AC_MSG_RESULT([found Windows SDK 6.1 ($WINDOWS_SDK_HOME)])
+    elif echo $WINDOWS_SDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then
+        AC_MSG_RESULT([found Windows SDK 6.0 ($WINDOWS_SDK_HOME)])
+    elif echo $WINDOWS_SDK_HOME | grep "v7" >/dev/null 2>/dev/null; then
+        AC_MSG_RESULT([found Windows SDK 7 ($WINDOWS_SDK_HOME)])
     else
-        AC_MSG_RESULT([Found Legacy Windows Platform SDK ($PSDK_HOME)])
+        AC_MSG_ERROR([Found legacy Windows Platform SDK ($WINDOWS_SDK_HOME)])
     fi
 fi
-AC_SUBST(PSDK_HOME)
-AC_SUBST(WINDOWS_VISTA_PSDK)
+AC_SUBST(WINDOWS_SDK_HOME)
 
 dnl =========================================
 dnl Check for the Microsoft DirectX SDK.
 dnl =========================================
-if test \( "$_os" = "WINNT" \) ; then
-    AC_MSG_CHECKING([for DirectX SDK files])
-    if test -z "$with_directx_home"; then
-        dnl A standard installation of the DirectX SDK sets $DXSDK_DIR
-        if test -n "$DXSDK_DIR"; then
-            DIRECTXSDK_HOME=`cygpath -d "$DXSDK_DIR"`
-            DIRECTXSDK_HOME=`cygpath -u "$DIRECTXSDK_HOME"`
+if test -n "$ENABLE_DIRECTX" -a "$_os" = "WINNT"; then
+    AC_MSG_CHECKING([for DirectX SDK])
+    if test "$build_os" = "cygwin"; then
+        if test -z "$with_directx_home"; then
+            dnl A standard installation of the DirectX SDK sets $DXSDK_DIR
+            if test -n "$DXSDK_DIR"; then
+                DIRECTXSDK_HOME=`cygpath -d "$DXSDK_DIR"`
+                DIRECTXSDK_HOME=`cygpath -u "$DIRECTXSDK_HOME"`
+            fi
+            # At this point $DIRECTXSDK_HOME might still be undefined. This will lead to
+            # the "DirectX SDK not found" error later
+        else
+            DIRECTXSDK_HOME=`cygpath -u "$with_directx_home"`
         fi
-        # At this point $DIRECTXSDK_HOME might still be undefined. This will lead to
-        # the "DirectX SDK files not found" error later
-    else
-	DIRECTXSDK_HOME=`cygpath -u "$with_directx_home"`
+        # Remove a possible trailing backslash
+        DIRECTXSDK_HOME=`echo $DIRECTXSDK_HOME | $SED 's/\/$//'`
+    elif test -n "$with_directx_home"; then
+        DIRECTXSDK_HOME="$with_directx_home"
     fi
-    # Remove a possible trailing backslash
-    DIRECTXSDK_HOME=`echo $DIRECTXSDK_HOME | $SED 's/\/$//'`
 
-    if test -f "$DIRECTXSDK_HOME/Include/ddraw.h" ; then
+    if test -f "$DIRECTXSDK_HOME/Include/ddraw.h" -o -f "$DIRECTXSDK_HOME/Include/d3d9.h" ; then
         HAVE_DIRECTXSDK_H="yes"
     else
         HAVE_DIRECTXSDK_H="no"
     fi
-    # MS changed the location of the libraries with dec 2004 directx sdk
+
+    # MS changed the location of the libraries with Dec 2004 DirectX SDK
     if test -d "$DIRECTXSDK_HOME/lib/x86" ; then
         DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib/x86"
     else
         DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib"
     fi
-    if test -f "$DIRECTXSDK_LIB/ddraw.lib" ; then
+
+    if test -f "$DIRECTXSDK_LIB/ddraw.lib" -o -f "$DIRECTXSDK_LIB/d3d9.lib" ; then
         HAVE_DIRECTXSDK_LIB="yes"
     else
         HAVE_DIRECTXSDK_LIB="no"
     fi
-    if test -n "$ENABLE_DIRECTX"; then
-	    if test "$HAVE_DIRECTXSDK_H" = "yes" -a "$HAVE_DIRECTXSDK_LIB" = "yes"; then
-		    AC_MSG_RESULT([found])
-	    else
-		    AC_MSG_ERROR([DirectX SDK files not found, please use --with-directx-home or -disable-directx.])
-	    fi
+
+    if test "$HAVE_DIRECTXSDK_H" = "yes" -a "$HAVE_DIRECTXSDK_LIB" = "yes"; then
+        AC_MSG_RESULT([found])
     else
-		DIRECTXSDK_HOME=""
-		AC_MSG_RESULT([disabled])
+        AC_MSG_RESULT([no, hoping the necessary headers and libraries will be found anyway])
     fi
 fi
 AC_SUBST(DIRECTXSDK_HOME)
@@ -5297,38 +6059,49 @@ dnl Check for Nullsoft Scriptable Install System
 dnl ============================================
 NSIS_PATH=""
 if test "$_os" = "WINNT" ; then
-    AC_MSG_CHECKING([for NSIS])
-    AC_PATH_PROG(NSIS_PATH, nsis.exe)
-    if test -n "$NSIS_PATH"; then
-        NSIS_PATH=`dirname "$NSIS_PATH"`
-    fi
-    if test -n "$with_nsis_path"; then
-        with_nsis_path=`cygpath -u "$with_nsis_path"`
-    fi
-    if test -e "$with_nsis_path/nsis.exe"; then
-        NSIS_PATH="$with_nsis_path"
-    fi
-    nsistest=`./oowintool --nsis-dir`;
-    if test -x "$nsistest/nsis.exe"; then
-        NSIS_PATH="$nsistest"
-    fi
-    if test -z "$NSIS_PATH"; then
-        AC_MSG_WARN([NSIS not found, no self contained installer will be build.])
-        echo "NSIS not found, no self contained installer will be build." >> warn
+    if test -z "$with_nsis_path"; then
+        AC_PATH_PROG(NSIS_PATH, makensis)
+        if test -n "$NSIS_PATH"; then
+            NSIS_PATH=`dirname "$NSIS_PATH"`
+        elif test "$build_os" = "cygwin"; then
+            AC_MSG_CHECKING([for NSIS])
+            nsistest=`./oowintool --nsis-dir`;
+            nsistest=`cygpath -d -m "$nsistest"`
+            nsistest=`cygpath -u "$nsistest"`
+            if test -x "$nsistest/nsis.exe"; then
+                NSIS_PATH="$nsistest"
+                AC_MSG_RESULT([found ($NSIS_PATH)])
+            else
+                AC_MSG_RESULT([no, no self-contained installer will be built.])
+            fi
+        fi
     else
-        NSIS_PATH=`cygpath -d "$NSIS_PATH"`
-        NSIS_PATH=`cygpath -u "$NSIS_PATH"`
-        AC_MSG_RESULT([found ($NSIS_PATH)])
+        AC_MSG_CHECKING([for NSIS])
+        if test "$build_os" = "cygwin"; then
+            with_nsis_path=`cygpath -u "$with_nsis_path"`
+        fi
+        if test -e "$with_nsis_path/makensis$EXEEXT_FOR_BUILD"; then
+            NSIS_PATH="$with_nsis_path"
+        fi
+        if test -z "$NSIS_PATH"; then
+            AC_MSG_RESULT([no, no self-contained installer will be built.])
+        else
+            if test "$build_os" = "cygwin"; then
+                NSIS_PATH=`cygpath -d "$NSIS_PATH"`
+                NSIS_PATH=`cygpath -u "$NSIS_PATH"`
+            fi
+            AC_MSG_RESULT([found ($NSIS_PATH)])
+        fi
     fi
 fi
 AC_SUBST(NSIS_PATH)
 
 dnl ***************************************
-dnl testing bison and flex exist
+dnl Checking for bison and flex
 dnl ***************************************
 AC_PATH_PROG(BISON, bison)
 if test -z "$BISON"; then
-   AC_MSG_ERROR([no bison found in \$PATH, install bison])
+   AC_MSG_ERROR([no bison found in \$PATH, install it])
 else
    AC_MSG_CHECKING([the bison version])
    _bison_version=`$BISON --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
@@ -5347,14 +6120,14 @@ else
 fi
 AC_PATH_PROG(FLEX, flex)
 if test -z "$FLEX"; then
-   AC_MSG_ERROR([no flex found in \$PATH, install flex])
+   AC_MSG_ERROR([no flex found in \$PATH, install it])
 fi
 dnl ***************************************
-dnl testing that patch exists
+dnl Checking for patch
 dnl ***************************************
 AC_PATH_PROG(PATCH, patch)
 if test -z "$PATCH"; then
-   AC_MSG_ERROR([\"patch\" not found in \$PATH, install the development tool named\"patch"\])
+   AC_MSG_ERROR([\"patch\" not found in \$PATH, install it])
 fi
 
 dnl On Solaris, FreeBSD or MacOS X, check if --with-gnu-patch was used
@@ -5363,7 +6136,7 @@ if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
       GNUPATCH=$PATCH
    else
       if test -x "$with_gnu_patch"; then
-	      GNUPATCH=$with_gnu_patch
+    GNUPATCH=$with_gnu_patch
       else
          AC_MSG_ERROR([--with-gnu-patch did not point to an executable])
       fi
@@ -5371,7 +6144,7 @@ if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
 
    AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
    if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
-	   AC_MSG_RESULT([yes])
+      AC_MSG_RESULT([yes])
    else
       AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it])
    fi
@@ -5400,90 +6173,67 @@ fi
 AC_MSG_CHECKING([whether $GNUCP is GNU cp from coreutils with preserve= support])
 if $GNUCP --version 2>/dev/null | grep "coreutils" >/dev/null 2>/dev/null; then
    AC_MSG_RESULT([yes])
+elif $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then
+    AC_MSG_RESULT([yes])
 else
-   AC_MSG_RESULT([no])
-   GNUCP=''
-fi
-
-if test -z "$GNUCP"; then
-   if test "$_os" = "SunOS" -o "$_os" = "FreeBSD"; then
-      AC_MSG_ERROR([no, GNU cp from coreutils is needed. install or specify with --with-gnu-cp=/path/to/it])
-   else
-      AC_MSG_RESULT([no GNU cp from coreutils found - using the system's cp command])
-   fi
+    case "$build_os" in
+        darwin*|netbsd*|openbsd*|freebsd*|dragonfly*)
+            GNUCP=''
+            AC_MSG_RESULT([no gnucp found - using the system's cp command])
+            ;;
+        *)
+            AC_MSG_ERROR([no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it])
+            ;;
+    esac
 fi
 
 AC_SUBST(GNUPATCH)
 AC_SUBST(GNUCP)
 
 dnl ***************************************
-dnl testing bash tools path on Windows
+dnl testing assembler path
 dnl ***************************************
-if test "$_os" = "WINNT"; then
-    CYGWIN_PATH=""
-    AC_PATH_PROG(CYGWIN_PATH, bash)
-    CYGWIN_PATH=`dirname "$CYGWIN_PATH"`
-fi
-if test -z "$CYGWIN_PATH"; then
-   CYGWIN_PATH="NO_CYGWIN"
-fi
-AC_SUBST(CYGWIN_PATH)
-
-dnl ***************************************
-dnl testing ml.exe assembler path
-dnl ***************************************
-if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
-  AC_MSG_CHECKING([ml.exe assembler path])
+if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
+  if test "$CL_X64" = ""; then
+    assembler=ml.exe
+    assembler_bin=bin
+  else
+    assembler=ml64.exe
+    assembler_bin=bin/amd64
+  fi
   if test -n "$with_asm_home"; then
     with_asm_home=`cygpath -u "$with_asm_home"`
   fi
-  if test ! -x "$with_asm_home/ml.exe"; then
-    AC_PATH_PROG(ML_EXE, ml.exe)
+  if test -x "$with_asm_home/$assembler"; then
+     AC_MSG_CHECKING([$assembler assembler path])
+     AC_MSG_RESULT([$with_asm_home/$assembler])
+  else
+    AC_PATH_PROG(ML_EXE, $assembler)
     if test -z "$ML_EXE"; then
-      if test -x "$with_cl_home/bin/ml.exe"; then
-        with_asm_home=$with_cl_home/bin
-        AC_MSG_RESULT([found ($with_asm_home)])
+      AC_MSG_CHECKING([$with_cl_home/$assembler_bin/$assembler])
+      if test -x "$with_cl_home/$assembler_bin/$assembler"; then
+        with_asm_home=$with_cl_home/$assembler_bin
+        AC_MSG_RESULT([found])
       else
-        AC_MSG_ERROR([Configure did not find ml.exe assembler.])
+        AC_MSG_ERROR([Configure did not find $assembler assembler.])
       fi
     else
        with_asm_home="ASM_IN_PATH"
     fi
   fi
-  AC_MSG_RESULT([$ASM_HOME])
 else
   with_asm_home="NO_ASM_HOME"
 fi
 ASM_HOME="$with_asm_home"
 AC_SUBST(ASM_HOME)
- 
-dnl ===================================================================
-dnl testing handle deprecated unzip switch
-dnl ===================================================================
-if test -z "$with_zip_home"; then
-	with_zip_home="$with_unzip_home"
-fi
-dnl ===================================================================
-dnl Zip will be found where you tell me to find it
-dnl ===================================================================
-if test -n "$with_zip_home" ; then
-    if test "$_os" = "WINNT"; then
-        with_zip_home=`cygpath -u "$with_zip_home"`
-    fi
-    ZIP="$with_zip_home/zip"
-    UNZIP="$with_zip_home/unzip"
-    ZIP_HOME="$with_zip_home"
-else
-    AC_PATH_PROG(ZIP, zip)
-    AC_PATH_PROG(UNZIP, unzip)
-    ZIP_HOME=`dirname "$ZIP"`
-fi
+
 dnl ===================================================================
-dnl Zip must be available or else it is an error, all platforms
+dnl We need zip and unzip
 dnl ===================================================================
-if test -z "$ZIP" -o -z "$UNZIP"; then
-    AC_MSG_ERROR([Zip/Unzip are required to build, please install or use --with-zip-home],,)
-fi
+AC_PATH_PROG(ZIP, zip)
+test -z "$ZIP" && AC_MSG_ERROR([zip is required])
+AC_PATH_PROG(UNZIP, unzip)
+test -z "$ZIP" && AC_MSG_ERROR([unzip is required])
 if "$ZIP" -FS < /dev/null 2>&1 | $EGREP "no such option: S" > /dev/null; then
     AC_MSG_ERROR([Zip version 3.0 or newer is required to build, please install or use --with-zip-home],,)
 fi
@@ -5491,114 +6241,37 @@ fi
 dnl ===================================================================
 dnl Zip must be a specific type for different build types.
 dnl ===================================================================
-if test "$_os" = "WINNT"; then
+if test $build_os = cygwin; then
     if test -n "`$ZIP -h | grep -i WinNT`" ; then
-AC_MSG_ERROR([$ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe.])
+        AC_MSG_ERROR([$ZIP is not the required Cygwin version of Info-ZIP's zip.exe.])
     fi
 fi
-AC_SUBST(ZIP_HOME)
-
-dnl ===================================================================
-dnl Windows builds need unicows.dll in external/unicows/
-dnl ===================================================================
-if test "$_os" = "WINNT"; then
-   AC_MSG_CHECKING([for unicows.dll])
-   if test -x ./external/unicows/unicows.dll; then
-      AC_MSG_RESULT([found])
-   else
-      AC_MSG_ERROR([The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/.
-Get it from the Microsoft site and put it into external/unicows.
-(Note: Microsoft seems to enjoy changing the exact location of this file. You
-may have to search Microsoft's website.) Last time it was seen at:
-<http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642/unicows.exe>.])
-   fi
-fi
 
 dnl ===================================================================
-dnl Windows builds need dbghelp.dll in external/dbghelp/
+dnl Test which vclplugs have to be built.
 dnl ===================================================================
-if test "$_os" = "WINNT"; then
-   AC_MSG_CHECKING([for dbghelp.dll])
-   if test -x ./external/dbghelp/dbghelp.dll; then
-      AC_MSG_RESULT([found])
-   else
-      AC_MSG_ERROR([dbghelp.dll is missing in external/dbghelp/.
-Get it from the Microsoft site and put it into external/dbghelp.
-(Note: Microsoft seems to enjoy changing the exact location of this file. You
-may have to search Microsoft's website.) Last time it was seen at:
-<http://www.microsoft.com/downloads/release.asp?releaseid=30682>.])
+R=""
+GTK3_CFLAGS=""
+GTK3_LIBS=""
+ENABLE_GTK3=""
+if test "x$enable_gtk3" = "xyes"; then
+   if test "$with_system_cairo" != yes; then
+      echo "System cairo required for gtk3 support, please use --system-cairo"
    fi
-fi
-
-dnl ===================================================================
-dnl Windows builds - use oowintool to copy CRT dlls and manifest
-dnl ===================================================================
-if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
-       if ./oowintool --msvc-copy-dlls ./external/msvcp ; then
-          :
-       else
-          AC_MSG_ERROR([oowintool failed to copy CRT])
-       fi
-fi
-
-dnl ===================================================================
-dnl Windows builds need gdiplus.dll in external/gdiplus/
-dnl ===================================================================
-if test "$_os" = "WINNT"; then
-   AC_MSG_CHECKING([for gdiplus.dll])
-   if test -x ./external/gdiplus/gdiplus.dll; then
-      AC_MSG_RESULT([found])
-   else
-      AC_MSG_ERROR([gdiplus.dll is missing in external/gdiplus/.
-Get it from the Microsoft site and put it into external/gdiplus.
-You may have to search Microsoft's website. Last time it was seen at:
-<http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>.])
+   PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.0 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
+   if test "x$ENABLE_GTK3" = "xTRUE"; then
+      R="gtk3"
    fi
 fi
+AC_SUBST(GTK3_LIBS)
+AC_SUBST(GTK3_CFLAGS)
+AC_SUBST(ENABLE_GTK3)
 
-dnl ===================================================================
-dnl Windows builds - attempt to auto-copy required instmsiX.exe into external/
-dnl ===================================================================
-if test "$_os" = "WINNT"; then
-       ./oowintool --msvc-copy-instmsi ./external/msi
-fi
-
-dnl ===================================================================
-dnl Windows builds with VS 2003/2005/2008 need instmsia.exe and instmsiw.exe in external/msi
-dnl ===================================================================
-if test "$_os" = "WINNT"; then
-   if test  "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
-   AC_MSG_CHECKING([for instmsia.exe/instmsiw.exe])
-   if test -x ./external/msi/instmsia.exe -a -x ./external/msi/instmsiw.exe; then
-      AC_MSG_RESULT([found])
-   else
-      MSIAPATH=`/bin/find "$COMPATH/.." -iname instmsia.exe | head -n 1`
-      MSIWPATH=`/bin/find "$COMPATH/.." -iname instmsiw.exe | head -n 1`
-      if test -n "$MSIAPATH" -a -n "$MSIWPATH"; then
-         cp "$MSIAPATH" ./external/msi/ && chmod +x ./external/msi/instmsia.exe && MSIACOPY="OK"
-         cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK"
-      fi
-      if test -z "$MSIACOPY" -o -z "$MSIWCOPY"; then
-         AC_MSG_ERROR([instmsia.exe and/or instmsiw.exe are/is missing in the default location.
-These programs are part of the Visual Studio installation and should be found in a
-directory similar to:
-"c:\\Program Files\\Microsoft Visual Studio .NET 2003\\Common7\\Tools\\Deployment\\MsiRedist\\"
-As the automatic detection fails please copy the files to external/msi/.])
-      else
-         AC_MSG_RESULT([found and copied])
-      fi
-   fi
-fi
-fi
-
-dnl ===================================================================
-dnl Test which vclplugs have to be built.
-dnl ===================================================================
 AC_MSG_CHECKING([which VCLplugs shall be built])
 ENABLE_GTK=""
 if test "x$enable_gtk" = "xyes"; then
     ENABLE_GTK="TRUE"
-    R="gtk"
+    R="gtk $R"
 fi
 AC_SUBST(ENABLE_GTK)
 
@@ -5617,9 +6290,9 @@ fi
 AC_SUBST(ENABLE_KDE4)
 
 if test -z "$R"; then
-	AC_MSG_RESULT([none])
+    AC_MSG_RESULT([none])
 else
-	AC_MSG_RESULT([$R])
+    AC_MSG_RESULT([$R])
 fi
 
 dnl ===================================================================
@@ -5628,7 +6301,7 @@ dnl ===================================================================
 
 ENABLE_GCONF=""
 AC_MSG_CHECKING([whether to enable GConf support])
-if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "OS2" -a "$enable_gconf" = "yes"; then
+if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gconf" = "yes"; then
     ENABLE_GCONF="TRUE"
     AC_MSG_RESULT([yes])
     PKG_CHECK_MODULES( GCONF, gconf-2.0 )
@@ -5671,8 +6344,9 @@ if test  "$test_gtk" = "yes"; then
       BUILD_TYPE="$BUILD_TYPE GTK"
 
       if test "x$enable_systray" = "xyes"; then
-         ENABLE_SYSTRAY_GTK="TRUE"
-         BUILD_TYPE="$BUILD_TYPE SYSTRAY_GTK"
+         PKG_CHECK_MODULES( GTK210, gtk+-2.0 >= 2.10.0,
+			    [ ENABLE_SYSTRAY_GTK="TRUE" ],
+			    [ ENABLE_SYSTRAY_GTK="" ])
       fi
 
       AC_MSG_CHECKING([whether to enable DBUS support])
@@ -5695,9 +6369,7 @@ if test  "$test_gtk" = "yes"; then
       else
           AC_MSG_RESULT([no])
       fi
-
    fi
-
 fi
 AC_SUBST(ENABLE_GIO)
 AC_SUBST(ENABLE_DBUS)
@@ -5707,56 +6379,44 @@ AC_SUBST(GTK_LIBS)
 AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
 
-dnl ===================================================================
-dnl Check whether the GStreamer libraries are available.
-dnl ===================================================================
+PKG_CHECK_MODULES( LIBPNG, libpng, ENABLE_QUICKSTART_LIBPNG="TRUE", ENABLE_QUICKSTART_LIBPNG="" )
+AC_SUBST(LIBPNG_LIBS)
+AC_SUBST(LIBPNG_CFLAGS)
 
-GSTREAMER_CFLAGS=""
-GSTREAMER_LIBS=""
-ENABLE_GSTREAMER=""
-
-if test "$test_gstreamer" = "yes"; then
-    AC_MSG_CHECKING([whether to build the GStreamer media backend])
-    if test "x$enable_gstreamer" != "xno" ; then
-        PKG_CHECK_MODULES( GSTREAMER, gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 ,,AC_MSG_ERROR([requirements to build the GStreamer media backend not met. Use --disable-gstreamer or install the missing packages]))
-        ENABLE_GSTREAMER="TRUE"
-        AC_MSG_RESULT([yes])
-    else
-        AC_MSG_RESULT([no])
-    fi
+AC_MSG_CHECKING([whether to enable libpng linking in quickstarter])
+if test "x$enable_unix_libpng" = "xyes"; then
+   AC_MSG_RESULT([yes])
+else
+   AC_MSG_RESULT([no])
+   ENABLE_QUICKSTART_LIBPNG=""
 fi
-AC_SUBST(ENABLE_GSTREAMER)
-AC_SUBST(GSTREAMER_CFLAGS)
-AC_SUBST(GSTREAMER_LIBS)
-
+AC_SUBST(ENABLE_QUICKSTART_LIBPNG)
 
 dnl ===================================================================
-dnl Check whether the Cairo libraries are available.
+dnl Test whether to build cairo or rely on the system version
 dnl ===================================================================
 
-ENABLE_CAIRO=""
+dnl ENABLE_CAIRO will be set to empty later when necessary
+ENABLE_CAIRO="TRUE"
+
 BUILD_PIXMAN=""
 SYSTEM_CAIRO=""
 
-if test  "$test_cairo" = "yes"; then
-
-    AC_MSG_CHECKING([whether to use cairo])
-    if test "x$enable_cairo" != "xno" ; then
-        ENABLE_CAIRO="TRUE"
-	AC_MSG_RESULT([yes])
-        AC_MSG_CHECKING([which cairo to use])
-        if test -n "$with_system_cairo" -o -n "$with_system_libs" && \
-           test "$with_system_cairo" != "no"; then
-           AC_MSG_RESULT([external])
-           SYSTEM_CAIRO=YES
-	   
-           PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 )
-	   if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$ENABLE_FONTCONFIG" != "TRUE" ; then
-	      AC_MSG_ERROR([Cairo library requires fontconfig.])
-	   fi
-           if test "$with_system_xrender_headers" = "yes"; then
-              AC_MSG_CHECKING([whether Xrender.h defines PictStandardA8])
-              AC_TRY_RUN([
+AC_MSG_CHECKING([whether to use the system cairo])
+
+if test "$with_system_cairo" = yes -o \( "$with_system_libs" = yes -a "$with_system_cairo" != no \); then
+    SYSTEM_CAIRO=YES
+    AC_MSG_RESULT([yes])
+
+    PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 )
+
+    if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$ENABLE_FONTCONFIG" != "TRUE" ; then
+        AC_MSG_ERROR([Cairo library requires fontconfig.])
+    fi
+
+    if test "$with_system_xrender_headers" = "yes"; then
+        AC_MSG_CHECKING([whether Xrender.h defines PictStandardA8])
+        AC_TRY_RUN([
 #include <X11/extensions/Xrender.h>
 
 int main(int argc, char **argv) {
@@ -5766,19 +6426,15 @@ int main(int argc, char **argv) {
       return 1;
 #endif
 }
-               ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no, X headers too old.])])
-           fi
-        else
-           BUILD_TYPE="$BUILD_TYPE CAIRO"
-	   dnl === compiler fails on pixman with 64bit architectures...===
-	   if test "$build_cpu" != "x86_64"; then
-	      BUILD_PIXMAN=YES
-	   fi
-           AC_MSG_RESULT([internal])	   
-        fi
-    else
-	   AC_MSG_RESULT([no])
+        ],
+        [AC_MSG_RESULT([yes])],
+        [AC_MSG_ERROR([no, X headers too old.])]
+        )
     fi
+else
+    AC_MSG_RESULT([no])
+    BUILD_TYPE="$BUILD_TYPE CAIRO"
+    BUILD_PIXMAN=YES
 fi
 
 AC_SUBST(ENABLE_CAIRO)
@@ -5794,27 +6450,24 @@ fi
 AC_SUBST(ENABLE_CAIRO_CANVAS)
 
 dnl ===================================================================
-dnl Check whether the librsvg libraries are available.
+dnl Check whether the GStreamer libraries are available.
 dnl ===================================================================
 
-ENABLE_LIBRSVG=""
-LIBRSVG_CFLAGS=""
-LIBRSVG_LIBS=""
+ENABLE_GSTREAMER=""
+
+if test  "$build_gstreamer" = "yes"; then
 
-if test  "$test_librsvg" = "yes"; then
-    AC_MSG_CHECKING([whether to use librsvg])
-    if test "x$enable_librsvg" != "xno" ; then
-        PKG_CHECK_MODULES( LIBRSVG, librsvg-2.0 >= 2.14,,AC_MSG_ERROR([requirements to build with librsvg support not met. Use --disable-librsvg or install the missing packages]))
-        ENABLE_LIBRSVG="TRUE"
-        AC_MSG_RESULT([yes])
+    AC_MSG_CHECKING([whether to enable the GStreamer avmedia backend])
+    if test "x$enable_gstreamer" != "xno" ; then
+        ENABLE_GSTREAMER="TRUE"
+    AC_MSG_RESULT([yes])
+    PKG_CHECK_MODULES( GSTREAMER, gstreamer-0.10 gstreamer-plugins-base-0.10 )
     else
-        AC_MSG_RESULT([no])
+         AC_MSG_RESULT([no])
     fi
 fi
 
-AC_SUBST(ENABLE_LIBRSVG)
-AC_SUBST(LIBRSVG_CFLAGS)
-AC_SUBST(LIBRSVG_LIBS)
+AC_SUBST(ENABLE_GSTREAMER)
 
 dnl ===================================================================
 dnl Check whether the OpenGL libraries are available
@@ -5823,53 +6476,81 @@ dnl ===================================================================
 AC_MSG_CHECKING([whether to build the OpenGL Transitions component])
 ENABLE_OPENGL=
 
-if test "x$enable_opengl" != "xno" ; then
-   AC_MSG_RESULT([yes])
-   AC_CHECK_HEADER(GL/gl.h, [],
-                   [AC_MSG_ERROR([OpenGL headers not found])], [])
-   AC_CHECK_LIB(GL, main, [],
-     [AC_MSG_ERROR(libGL not installed or functional)], [])
-   AC_CHECK_LIB(GLU, main, [],
-     [AC_MSG_ERROR(libGLU not installed or functional)], [])
+if test "$_os" = "Darwin" ; then
+   # We use frameworks on Mac OS X, no need for detail checks
    ENABLE_OPENGL=TRUE
+   AC_MSG_RESULT([yes])
 else
-   AC_MSG_RESULT([no])
+   if test "x$enable_opengl" != "xno" ; then
+      if test "$_os" != "WINNT"; then
+         save_LDFLAGS=$LDFLAGS
+         LDFLAGS="$LDFLAGS -lm"
+         AC_MSG_RESULT([yes])
+         AC_CHECK_LIB(GL, main, [],
+                      [AC_MSG_ERROR(libGL not installed or functional)], [])
+         AC_CHECK_LIB(GLU, main, [],
+                      [AC_MSG_ERROR(libGLU not installed or functional)], [])
+         ENABLE_OPENGL=TRUE
+         LDFLAGS=$save_LDFLAGS
+
+         dnl ===================================================================
+         dnl Check for system Mesa
+         dnl ===================================================================
+         AC_MSG_CHECKING([which Mesa headers to use])
+         if test -n "$with_system_mesa_headers" -o -n "$with_system_headers" && \
+            test "$with_system_mesa_headers" != "no"; then
+            AC_MSG_RESULT([external])
+            SYSTEM_MESA_HEADERS=YES
+            AC_LANG_PUSH(C)
+            AC_CHECK_HEADER(GL/glxext.h, [],
+               [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
+            AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC])
+            AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
+            AC_LANG_POP(C)
+         else
+            AC_MSG_RESULT([internal])
+            SYSTEM_MESA_HEADERS=NO
+            BUILD_TYPE="$BUILD_TYPE MESA"
+        fi
+
+      else
+        AC_MSG_RESULT([not on Windows])
+      fi
+   else
+      AC_MSG_RESULT([no])
+   fi
 fi
 
+AC_SUBST(SYSTEM_MESA_HEADERS)
 AC_SUBST(ENABLE_OPENGL)
 
-AC_MSG_CHECKING([whether to build extra presenter ui])
-if test -n "$enable_presenter_extra_ui" -a "$enable_presenter_extra_ui" != "no"; then
-   AC_MSG_RESULT([yes])
-   ENABLE_PRESENTER_EXTRA_UI=YES
-else
-   AC_MSG_RESULT([no])
-   ENABLE_PRESENTER_EXTRA_UI=NO
-fi
-AC_SUBST(ENABLE_PRESENTER_EXTRA_UI)
-
+# presenter minimizer extension?
 AC_MSG_CHECKING([whether to build the Presentation Minimizer extension])
-if test -n "$enable_minimizer" -a "$enable_minimizer" != "no"; then
+AS_IF([test "x$enable_ext_presenter_minimizer" = "xyes"], [
    AC_MSG_RESULT([yes])
    ENABLE_MINIMIZER=YES
-else
+],[
    AC_MSG_RESULT([no])
    ENABLE_MINIMIZER=NO
-fi
+   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MINIMIZER"
+])
 AC_SUBST(ENABLE_MINIMIZER)
 
-AC_MSG_CHECKING([whether to build the Presenter Screen extension])
-if test -n "$enable_presenter_console" -a "$enable_presenter_screen" != "no"; then
+# presenter console extension?
+AC_MSG_CHECKING([whether to build the Presenter Console extension])
+AS_IF([test "x$enable_ext_presenter_console" = "xyes"], [
    AC_MSG_RESULT([yes])
    ENABLE_PRESENTER_SCREEN=YES
-else
+],[
    AC_MSG_RESULT([no])
    ENABLE_PRESENTER_SCREEN=NO
-fi
+   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_PRESENTER_SCREEN"
+])
 AC_SUBST(ENABLE_PRESENTER_SCREEN)
 
+# pdf import extension?
 AC_MSG_CHECKING([whether to build the PDF Import extension])
-if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
+AS_IF([test "x$enable_ext_pdfimport" = "xyes"], [
   AC_MSG_RESULT([yes])
   ENABLE_PDFIMPORT=YES
 
@@ -5886,47 +6567,37 @@ if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
       AC_MSG_RESULT([internal])
       SYSTEM_POPPLER=NO
       BUILD_TYPE="$BUILD_TYPE XPDF"
-      AC_MSG_CHECKING([for xpdf module])
-      if test -d ./xpdf; then
-       AC_MSG_RESULT([OK])
-      else
-        AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
-      fi
   fi
-else
-   AC_MSG_RESULT([no])
-   ENABLE_PDFIMPORT=NO
-fi
+],[
+  AC_MSG_RESULT([no])
+  ENABLE_PDFIMPORT=NO
+  SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_PDFIMPORT"
+])
 AC_SUBST(ENABLE_PDFIMPORT)
 AC_SUBST(SYSTEM_POPPLER)
 AC_SUBST(POPPLER_CFLAGS)
 AC_SUBST(POPPLER_LIBS)
 
+
 if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
   AC_MSG_CHECKING([for sdext module])
-  if test -d ./sdext; then
-   AC_MSG_RESULT([OK])
-  else
-   AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
-  fi
   BUILD_TYPE="$BUILD_TYPE SDEXT"
 fi
 
 AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
-if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test  "$WITH_JAVA" != "no"; then
+AS_IF([test "x$enable_ext_wiki_publisher" = "xyes"], [
   AC_MSG_RESULT([yes])
   AC_MSG_CHECKING([for swext module])
-  if test -d ./swext; then
-   AC_MSG_RESULT([OK])
-  else
-   AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
-  fi
   ENABLE_MEDIAWIKI=YES
   BUILD_TYPE="$BUILD_TYPE SWEXT"
-else
+  if test  "x$with_java" = "xno"; then
+    AC_MSG_ERROR([Wiki Publisher requires Java! Enable Java if you want to build it.])
+  fi
+],[
   AC_MSG_RESULT([no])
   ENABLE_MEDIAWIKI=NO
-fi
+  SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MEDIAWIKI"
+])
 AC_SUBST(ENABLE_MEDIAWIKI)
 
 if test "$ENABLE_MEDIAWIKI" = "YES"; then
@@ -5935,7 +6606,7 @@ if test "$ENABLE_MEDIAWIKI" = "YES"; then
     AC_MSG_RESULT([external])
     SYSTEM_SERVLETAPI=YES
       if test -z "$SERVLETAPI_JAR"; then
-	SERVLETAPI_JAR=/usr/share/java/servlet-api.jar
+    SERVLETAPI_JAR=/usr/share/java/servlet-api.jar
       fi
       AC_CHECK_FILE($SERVLETAPI_JAR, [],
              [AC_MSG_ERROR(servlet-api.jar not found.)], [])
@@ -5949,15 +6620,10 @@ AC_SUBST(SYSTEM_SERVLETAPI)
 AC_SUBST(SERVLETAPI_JAR)
 
 AC_MSG_CHECKING([whether to build the Report Builder extension])
-if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test "$WITH_JAVA" != "no"; then
+if test -n "$enable_ext_report_builder" -a "$enable_ext_report_builder" != "no" && test "$with_java" != "no"; then
   AC_MSG_RESULT([yes])
   ENABLE_REPORTBUILDER=YES
   AC_MSG_CHECKING([for reportbuilder module])
-  if test -d ./reportbuilder; then
-    AC_MSG_RESULT([OK])
-  else
-    AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
-  fi
   AC_MSG_CHECKING([which jfreereport libs to use])
   if test "$with_system_jfreereport" = "yes"; then
       SYSTEM_JFREEREPORT=YES
@@ -5969,10 +6635,10 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
              [AC_MSG_ERROR(sac.jar not found.)], [])
 
       if test -z $LIBXML_JAR; then
-        AC_CHECK_FILE(/usr/share/java/libxml-1.0.0.jar, 
+        AC_CHECK_FILE(/usr/share/java/libxml-1.0.0.jar,
           [ LIBXML_JAR=/usr/share/java/libxml-1.0.0.jar ],
           [
-            AC_CHECK_FILE(/usr/share/java/libxml.jar, 
+            AC_CHECK_FILE(/usr/share/java/libxml.jar,
               [ LIBXML_JAR=/usr/share/java/libxml.jar ],
               [AC_MSG_ERROR(libxml.jar replacement not found.)]
             )
@@ -5984,10 +6650,10 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
       fi
 
       if test -z $FLUTE_JAR; then
-        AC_CHECK_FILE(/usr/share/java/flute-1.3.0.jar, 
+        AC_CHECK_FILE(/usr/share/java/flute-1.3.0.jar,
           [ FLUTE_JAR=/usr/share/java/flute-1.3.0.jar ],
           [
-            AC_CHECK_FILE(/usr/share/java/flute.jar, 
+            AC_CHECK_FILE(/usr/share/java/flute.jar,
               [ FLUTE_JAR=/usr/share/java/flute.jar ],
               [ AC_MSG_ERROR(flute-1.3.0.jar replacement not found.)]
             )
@@ -5999,10 +6665,10 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
       fi
 
       if test -z $JFREEREPORT_JAR; then
-        AC_CHECK_FILE(/usr/share/java/flow-engine-0.9.2.jar, 
+        AC_CHECK_FILE(/usr/share/java/flow-engine-0.9.2.jar,
           [ JFREEREPORT_JAR=/usr/share/java/flow-engine-0.9.2.jar ],
           [
-            AC_CHECK_FILE(/usr/share/java/flow-engine.jar, 
+            AC_CHECK_FILE(/usr/share/java/flow-engine.jar,
               [ JFREEREPORT_JAR=/usr/share/java/flow-engine.jar ],
               [AC_MSG_ERROR(jfreereport.jar replacement not found.)]
             )
@@ -6014,10 +6680,10 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
       fi
 
       if test -z $LIBLAYOUT_JAR; then
-        AC_CHECK_FILE(/usr/share/java/liblayout-0.2.9.jar, 
+        AC_CHECK_FILE(/usr/share/java/liblayout-0.2.9.jar,
           [ LIBLAYOUT_JAR=/usr/share/java/liblayout-0.2.9.jar ],
           [
-            AC_CHECK_FILE(/usr/share/java/liblayout.jar, 
+            AC_CHECK_FILE(/usr/share/java/liblayout.jar,
               [ LIBLAYOUT_JAR=/usr/share/java/liblayout.jar ],
               [AC_MSG_ERROR(liblayout.jar replacement not found.)]
             )
@@ -6029,10 +6695,10 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
       fi
 
       if test -z $LIBLOADER_JAR; then
-        AC_CHECK_FILE(/usr/share/java/libloader-1.0.0.jar, 
+        AC_CHECK_FILE(/usr/share/java/libloader-1.0.0.jar,
           [ LIBLOADER_JAR=/usr/share/java/libloader-1.0.0.jar ],
           [
-            AC_CHECK_FILE(/usr/share/java/libloader.jar, 
+            AC_CHECK_FILE(/usr/share/java/libloader.jar,
               [ LIBLOADER_JAR=/usr/share/java/libloader.jar ],
               [AC_MSG_ERROR(libloader.jar replacement not found.)]
             )
@@ -6044,10 +6710,10 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
       fi
 
       if test -z $LIBFORMULA_JAR; then
-        AC_CHECK_FILE(/usr/share/java/libformula-0.2.0.jar, 
+        AC_CHECK_FILE(/usr/share/java/libformula-0.2.0.jar,
           [ LIBFORMULA_JAR=/usr/share/java/libformula-0.2.0.jar ],
           [
-            AC_CHECK_FILE(/usr/share/java/libformula.jar, 
+            AC_CHECK_FILE(/usr/share/java/libformula.jar,
               [ LIBFORMULA_JAR=/usr/share/java/libformula.jar ],
               [AC_MSG_ERROR(libformula.jar replacement not found.)]
             )
@@ -6059,10 +6725,10 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
       fi
 
       if test -z $LIBREPOSITORY_JAR; then
-        AC_CHECK_FILE(/usr/share/java/librepository-1.0.0.jar, 
+        AC_CHECK_FILE(/usr/share/java/librepository-1.0.0.jar,
           [ LIBREPOSITORY_JAR=/usr/share/java/librepository-1.0.0.jar ],
           [
-            AC_CHECK_FILE(/usr/share/java/librepository.jar, 
+            AC_CHECK_FILE(/usr/share/java/librepository.jar,
               [ LIBREPOSITORY_JAR=/usr/share/java/librepository.jar ],
               [AC_MSG_ERROR(librepository.jar replacement not found.)]
             )
@@ -6074,10 +6740,10 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
       fi
 
       if test -z $LIBFONTS_JAR; then
-        AC_CHECK_FILE(/usr/share/java/libfonts-1.0.0.jar, 
+        AC_CHECK_FILE(/usr/share/java/libfonts-1.0.0.jar,
           [ LIBFONTS_JAR=/usr/share/java/libfonts-1.0.0.jar ],
           [
-            AC_CHECK_FILE(/usr/share/java/libfonts.jar, 
+            AC_CHECK_FILE(/usr/share/java/libfonts.jar,
               [ LIBFONTS_JAR=/usr/share/java/libfonts.jar ],
               [AC_MSG_ERROR(libfonts.jar replacement not found.)]
             )
@@ -6089,10 +6755,10 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
       fi
 
       if test -z $LIBSERIALIZER_JAR; then
-        AC_CHECK_FILE(/usr/share/java/libserializer-1.0.0.jar, 
+        AC_CHECK_FILE(/usr/share/java/libserializer-1.0.0.jar,
           [ LIBSERIALIZER_JAR=/usr/share/java/libserializer-1.0.0.jar ],
           [
-            AC_CHECK_FILE(/usr/share/java/libserializer.jar, 
+            AC_CHECK_FILE(/usr/share/java/libserializer.jar,
               [ LIBSERIALIZER_JAR=/usr/share/java/libserializer.jar ],
               [AC_MSG_ERROR(libserializer.jar replacement not found.)]
             )
@@ -6105,10 +6771,10 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
 
 
       if test -z $LIBBASE_JAR; then
-        AC_CHECK_FILE(/usr/share/java/libbase-1.0.0.jar, 
+        AC_CHECK_FILE(/usr/share/java/libbase-1.0.0.jar,
           [ LIBBASE_JAR=/usr/share/java/libbase-1.0.0.jar ],
           [
-            AC_CHECK_FILE(/usr/share/java/libbase.jar, 
+            AC_CHECK_FILE(/usr/share/java/libbase.jar,
               [ LIBBASE_JAR=/usr/share/java/libbase.jar ],
               [AC_MSG_ERROR(libbase.jar replacement not found.)]
             )
@@ -6122,11 +6788,6 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
   else
      AC_MSG_RESULT([internal])
      AC_MSG_CHECKING([for jfreereport module])
-     if test -d ./jfreereport; then
-      AC_MSG_RESULT([OK]) 
-     else
-      AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
-     fi
      SYSTEM_JFREEREPORT=NO
      BUILD_TYPE="$BUILD_TYPE JFREEREPORT"
   fi
@@ -6134,6 +6795,7 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
 else
   AC_MSG_RESULT([no])
   ENABLE_REPORTBUILDER=NO
+  SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_REPORTDESIGN"
   SYSTEM_JFREEREPORT=NO
 fi
 AC_SUBST(ENABLE_REPORTBUILDER)
@@ -6150,7 +6812,7 @@ AC_SUBST(LIBREPOSITORY_JAR)
 AC_SUBST(LIBFONTS_JAR)
 AC_SUBST(LIBSERIALIZER_JAR)
 
-# this has to be here because both the wiki publisher and the SRB use
+# this has to be here because both the Wiki Publisher and the SRB use
 # commons-logging
 if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
   AC_MSG_CHECKING([which Apache commons-* libs to use])
@@ -6159,10 +6821,10 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
     AC_MSG_RESULT([external])
     if test "$ENABLE_MEDIAWIKI" = "YES"; then
       if test -z $COMMONS_CODEC_JAR; then
-        AC_CHECK_FILE(/usr/share/java/commons-codec-1.3.jar, 
+        AC_CHECK_FILE(/usr/share/java/commons-codec-1.3.jar,
           [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar ],
           [
-            AC_CHECK_FILE(/usr/share/java/commons-codec.jar, 
+            AC_CHECK_FILE(/usr/share/java/commons-codec.jar,
               [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar ],
               [AC_MSG_ERROR(commons-codec.jar replacement not found.)]
             )
@@ -6174,10 +6836,10 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
       fi
 
       if test -z $COMMONS_LANG_JAR; then
-        AC_CHECK_FILE(/usr/share/java/commons-lang-2.3.jar, 
+        AC_CHECK_FILE(/usr/share/java/commons-lang-2.3.jar,
           [ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar ],
           [
-            AC_CHECK_FILE(/usr/share/java/commons-lang.jar, 
+            AC_CHECK_FILE(/usr/share/java/commons-lang.jar,
               [ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ],
               [AC_MSG_ERROR(commons-lang.jar replacement not found.)]
             )
@@ -6189,10 +6851,10 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
       fi
 
       if test -z $COMMONS_HTTPCLIENT_JAR; then
-        AC_CHECK_FILE(/usr/share/java/commons-httpclient-3.1.jar, 
+        AC_CHECK_FILE(/usr/share/java/commons-httpclient-3.1.jar,
           [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar ],
           [
-            AC_CHECK_FILE(/usr/share/java/commons-httpclient.jar, 
+            AC_CHECK_FILE(/usr/share/java/commons-httpclient.jar,
               [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar ],
               [AC_MSG_ERROR(commons-httpclient.jar replacement not found.)]
             )
@@ -6205,10 +6867,10 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
     fi
     if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
       if test -z $COMMONS_LOGGING_JAR; then
-        AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar, 
+        AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar,
           [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ],
           [
-            AC_CHECK_FILE(/usr/share/java/commons-logging.jar, 
+            AC_CHECK_FILE(/usr/share/java/commons-logging.jar,
               [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ],
               [AC_MSG_ERROR(commons-logging.jar replacement not found.)]
             )
@@ -6231,31 +6893,77 @@ AC_SUBST(COMMONS_LANG_JAR)
 AC_SUBST(COMMONS_HTTPCLIENT_JAR)
 AC_SUBST(COMMONS_LOGGING_JAR)
 
+# scripting provider for BeanShell extension?
+AC_MSG_CHECKING([whether to build extension for support of scripts in BeanShell])
+AS_IF([test "x$enable_ext_scripting_beanshell" = "xyes"], [
+   AC_MSG_RESULT([yes])
+   ENABLE_SCRIPTING_BEANSHELL=YES
+],[
+   AC_MSG_RESULT([no])
+   ENABLE_SCRIPTING_BEANSHELL=NO
+   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_SCRIPTING_BEANSHELL"
+])
+AC_SUBST(ENABLE_SCRIPTING_BEANSHELL)
+
+# scripting provider for JavaScript extension?
+AC_MSG_CHECKING([whether to build extension for support of scripts in JavaScript])
+AS_IF([test "x$enable_ext_scripting_javascript" = "xyes"], [
+   AC_MSG_RESULT([yes])
+   ENABLE_SCRIPTING_JAVASCRIPT=YES
+],[
+   AC_MSG_RESULT([no])
+   ENABLE_SCRIPTING_JAVASCRIPT=NO
+   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT"
+])
+AC_SUBST(ENABLE_SCRIPTING_JAVASCRIPT)
+
+dnl Scripting provider for Python extension?
+dnl We always provide this unless we have disabled Python completely
+if test $enable_python = no; then
+   ENABLE_SCRIPTING_PYTHON=NO
+else
+   ENABLE_SCRIPTING_PYTHON=YES
+fi
+AC_SUBST(ENABLE_SCRIPTING_PYTHON)
+
+supports_multilib=
+case "$host_cpu" in
+   x86_64 | powerpc64 | s390x)
+      if test "$SIZEOF_LONG" = "8"; then
+          supports_multilib="yes"
+      fi
+      ;;
+   *)
+      ;;
+esac
+
 dnl ===================================================================
-dnl Check whether the Qt and KDE libraries are available.
+dnl Check whether the Qt3 and KDE3 libraries are available.
 dnl ===================================================================
 
 KDE_CFLAGS=""
 KDE_LIBS=""
-MOC="moc"
+if test "$_os" != "OpenBSD"; then
+    MOC="moc"
+fi
 if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
-    dnl Search paths for Qt and KDE
-    if test "$build_cpu" != "x86_64" ; then
-        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include $x_includes"
-        qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib $x_libraries"
+    dnl Search paths for Qt3 and KDE3
+    if test -z "$supports_multilib" ; then
+        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include /usr/local/include/X11/qt3 $x_includes"
+        qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib /usr/local/lib/qt3 $x_libraries"
     else
-        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib64/qt3/include /usr/lib64/qt/include /usr/share/qt3/include /usr/lib/qt3/include /usr/lib/qt/include $x_includes"
-        qt_libdirs="$QTLIB /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib64/qt3/lib64 /usr/lib64/qt/lib64 /usr/share/qt3/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib $x_libraries"
+        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib64/qt3/include /usr/lib64/qt/include /usr/share/qt3/include /usr/lib/qt3/include /usr/lib/qt/include /usr/local/include/X11/qt3 $x_includes"
+        qt_libdirs="$QTLIB /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib64/qt3/lib64 /usr/lib64/qt/lib64 /usr/share/qt3/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib /usr/local/lib/qt3 $x_libraries"
     fi
     if test -n "$QTDIR" ; then
         qt_incdirs="$QTDIR/include $qt_incdirs"
-        if test "$build_cpu" != "x86_64" ; then
+        if test -z "$supports_multilib" ; then
             qt_libdirs="$QTDIR/lib $qt_libdirs"
         else
             qt_libdirs="$QTDIR/lib64 $QTDIR/lib $qt_libdirs"
         fi
     fi
-    if test "$build_cpu" != "x86_64" ; then
+    if test -z "$supports_multilib" ; then
         kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes"
         kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib $x_libraries"
     else
@@ -6264,7 +6972,7 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
     fi
     if test -n "$KDEDIR" ; then
         kde_incdirs="$KDEDIR/include $kde_incdirs"
-        if test "$build_cpu" != "x86_64" ; then
+        if test -z "$supports_multilib" ; then
             kde_libdirs="$KDEDIR/lib $kde_libdirs"
         else
             kde_libdirs="$KDEDIR/lib64 $KDEDIR/lib $kde_libdirs"
@@ -6273,12 +6981,18 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
 
     dnl What to test
     qt_test_include="qstyle.h"
-    qt_test_library="libqt-mt.so"
-    kde_test_include="ksharedptr.h"
-    kde_test_library="libkdeui.so"
+    kde_test_include="kapp.h"
+
+    if test "$_os" != "OpenBSD"; then
+        qt_test_library="libqt-mt.so"
+        kde_test_library="libDCOP.so"
+    else
+        qt_test_library="libqt-mt.so*"
+        kde_test_library="libDCOP.so*"
+    fi
 
-    dnl Check for Qt headers
-    AC_MSG_CHECKING([for Qt headers])
+    dnl Check for Qt3 headers
+    AC_MSG_CHECKING([for Qt3 headers])
     qt_incdir="no"
     for kde_check in $qt_incdirs ; do
         if test -r "$kde_check/$qt_test_include" ; then
@@ -6288,34 +7002,34 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
     done
     AC_MSG_RESULT([$qt_incdir])
     if test "x$qt_incdir" = "xno" ; then
-        AC_MSG_ERROR([Qt headers not found.  Please specify the root of
-your Qt installation by exporting QTDIR before running "configure".])
+        AC_MSG_ERROR([Qt3 headers not found.  Please specify the root of
+your Qt3 installation by exporting QTDIR before running "configure".])
     fi
 
-    dnl Check for Qt libraries
-    AC_MSG_CHECKING([for Qt libraries])
+    dnl Check for Qt3 libraries
+    AC_MSG_CHECKING([for Qt3 libraries])
     qt_libdir="no"
     for qt_check in $qt_libdirs ; do
-        if test -r "$qt_check/$qt_test_library" ; then
+        if test -r "`ls $qt_check/$qt_test_library 2>/dev/null | head -1`" ; then
             qt_libdir="$qt_check"
             break
         fi
     done
     AC_MSG_RESULT([$qt_libdir])
     if test "x$qt_libdir" = "xno" ; then
-        AC_MSG_ERROR([Qt libraries not found.  Please specify the root of
-your Qt installation by exporting QTDIR before running "configure".])
+        AC_MSG_ERROR([Qt3 libraries not found.  Please specify the root of
+your Qt3 installation by exporting QTDIR before running "configure".])
     fi
 
     dnl Check for Meta Object Compiler
-    AC_PATH_PROG( MOC, moc, no, [$QTDIR/bin:$PATH] )
+    AC_PATH_PROG( MOC, moc, no, [`dirname $qt_libdir`/bin:$QTDIR/bin:$PATH] )
     if test "$MOC" = "no" ; then
-        AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
-the root of your Qt installation by exporting QTDIR before running "configure".])
+        AC_MSG_ERROR([Qt3 Meta Object Compiler not found.  Please specify
+the root of your Qt3 installation by exporting QTDIR before running "configure".])
     fi
 
-    dnl Check for KDE headers
-    AC_MSG_CHECKING([for KDE headers])
+    dnl Check for KDE3 headers
+    AC_MSG_CHECKING([for KDE3 headers])
     kde_incdir="no"
     for kde_check in $kde_incdirs ; do
         if test -r "$kde_check/$kde_test_include" ; then
@@ -6325,23 +7039,23 @@ the root of your Qt installation by exporting QTDIR before running "configure".]
     done
     AC_MSG_RESULT([$kde_incdir])
     if test "x$kde_incdir" = "xno" ; then
-        AC_MSG_ERROR([KDE headers not found.  Please specify the root of
-your KDE installation by exporting KDEDIR before running "configure".])
+        AC_MSG_ERROR([KDE3 headers not found.  Please specify the root of
+your KDE3 installation by exporting KDEDIR before running "configure".])
     fi
 
-    dnl Check for KDE libraries
-    AC_MSG_CHECKING([for KDE libraries])
+    dnl Check for KDE3 libraries
+    AC_MSG_CHECKING([for KDE3 libraries])
     kde_libdir="no"
     for kde_check in $kde_libdirs ; do
-        if test -r "$kde_check/$kde_test_library" ; then
+        if test -r "`ls $kde_check/$kde_test_library 2>/dev/null | head -1`" ; then
             kde_libdir="$kde_check"
             break
         fi
     done
     AC_MSG_RESULT([$kde_libdir])
     if test "x$kde_libdir" = "xno" ; then
-        AC_MSG_ERROR([KDE libraries not found.  Please specify the root of
-your KDE installation by exporting KDEDIR before running "configure".])
+        AC_MSG_ERROR([KDE3 libraries not found.  Please specify the root of
+your KDE3 installation by exporting KDEDIR before running "configure".])
     fi
 
     dnl Set the variables
@@ -6359,21 +7073,49 @@ dnl ===================================================================
 KDE4_CFLAGS=""
 KDE4_LIBS=""
 MOC4="moc"
+KDE_GLIB_CFLAGS=""
+KDE_GLIB_LIBS=""
+KDE_HAVE_GLIB=""
 if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
-   qt_incdirs="$QT4INC $QT4DIR /usr/include/qt4 /usr/include $x_includes"
+   qt_incdirs="$QT4INC /usr/include/qt4 /usr/include $x_includes"
    qt_libdirs="$QT4LIB /usr/lib $x_libraries"
-   
-   kde_incdirs="/usr/include $x_includes"
-   kde_libdirs="/usr/lib $x_libraries"
-   
-   if test "$build_cpu" = "x86_64" ; then
+
+   kde_incdirs="/usr/include /usr/include/kde4 $x_includes"
+   kde_libdirs="/usr/lib /usr/lib/kde4 /usr/lib/kde4/devel $x_libraries"
+
+   if test -n "$supports_multilib" ; then
       qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
-      kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
+      kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4 /usr/lib64/kde4/devel"
+   fi
+
+   if test -n "$QTDIR" ; then
+      qt_incdirs="$QTDIR/include $qt_incdirs"
+      if test -z "$supports_multilib" ; then
+         qt_libdirs="$QTDIR/lib $qt_libdirs"
+      else
+         qt_libdirs="$QTDIR/lib64 $QTDIR/lib $qt_libdirs"
+      fi
+   fi
+   if test -n "$QT4DIR" ; then
+      qt_incdirs="$QT4DIR/include $qt_incdirs"
+      if test -z "$supports_multilib" ; then
+         qt_libdirs="$QT4DIR/lib $qt_libdirs"
+      else
+         qt_libdirs="$QT4DIR/lib64 $QT4DIR/lib $qt_libdirs"
+      fi
    fi
 
+   if test -n "$KDEDIR" ; then
+      kde_incdirs="$KDEDIR/include $kde_incdirs"
+      if test -z "$supports_multilib" ; then
+         kde_libdirs="$KDEDIR/lib $kde_libdirs"
+      else
+         kde_libdirs="$KDEDIR/lib64 $KDEDIR/lib $kde_libdirs"
+      fi
+   fi
    if test -n "$KDE4DIR" ; then
-      kde_incdirs="$KDE4DIR/include $kde_incdirs"
-      if test "$build_cpu" != "x86_64" ; then
+      kde_incdirs="$KDE4DIR/include $KDE4DIR/include/kde4 $kde_incdirs"
+      if test -z "$supports_multilib" ; then
          kde_libdirs="$KDE4DIR/lib $kde_libdirs"
       else
          kde_libdirs="$KDE4DIR/lib64 $KDE4DIR/lib $kde_libdirs"
@@ -6382,9 +7124,9 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
 
    qt_test_include="Qt/qobject.h"
    qt_test_library="libQtCore.so"
-   kde_test_include="ksharedptr.h"
-   kde_test_library="libkdeui.so"
-   
+   kde_test_include="kwindowsystem.h"
+   kde_test_library="libsolid.so"
+
    AC_MSG_CHECKING([for Qt4 headers])
    qt_header_dir="no"
    for inc_dir in $qt_incdirs ; do
@@ -6393,32 +7135,38 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
          break
       fi
    done
-   
+
    AC_MSG_RESULT([$qt_header_dir])
    if test "x$qt_header_dir" = "xno" ; then
       AC_MSG_ERROR([Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
    fi
-   
+
    AC_MSG_CHECKING([for Qt4 libraries])
    qt_lib_dir="no"
    for lib_dir in $qt_libdirs ; do
       if test -r "$lib_dir/$qt_test_library" ; then
          qt_lib_dir="$lib_dir"
+         PKG_CONFIG_PATH="$qt_lib_dir"/pkgconfig:$PKG_CONFIG_PATH
          break
       fi
    done
-   
+
    AC_MSG_RESULT([$qt_lib_dir])
-   
+
    if test "x$qt_lib_dir" = "xno" ; then
       AC_MSG_ERROR([Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
    fi
 
    dnl Check for Meta Object Compiler
-   AC_PATH_PROG( MOC4, moc, no, [$PATH:$QT4DIR/bin] )
+
+   AC_PATH_PROG( MOCQT4, moc-qt4, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
+   MOC4="$MOCQT4"
    if test "$MOC4" = "no" ; then
-      AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
+      AC_PATH_PROG( MOC4, moc, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
+      if test "$MOC4" = "no" ; then
+         AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
 the root of your Qt installation by exporting QT4DIR before running "configure".])
+      fi
    fi
 
    dnl Check for KDE4 headers
@@ -6444,7 +7192,7 @@ the root of your Qt installation by exporting QT4DIR before running "configure".
          break
       fi
    done
-   
+
    AC_MSG_RESULT([$kde_libdir])
    if test "x$kde_libdir" = "xno" ; then
       AC_MSG_ERROR([KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
@@ -6452,10 +7200,33 @@ the root of your Qt installation by exporting QT4DIR before running "configure".
 
    KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
    KDE4_LIBS="-L$kde_libdir -L$qt_lib_dir -lkdeui -lkdecore -lQtCore -lQtGui"
+
+   AC_LANG_PUSH([C++])
+   save_CXXFLAGS=$CXXFLAGS
+   CXXFLAGS="$CXXFLAGS $KDE4_CFLAGS"
+   AC_MSG_CHECKING([whether KDE is >= 4.2])
+       AC_TRY_RUN([
+#include <kdeversion.h>
+
+int main(int argc, char **argv) {
+       if (KDE_VERSION_MAJOR == 4 && KDE_VERSION_MINOR >= 2) return 0;
+       else return 1;
+}
+       ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([KDE version too old])])
+   CXXFLAGS=$save_CXXFLAGS
+   AC_LANG_POP([C++])
+
+   # Glib is needed for properly handling Qt event loop with Qt's Glib integration enabled
+   PKG_CHECK_MODULES(KDE_GLIB,[glib-2.0 >= 2.4],
+    [KDE_HAVE_GLIB=1],
+    AC_MSG_WARN([[No Glib found, KDE4 support will not integrate with Qt's Glib event loop support]]))
 fi
 AC_SUBST(KDE4_CFLAGS)
 AC_SUBST(KDE4_LIBS)
 AC_SUBST(MOC4)
+AC_SUBST(KDE_GLIB_CFLAGS)
+AC_SUBST(KDE_GLIB_LIBS)
+AC_SUBST(KDE_HAVE_GLIB)
 
 dnl ===================================================================
 dnl Test for the enabling the lockdown pieces
@@ -6484,7 +7255,7 @@ else
 fi
 AC_SUBST(ENABLE_EVOAB2)
 AC_SUBST(GOBJECT_CFLAGS)
-AC_SUBST(GOBJECT_LIBS) 
+AC_SUBST(GOBJECT_LIBS)
 
 dnl ===================================================================
 dnl Test whether to include KDE AB support
@@ -6531,6 +7302,309 @@ else
 fi
 
 dnl ===================================================================
+dnl Test which themes to include
+dnl ===================================================================
+AC_MSG_CHECKING([which themes to include])
+# if none given, use all available themes
+if test "z$enable_theme" = "z" -o "z$enable_theme" = "zyes"; then
+  enable_theme="default crystal hicontrast oxygen tango"
+fi
+
+  WITH_THEMES=""
+  for theme in $enable_theme
+  do
+    WITH_THEMES="$WITH_THEMES $theme"
+    SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[a-z]' '[A-Z]'`"
+  done
+  AC_MSG_RESULT([$WITH_THEMES])
+AC_SUBST(WITH_THEMES)
+
+dnl ===================================================================
+dnl Test whether to integrate helppacks into the product's installer
+dnl ===================================================================
+AC_MSG_CHECKING([for helppack integration])
+if test "z$with_helppack_integration" = "zno" ; then
+  WITH_HELPPACK_INTEGRATION=NO
+  AC_MSG_RESULT([no integration])
+else
+  WITH_HELPPACK_INTEGRATION=YES
+  SCPDEFS="$SCPDEFS -DWITH_HELPPACK_INTEGRATION"
+  AC_MSG_RESULT([integration])
+fi
+AC_SUBST(WITH_HELPPACK_INTEGRATION)
+
+dnl ===================================================================
+dnl Test whether to integrate extensions into the product's installer
+dnl ===================================================================
+AC_MSG_CHECKING([for extensions integration])
+if test "z$with_extension_integration" = "z" -o "z$with_extension_integration" = "zno" ; then
+  WITH_EXTENSION_INTEGRATION=NO
+  AC_MSG_RESULT([no integration])
+else
+  WITH_EXTENSION_INTEGRATION=YES
+  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_INTEGRATION"
+  AC_MSG_RESULT([integration])
+fi
+AC_SUBST(WITH_EXTENSION_INTEGRATION)
+
+dnl ===================================================================
+dnl Test whether to include Lightproof extensions
+dnl ===================================================================
+AC_MSG_CHECKING([for Lightproof extensions integration (only supported languages displayed)])
+if test "z$enable_ext_lightproof" = "z" -o "z$enable_ext_lightproof" = "zno" ; then
+    LIGHTPROOF_LANG=""
+    AC_MSG_RESULT([no integration])
+else
+    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LIGHTPROOF"
+    lightproof_supported_langs="en-US hu"
+    if test "z$enable_ext_lightproof" = "zyes" ; then
+        wanted_lightproof="$lightproof_supported_langs"
+    else
+    # check whether the langs are supported by Lightproof
+    wanted_lightproof=
+    for lang in $enable_ext_lightproof ; do
+        if test -n "`echo $lightproof_supported_langs | grep "$lang"`" ; then
+            wanted_lightproof="$wanted_lightproof $lang"
+        fi
+    done
+    fi
+    LIGHTPROOF_LANG=
+    LIGHTPROOF_HU_PACK=
+    LIGHTPROOF_EN_US_PACK=
+    # check whether the langs are requested at all
+    for lang in $wanted_lightproof ; do
+    if test "$with_lang" = "ALL" -o -n "`echo $with_lang | grep "$lang"`" ; then
+        LIGHTPROOF_LANG="$LIGHTPROOF_LANG $lang"
+        case $lang in
+        "hu") LIGHTPROOF_HU_PACK="324ddcb9ef45c3bc055fcc002bc4e556-lightproof-hu_1.2.oxt";;
+        "en-US") LIGHTPROOF_EN_US_PACK="942541da5f5498214518c8b459ae4524-lightproof-en-US_0.1.oxt";;
+    esac
+    fi
+    done
+    AC_MSG_RESULT([$LIGHTPROOF_LANG])
+fi
+AC_SUBST(LIGHTPROOF_LANG)
+AC_SUBST(LIGHTPROOF_HU_PACK)
+AC_SUBST(LIGHTPROOF_EN_US_PACK)
+
+dnl ===================================================================
+dnl Test whether to include Watch Window extension
+dnl ===================================================================
+AC_MSG_CHECKING([for Watch Window extension integration])
+if test "z$enable_ext_watch_window" = "z" -o "z$enable_ext_watch_window" = "zno" ; then
+  AC_MSG_RESULT([no])
+  WATCH_WINDOW_EXTENSION_PACK=""
+else
+  AC_MSG_RESULT([yes])
+  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_WATCH_WINDOW"
+  WATCH_WINDOW_EXTENSION_PACK="23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt"
+fi
+AC_SUBST(WATCH_WINDOW_EXTENSION_PACK)
+
+dnl ===================================================================
+dnl Test whether to include Diagram extension
+dnl ===================================================================
+AC_MSG_CHECKING([for Diagram extension integration])
+if test "z$enable_ext_diagram" = "z" -o "z$enable_ext_diagram" = "zno" ; then
+  AC_MSG_RESULT([no])
+  DIAGRAM_EXTENSION_PACK=""
+else
+  AC_MSG_RESULT([yes])
+  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_DIAGRAM"
+  DIAGRAM_EXTENSION_PACK="41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt"
+fi
+AC_SUBST(DIAGRAM_EXTENSION_PACK)
+
+dnl ===================================================================
+dnl Test whether to include Validator extension
+dnl ===================================================================
+AC_MSG_CHECKING([for Validator extension integration])
+if test "z$enable_ext_validator" = "z" -o "z$enable_ext_validator" = "zno" ; then
+  AC_MSG_RESULT([no])
+  VALIDATOR_EXTENSION_PACK=""
+else
+  AC_MSG_RESULT([yes])
+  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_VALIDATOR"
+  VALIDATOR_EXTENSION_PACK="bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt"
+fi
+AC_SUBST(VALIDATOR_EXTENSION_PACK)
+
+dnl ===================================================================
+dnl Test whether to include Barcode extension
+dnl ===================================================================
+AC_MSG_CHECKING([for Barcode extension integration])
+if test "z$enable_ext_barcode" = "z" -o "z$enable_ext_barcode" = "zno" ; then
+  AC_MSG_RESULT([no])
+  BARCODE_EXTENSION_PACK=""
+else
+  AC_MSG_RESULT([yes])
+  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_BARCODE"
+  BARCODE_EXTENSION_PACK="7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt"
+fi
+AC_SUBST(BARCODE_EXTENSION_PACK)
+
+dnl ===================================================================
+dnl Test whether to include ConvertTextToNumber extension
+dnl ===================================================================
+AC_MSG_CHECKING([for ConvertTextToNumber extension integration])
+if test "z$enable_ext_ct2n" = "z" -o "z$enable_ext_ct2n" = "zno" ; then
+  AC_MSG_RESULT([no])
+  CT2N_EXTENSION_PACK=""
+else
+  AC_MSG_RESULT([yes])
+  BUILD_TYPE="$BUILD_TYPE CT2N"
+  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_CT2N"
+  CT2N_EXTENSION_PACK="451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt"
+fi
+AC_SUBST(CT2N_EXTENSION_PACK)
+
+dnl ===================================================================
+dnl Test whether to include Numbertext extension
+dnl ===================================================================
+AC_MSG_CHECKING([for Numbertext extension integration])
+if test "z$enable_ext_numbertext" = "z" -o "z$enable_ext_numbertext" = "zno" ; then
+  AC_MSG_RESULT([no])
+  NUMBERTEXT_EXTENSION_PACK=""
+else
+  AC_MSG_RESULT([yes])
+  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NUMBERTEXT"
+  NUMBERTEXT_EXTENSION_PACK="b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt"
+fi
+AC_SUBST(NUMBERTEXT_EXTENSION_PACK)
+
+dnl ===================================================================
+dnl Test whether to include Hungarian Cross-reference Toolbar extension
+dnl ===================================================================
+AC_MSG_CHECKING([for Hungarian Cross-reference Toolbar extension integration])
+if test "z$enable_ext_hunart" = "z" -o "z$enable_ext_hunart" = "zno" ; then
+  AC_MSG_RESULT([no])
+  HUNART_EXTENSION_PACK=""
+else
+  AC_MSG_RESULT([yes])
+  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_HUNART"
+  HUNART_EXTENSION_PACK="b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt"
+fi
+AC_SUBST(HUNART_EXTENSION_PACK)
+
+dnl ===================================================================
+dnl Test whether to include Typography Toolbar extension
+dnl ===================================================================
+AC_MSG_CHECKING([for Typography Toolbar extension integration])
+if test "z$enable_ext_typo" = "z" -o "z$enable_ext_typo" = "zno" ; then
+  AC_MSG_RESULT([no])
+  TYPO_EXTENSION_PACK=""
+else
+  AC_MSG_RESULT([yes])
+  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_TYPO"
+  TYPO_EXTENSION_PACK="9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt"
+fi
+AC_SUBST(TYPO_EXTENSION_PACK)
+
+dnl ===================================================================
+dnl Test whether to include Google Docs extension
+dnl ===================================================================
+AC_MSG_CHECKING([for Google Docs extension integration])
+if test "z$enable_ext_google_docs" = "z" -o "z$enable_ext_google_docs" = "zno" ; then
+  AC_MSG_RESULT([no])
+  GOOGLE_DOCS_EXTENSION_PACK=""
+else
+  AC_MSG_RESULT([yes])
+  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_GOOGLE_DOCS"
+  GOOGLE_DOCS_EXTENSION_PACK="dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt"
+fi
+AC_SUBST(GOOGLE_DOCS_EXTENSION_PACK)
+
+dnl ===================================================================
+dnl Test whether to include NLPSolver extension
+dnl ===================================================================
+AC_MSG_CHECKING([for NLPSolver extension integration])
+if test "z$enable_ext_nlpsolver" = "z" -o "z$enable_ext_nlpsolver" = "zno" ; then
+  AC_MSG_RESULT([no])
+else
+  AC_MSG_RESULT([yes])
+  BUILD_TYPE="$BUILD_TYPE NLPSOLVER"
+  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NLPSOLVER"
+fi
+
+dnl ===================================================================
+dnl Test whether to include LanguageTool extension
+dnl ===================================================================
+AC_MSG_CHECKING([for LanguageTool extension integration])
+if test "z$with_languagetool" = "z" -o "z$with_languagetool" = "zno" ; then
+  AC_MSG_RESULT([no])
+else
+  AC_MSG_RESULT([yes])
+  BUILD_TYPE="$BUILD_TYPE LANGUAGETOOL"
+  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LANGUAGETOOL"
+fi
+
+dnl ===================================================================
+dnl Test whether to include oooblogger extension
+dnl ===================================================================
+AC_MSG_CHECKING([for oooblogger extension integration])
+if test "z$enable_ext_oooblogger" = "z" -o "z$enable_ext_oooblogger" = "zno" ; then
+  AC_MSG_RESULT([no])
+  OOOBLOGGER_EXTENSION_PACK=""
+else
+  AC_MSG_RESULT([yes])
+  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_OOOBLOGGER"
+  OOOBLOGGER_EXTENSION_PACK="b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt"
+fi
+AC_SUBST(OOOBLOGGER_EXTENSION_PACK)
+
+dnl ===================================================================
+dnl Test whether to include Sun Professional Template Pack
+dnl ===================================================================
+AC_MSG_CHECKING([for Sun Professional Template Pack integration (only supported languages displayed)])
+if test "z$with_sun_templates" = "z" -o "z$with_sun_templates" = "zno" ; then
+    SUNTEMPLATES_LANG=""
+    AC_MSG_RESULT([no integration])
+else
+    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_SUN_TEMPLATE_PACK"
+    sun_supported_langs="en-US de it fr es hu"
+    if test "z$with_sun_templates" = "zyes" ; then
+    wanted_sun_templates="$sun_supported_langs"
+    else
+    # check whether the langs are supported by Sun
+    wanted_sun_templates=
+    for lang in $with_sun_templates ; do
+        if test -n "`echo $sun_supported_langs | grep "$lang"`" ; then
+        wanted_sun_templates="$wanted_sun_templates $lang"
+        fi
+    done
+    fi
+    SUNTEMPLATES_LANG=
+    SUNTEMPLATES_DE_PACK=
+    SUNTEMPLATES_EN_US_PACK=
+    SUNTEMPLATES_ES_PACK=
+    SUNTEMPLATES_FR_PACK=
+    SUNTEMPLATES_HU_PACK=
+    SUNTEMPLATES_IT_PACK=
+    # check whether the langs are requested at all
+    for lang in $wanted_sun_templates ; do
+    if test "$with_lang" = "ALL" -o -n "`echo $with_lang | grep "$lang"`" ; then
+        SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
+		case $lang in
+			"de") SUNTEMPLATES_DE_PACK="53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt";;
+			"en-US") SUNTEMPLATES_EN_US_PACK="472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt";;
+			"es") SUNTEMPLATES_ES_PACK="4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt";;
+			"fr") SUNTEMPLATES_FR_PACK="a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt";;
+			"hu") SUNTEMPLATES_HU_PACK="09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt";;
+			"it") SUNTEMPLATES_IT_PACK="b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt";;
+		esac
+    fi
+    done
+    AC_MSG_RESULT([$SUNTEMPLATES_LANG])
+fi
+AC_SUBST(SUNTEMPLATES_LANG)
+AC_SUBST(SUNTEMPLATES_DE_PACK)
+AC_SUBST(SUNTEMPLATES_EN_US_PACK)
+AC_SUBST(SUNTEMPLATES_ES_PACK)
+AC_SUBST(SUNTEMPLATES_FR_PACK)
+AC_SUBST(SUNTEMPLATES_HU_PACK)
+AC_SUBST(SUNTEMPLATES_IT_PACK)
+
+dnl ===================================================================
 dnl Test whether to include fonts
 dnl ===================================================================
 AC_MSG_CHECKING([whether to include third-party fonts])
@@ -6545,6 +7619,18 @@ else
 fi
 AC_SUBST(WITH_FONTS)
 
+AC_MSG_CHECKING([whether to include Agfa Monotype fonts])
+if test "$with_agfa_monotype_fonts" = "yes" ; then
+  AC_MSG_RESULT([yes])
+  WITH_AGFA_MONOTYPE_FONTS=YES
+  SCPDEFS="$SCPDEFS -DWITH_AGFA_MONOTYPE_FONTS"
+  BUILD_TYPE="$BUILD_TYPE AGFA_MONOTYPE_FONTS"
+else
+  AC_MSG_RESULT([no])
+  WITH_AGFA_MONOTYPE_FONTS=NO
+fi
+AC_SUBST(WITH_AGFA_MONOTYPE_FONTS)
+
 dnl ===================================================================
 dnl Test whether to include ppds
 dnl ===================================================================
@@ -6572,7 +7658,120 @@ else
 fi
 AC_SUBST(WITHOUT_AFMS)
 
-AC_SUBST(SCPDEFS)
+dnl ===================================================================
+dnl Test whether to include extra galleries
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include extra galleries])
+if test "z$enable_extra_gallery" = "z" -o "z$enable_extra_gallery" = "zno" ; then
+  AC_MSG_RESULT([no])
+  WITH_EXTRA_GALLERY=NO
+  OOOP_GALLERY_PACK=""
+else
+  AC_MSG_RESULT([yes])
+  WITH_EXTRA_GALLERY=YES
+  BUILD_TYPE="$BUILD_TYPE EXTRA_GALLERY"
+  SCPDEFS="$SCPDEFS -DWITH_EXTRA_GALLERY"
+  OOOP_GALLERY_PACK="af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip"
+fi
+AC_SUBST(WITH_EXTRA_GALLERY)
+AC_SUBST(OOOP_GALLERY_PACK)
+
+dnl ===================================================================
+dnl Test whether to include extra templates
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include extra templates])
+if test "z$enable_extra_template" = "z" -o "z$enable_extra_template" = "zno" ; then
+  AC_MSG_RESULT([no])
+  WITH_EXTRA_TEMPLATE=NO
+  OOOP_TEMPLATES_PACK=""
+else
+  AC_MSG_RESULT([yes])
+  WITH_EXTRA_TEMPLATE=YES
+  BUILD_TYPE="$BUILD_TYPE EXTRA_TEMPLATE"
+  SCPDEFS="$SCPDEFS -DWITH_EXTRA_TEMPLATE"
+  OOOP_TEMPLATES_PACK="1be202fbbbc13f10592a98f70a4a87fb-OOOP-templates-pack-2.9.0.0.zip"
+fi
+AC_SUBST(WITH_EXTRA_TEMPLATE)
+AC_SUBST(OOOP_TEMPLATES_PACK)
+
+dnl ===================================================================
+dnl Test whether to include extra samples
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include extra samples])
+if test "z$enable_extra_sample" = "z" -o "z$enable_extra_sample" = "zno" ; then
+  AC_MSG_RESULT([no])
+  WITH_EXTRA_SAMPLE=NO
+  OOOP_SAMPLES_PACK=""
+else
+  AC_MSG_RESULT([yes])
+  WITH_EXTRA_SAMPLE=YES
+  BUILD_TYPE="$BUILD_TYPE EXTRA_SAMPLE"
+  SCPDEFS="$SCPDEFS -DWITH_EXTRA_SAMPLE"
+  OOOP_SAMPLES_PACK="a6bccacf44914969e6e7b2f8faf4132c-OOOP-samples-pack-2.7.0.0.zip"
+fi
+AC_SUBST(WITH_EXTRA_SAMPLE)
+AC_SUBST(OOOP_SAMPLES_PACK)
+
+dnl ===================================================================
+dnl Test whether to include extra fonts
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include extra fonts])
+if test "z$enable_extra_font" = "z" -o "z$enable_extra_font" = "zno" ; then
+  AC_MSG_RESULT([no])
+  WITH_EXTRA_FONT=NO
+  OOOP_FONTS_PACK=""
+else
+  AC_MSG_RESULT([yes])
+  WITH_EXTRA_FONT=YES
+  BUILD_TYPE="$BUILD_TYPE EXTRA_FONT"
+  SCPDEFS="$SCPDEFS -DWITH_EXTRA_FONT"
+  OOOP_FONTS_PACK="a10aa597411643326e27d7fc128af12d-OOOP-fonts-pack-2.9.0.0.zip"
+fi
+AC_SUBST(WITH_EXTRA_FONT)
+AC_SUBST(OOOP_FONTS_PACK)
+
+dnl ===================================================================
+dnl Test whether to build global menu support
+dnl ===================================================================
+AC_MSG_CHECKING([whether to build global menu support])
+if test "z$enable_lomenubar" = "z" -o "z$enable_lomenubar" = "zno" ; then
+  AC_MSG_RESULT([no])
+  ENABLE_LOMENUBAR="FALSE"
+else
+  AC_MSG_RESULT([yes])
+  ENABLE_LOMENUBAR="TRUE"
+fi
+AC_SUBST(ENABLE_LOMENUBAR)
+
+dnl ===================================================================
+dnl Test whether build target is Release Build
+dnl ===================================================================
+AC_MSG_CHECKING([whether build target is Release Build])
+if test "z$enable_release_build" = "z" -o "z$enable_release_build" = "zno" ; then
+  AC_MSG_RESULT([no])
+  ENABLE_RELEASE_BUILD="FALSE"
+else
+  AC_MSG_RESULT([yes])
+  ENABLE_RELEASE_BUILD="TRUE"
+fi
+AC_SUBST(ENABLE_RELEASE_BUILD)
+
+dnl ===================================================================
+dnl Test whether to enable ActiveX embedding
+dnl ===================================================================
+if test "$_os" = "WINNT"; then
+  AC_MSG_CHECKING([whether to enable ActiveX embedding of LibreOffice components])
+  if test "$enable_activex_component" = "yes" -o "$enable_activex_component" = "TRUE" -o "$enable_activex_component" = ""; then
+    ENABLE_ACTIVEX_COMPONENT="TRUE"
+    AC_MSG_RESULT([yes])
+    SCPDEFS="$SCPDEFS -DWITH_ACTIVEX_COMPONENT"
+  else
+    ENABLE_ACTIVEX_COMPONENT=""
+    AC_MSG_RESULT([no])
+  fi
+  AC_SUBST(ENABLE_ACTIVEX_COMPONENT)
+  AC_SUBST(SCPDEFS)
+fi
 
 AC_MSG_CHECKING([whether and how to use Xinerama])
 if test "$_os" = "Darwin"; then
@@ -6595,7 +7794,7 @@ elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
       XINERAMA_LINK=dynamic
    elif test -e "$XLIB/libXinerama.a"; then
       # static version
-      if echo $build_cpu | grep -E 'i[[3456]]86' 2>/dev/null >/dev/null; then
+      if echo $host_cpu | grep -E 'i[[3456]]86' 2>/dev/null >/dev/null; then
          USE_XINERAMA=YES
          XINERAMA_LINK=static
       else
@@ -6624,173 +7823,292 @@ elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
       AC_MSG_RESULT([no, libXinerama not found or wrong architecture.])
    fi
 else
+   USE_XINERAMA=NO
+   XINERAMA_LINK=none
    AC_MSG_RESULT([no])
 fi
 AC_SUBST(USE_XINERAMA)
 AC_SUBST(XINERAMA_LINK)
 
 dnl ===================================================================
-dnl Test whether to build librsvg or rely on the system version
+dnl Checks for librsvg
 dnl ===================================================================
-AC_MSG_CHECKING([whether to build own version of librsvg])
 
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_LIBRSVG=NO
-	    AC_MSG_RESULT([yes])
-		;;
-	Darwin*)
-	    SYSTEM_LIBRSVG=NO
-	    AC_MSG_RESULT([yes])
-	    ;;
-   *)
+dnl ENABLE_LIBRSVG is set to "" (for NO), SYSTEM or INTERNAL. The
+dnl SYSTEM_LIBRSVG, SYSTEM_GDKPIXBUF etc are redundant.
+
+ENABLE_LIBRSVG=""
+LIBRSVG_CFLAGS=""
+LIBRSVG_LIBS=""
+
+AC_MSG_CHECKING([what librsvg to use])
+
+case "$enable_librsvg" in
+no|disable)
+   AC_MSG_RESULT([none])
+   enable_librsvg=no
+   ;;
+
+""|yes|auto)
+   if test $build_os = cygwin -o \
+           $_os = Darwin; then
+      dnl When building on/for these OSes always use the internal one,
+      dnl if at all. Add more OSes above as needed.
+      AC_MSG_RESULT([internal])
+      enable_librsvg=internal
+   elif test  $_os = iOS -o $_os = Android; then
+      AC_MSG_RESULT([none])
+      enable_librsvg=no
+   else
+      if test "$with_system_libs" = yes; then
+         AC_MSG_RESULT([system])
+         PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 >= 2.14)
+         enable_librsvg=system
+      elif test "$with_system_libs" = no; then
+         AC_MSG_RESULT([internal])
+         enable_librsvg=internal
+      else
+         AC_MSG_RESULT([checking further])
+         PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 >= 2.14,, [:])
+         if test -z "$LIBRSVG_PKG_ERRORS"; then
+            enable_librsvg=system
+         else
+            enable_librsvg=internal
+         fi
+      fi
+   fi
+   ;;
+
+internal)
+   AC_MSG_RESULT([internal])
+   ;;
+
+system)
+   if test $_os = WINNT -a "$WITH_MINGW" != yes; then
+      AC_MSG_ERROR([Must use internal librsvg when building with MSVC])
+   fi
+   AC_MSG_RESULT([system])
+   PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 >= 2.14)
+   ;;
+
+*)
+   AC_MSG_ERROR([Incorrect --enable-librsvg option])
+   ;;
+esac
+
+dnl By now enable_librsvg should be "system", "internal" or "no"
+case $enable_librsvg in
+system)
+   ENABLE_LIBRSVG=SYSTEM
    SYSTEM_LIBRSVG=YES
-   AC_MSG_RESULT([no])
+   ;;
+
+internal)
+   ENABLE_LIBRSVG=INTERNAL
+   SYSTEM_LIBRSVG=NO
+   BUILD_TYPE="$BUILD_TYPE LIBRSVG"
+   ;;
+
+no)
+   ENABLE_LIBRSVG=NO
+   SYSTEM_LIBRSVG=NO
+   ENABLE_CAIRO=
+   ;;
+
+*)
+   AC_MSG_ERROR([Internal configure script error, invalid enable_librsvg value "$enable_librsvg"])
    ;;
 esac
+
+AC_SUBST(ENABLE_LIBRSVG)
+AC_SUBST(LIBRSVG_CFLAGS)
+AC_SUBST(LIBRSVG_LIBS)
 AC_SUBST(SYSTEM_LIBRSVG)
 
 dnl ===================================================================
 dnl Test whether to build gdk-pixbuf or rely on the system version
 dnl ===================================================================
-AC_MSG_CHECKING([whether to build own version of gdk-pixbuf])
-
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_GDKPIXBUF=NO
-	    AC_MSG_RESULT([yes])
-		;;
-	Darwin*)
-	    SYSTEM_GDKPIXBUF=NO
-	    AC_MSG_RESULT([yes])
-	    ;;
-   *)
-   SYSTEM_GDKPIXBUF=YES
-   AC_MSG_RESULT([no])
-   ;;
-esac
+
+AC_MSG_CHECKING([whether to use the system gdk-pixbuf])
+
+dnl As long as the only thing we need gdk-pxbuf for is below
+dnl librsvg, use the same --enable-librsvg (possibly implied
+dnl by --with-system-libs) to override this.
+
+if test "$SYSTEM_LIBRSVG" = YES; then
+    SYSTEM_GDKPIXBUF=YES
+    AC_MSG_RESULT([yes])
+else
+    case "$_os" in
+        WINNT|Darwin|iOS|Android)
+            SYSTEM_GDKPIXBUF=NO
+            AC_MSG_RESULT([no])
+            ;;
+        *)
+            SYSTEM_GDKPIXBUF=YES
+            AC_MSG_RESULT([yes])
+            ;;
+    esac
+fi
 AC_SUBST(SYSTEM_GDKPIXBUF)
 
 dnl ===================================================================
-dnl Test whether to build glib or rely on the system version
+dnl Test whether to build GLib or rely on the system version
 dnl ===================================================================
-AC_MSG_CHECKING([whether to build own version of glib])
 
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_GLIB=NO
-	    AC_MSG_RESULT([yes])
-		;;
-	Darwin*)
-	    SYSTEM_GLIB=NO
-	    AC_MSG_RESULT([yes])
-	    ;;
-   *)
-   SYSTEM_GLIB=YES
-   AC_MSG_RESULT([no])
-   ;;
-esac
+AC_MSG_CHECKING([whether to use the system GLib])
+
+dnl As long as the only thing we need GLib for is below
+dnl librsvg, use the same --enable-librsvg (possibly implied
+dnl by --with-system-libs) to override this.
+
+if test "$SYSTEM_LIBRSVG" = YES; then
+    SYSTEM_GLIB=YES
+    AC_MSG_RESULT([yes])
+else
+    case "$_os" in
+        WINNT|Darwin|iOS|Android)
+            SYSTEM_GLIB=NO
+            AC_MSG_RESULT([no])
+            ;;
+        *)
+            SYSTEM_GLIB=YES
+            AC_MSG_RESULT([yes])
+            ;;
+    esac
+fi
 AC_SUBST(SYSTEM_GLIB)
 
 dnl ===================================================================
-dnl Test whether to build gettext or rely on the system version
+dnl Test whether to build gettext runtime (libintl) or rely on the
+dnl system version
 dnl ===================================================================
-AC_MSG_CHECKING([whether to build own version of gettext])
 
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_GETTEXT=NO
-	    AC_MSG_RESULT([yes])
-		;;
-	Darwin*)
-	    SYSTEM_GETTEXT=NO
-	    AC_MSG_RESULT([yes])
-	    ;;
-   *)
-   SYSTEM_GETTEXT=YES
-   AC_MSG_RESULT([no])
-   ;;
-esac
+AC_MSG_CHECKING([whether to use the system gettext runtime])
+
+if test "$with_system_gettext" = yes -o \( "$with_system_libs" = yes -a "$with_system_gettext" != no \); then
+    SYSTEM_GETTEXT=YES
+    AC_MSG_RESULT([yes])
+else
+    case "$_os" in
+        WINNT|Darwin|iOS|Android)
+            SYSTEM_GETTEXT=NO
+            AC_MSG_RESULT([no])
+            ;;
+        *)
+            SYSTEM_GETTEXT=YES
+            AC_MSG_RESULT([yes])
+            ;;
+    esac
+fi
 AC_SUBST(SYSTEM_GETTEXT)
 
 dnl ===================================================================
 dnl Test whether to build libcroco or rely on the system version
 dnl ===================================================================
-AC_MSG_CHECKING([whether to build own version of libcroco])
-
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_LIBCROCO=NO
-	    AC_MSG_RESULT([yes])
-		;;
-	Darwin*)
-	    SYSTEM_LIBCROCO=NO
-	    AC_MSG_RESULT([yes])
-	    ;;
-   *)
-   SYSTEM_LIBCROCO=YES
-   AC_MSG_RESULT([no])
-   ;;
-esac
+
+AC_MSG_CHECKING([whether to use the system libcroco])
+
+dnl As long as the only thing we need libcroco for is below
+dnl librsvg, use the same --enable-librsvg (possibly implied
+dnl by --with-system-libs) to override this.
+
+if test "$SYSTEM_LIBRSVG" = YES; then
+    SYSTEM_LIBCROCO=YES
+    AC_MSG_RESULT([yes])
+else
+    case "$_os" in
+        WINNT|Darwin|iOS|Android)
+            SYSTEM_LIBCROCO=NO
+            AC_MSG_RESULT([no])
+            ;;
+        *)
+            SYSTEM_LIBCROCO=YES
+            AC_MSG_RESULT([yes])
+            ;;
+    esac
+fi
 AC_SUBST(SYSTEM_LIBCROCO)
 
 dnl ===================================================================
-dnl Test whether to build pango or rely on the system version
+dnl Test whether to build Pango or rely on the system version
 dnl ===================================================================
-AC_MSG_CHECKING([whether to build own version of pango])
 
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_PANGO=NO
-	    AC_MSG_RESULT([yes])
-		;;
-	Darwin*)
-	    SYSTEM_PANGO=NO
-	    AC_MSG_RESULT([yes])
-	    ;;
-   *)
-   SYSTEM_PANGO=YES
-   AC_MSG_RESULT([no])
-   ;;
-esac
+AC_MSG_CHECKING([whether to use the system pango])
+
+dnl As long as the only thing we need Pango for is below
+dnl librsvg, use the same --enable-librsvg (possibly implied
+dnl by --with-system-libs) to override this.
+
+if test "$SYSTEM_LIBRSVG" = YES; then
+    SYSTEM_PANGO=YES
+    AC_MSG_RESULT([yes])
+else
+    case "$_os" in
+        WINNT|Darwin|iOS|Android)
+            SYSTEM_PANGO=NO
+            AC_MSG_RESULT([no])
+            ;;
+        *)
+            SYSTEM_PANGO=YES
+            AC_MSG_RESULT([yes])
+            ;;
+    esac
+fi
 AC_SUBST(SYSTEM_PANGO)
 
 dnl ===================================================================
 dnl Test whether to build libgsf or rely on the system version
 dnl ===================================================================
-AC_MSG_CHECKING([whether to build own version of libgsf])
 
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_LIBGSF=NO
-	    AC_MSG_RESULT([yes])
-		;;
-   *)
-   SYSTEM_LIBGSF=YES
-   AC_MSG_RESULT([no])
-   ;;
-esac
+AC_MSG_CHECKING([whether to use the system libgsf])
+
+dnl As long as the only thing we need libgsf for is below librsvg (is
+dnl it?), use the same --enable-librsvg (possibly implied by
+dnl --with-system-libs) to override this.
+
+if test "$SYSTEM_LIBRSVG" = YES; then
+    SYSTEM_LIBGSF=YES
+    AC_MSG_RESULT([yes])
+else
+    case "$_os" in
+        WINNT|Darwin|iOS|Android)
+            SYSTEM_LIBGSF=NO
+            AC_MSG_RESULT([no])
+            ;;
+        *)
+            SYSTEM_LIBGSF=YES
+            AC_MSG_RESULT([yes])
+            ;;
+    esac
+fi
 AC_SUBST(SYSTEM_LIBGSF)
 
 dnl ===================================================================
 dnl Test whether to build libpng or rely on the system version
 dnl ===================================================================
-AC_MSG_CHECKING([whether to build own version of libpng])
-
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_LIBPNG=NO
-	    AC_MSG_RESULT([yes])
-		;;
-	Darwin*)
-	    SYSTEM_LIBPNG=NO
-	    AC_MSG_RESULT([yes])
-	    ;;
-   *)
-   SYSTEM_LIBPNG=YES
-   AC_MSG_RESULT([no])
-   ;;
-esac
+
+AC_MSG_CHECKING([whether to use the system libpng])
+
+dnl How should and does this interact with the checks for libpng
+dnl related to use of libpng in the quickstarter above? This needs to
+dnl be unified.
+
+if test "$with_system_libpng" = yes -o \( "$with_system_libs" = yes -a "$with_system_libpng" != no \); then
+    SYSTEM_LIBPNG=YES
+    AC_MSG_RESULT([yes])
+else
+    case "$_os" in
+        WINNT|Darwin|iOS|Android)
+            SYSTEM_LIBPNG=NO
+            AC_MSG_RESULT([no])
+            ;;
+        *)
+            SYSTEM_LIBPNG=YES
+            AC_MSG_RESULT([no])
+            ;;
+    esac
+fi
 AC_SUBST(SYSTEM_LIBPNG)
 
 dnl ===================================================================
@@ -6800,34 +8118,44 @@ dnl FIXME: this is currently because we have jpeg-6b for our filters
 dnl        and jpeg-8 as dependency for librsvg
 dnl        this should be unified into using only one version for both
 
-AC_MSG_CHECKING([whether to build own version of libjpeg])
+AC_MSG_CHECKING([whether to use the system libjpeg])
 
 if test "$SYSTEM_JPEG" == "YES"; then
-SYSTEM_LIBJPEG=YES
-else
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_LIBJPEG=NO
-	    AC_MSG_RESULT([yes])
-		;;
-	Darwin*)
-	    SYSTEM_LIBJPEG=NO
-	    AC_MSG_RESULT([yes])
-	    ;;
-   *)
-   SYSTEM_LIBJPEG=YES
-   AC_MSG_RESULT([no])
-   ;;
-esac
-fi
-
-if test "$SYSTEM_LIBJPEG" == "YES"; then
-   AC_MSG_RESULT([no])
+    SYSTEM_LIBJPEG=YES
+    AC_MSG_RESULT([yes])
 else
-   AC_MSG_RESULT([yes])
+    case "$_os" in
+        WINNT|Darwin|iOS|Android)
+            SYSTEM_LIBJPEG=NO
+            AC_MSG_RESULT([no])
+            ;;
+        *)
+            SYSTEM_LIBJPEG=YES
+            AC_MSG_RESULT([yes])
+            ;;
+    esac
 fi
 AC_SUBST(SYSTEM_LIBJPEG)
 
+dnl ===================================================================
+dnl Check for runtime JVM search path
+dnl ===================================================================
+if test "$SOLAR_JAVA" != ""; then
+  AC_MSG_CHECKING([whether to use specific JVM search path at runtime])
+  if test -n "$with_jvm_path" && test "$with_jvm_path" != "no"; then
+     AC_MSG_RESULT([yes])
+     if ! test -d "$with_jvm_path"; then
+        AC_MSG_ERROR(["$with_jvm_path" not a directory])
+     fi
+     if ! test -d "$with_jvm_path"jvm; then
+        AC_MSG_ERROR(["$with_jvm_path"jvm not found, point with_jvm_path to \[/path/to/\]jvm])
+     fi
+     JVM_ONE_PATH_CHECK="$with_jvm_path"
+     AC_SUBST(JVM_ONE_PATH_CHECK)
+  else
+     AC_MSG_RESULT([no])
+  fi
+fi
 
 dnl ===================================================================
 dnl Test for the presence of Ant and that it works
@@ -6854,33 +8182,28 @@ else
   while test -h "$ANT"; do
      a_cwd=`pwd`
      a_basename=`basename "$ANT"`
-     a_script=`ls -l "$ANT" | sed "s/.*${a_basename} -> //g"`
+     a_script=`ls -l "$ANT" | $SED "s/.*${a_basename} -> //g"`
      cd "`dirname "$ANT"`"
      cd "`dirname "$a_script"`"
      ANT="`pwd`"/"`basename "$a_script"`"
      cd "$a_cwd"
   done
 
-  if test "$_os" = "OS2"; then
-    ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"`
-    export ANT_HOME
-  fi
-
   AC_MSG_CHECKING([if $ANT works])
 cat > conftest.java << EOF
     public class conftest {
-	int testmethod(int a, int b) {
+    int testmethod(int a, int b) {
             return a + b;
-	}
+    }
     }
 EOF
 
 cat > conftest.xml << EOF
     <project name="conftest" default="conftest">
-	<target name="conftest">
+    <target name="conftest">
             <javac srcdir="." includes="conftest.java">
-	    </javac>
-	</target>
+        </javac>
+    </target>
     </project>
 EOF
   oldJAVA_HOME=$JAVA_HOME
@@ -6892,7 +8215,7 @@ EOF
   fi
   AC_TRY_EVAL(ant_cmd)
   if test $? = 0 && test -f ./conftest.class ; then
-    AC_MSG_RESULT([Ant works]) 
+    AC_MSG_RESULT([Ant works])
     if test -z "$WITH_ANT_HOME"; then
         ANT_HOME=`$ANT -diagnostics | $EGREP "ant.home :" | $SED -e "s#ant.home : ##g"`
         if test -z "$ANT_HOME"; then
@@ -6921,10 +8244,10 @@ dnl Checking for ant.jar
 if test "$ANT_HOME" != "NO_ANT_HOME"; then
    AC_MSG_CHECKING([Ant lib directory])
    if test -f $ANT_HOME/lib/ant.jar; then
-	  ANT_LIB="$ANT_HOME/lib"
+      ANT_LIB="$ANT_HOME/lib"
    else
       if test -f $ANT_HOME/ant.jar; then
-	     ANT_LIB="$ANT_HOME"
+         ANT_LIB="$ANT_HOME"
       else
           if test -f /usr/share/java/ant.jar; then
               ANT_LIB=/usr/share/java
@@ -6940,7 +8263,7 @@ if test "$ANT_HOME" != "NO_ANT_HOME"; then
                    else
                        AC_MSG_ERROR([Ant libraries not found!])
                    fi
-                fi  
+                fi
              fi
           fi
       fi
@@ -6948,16 +8271,11 @@ if test "$ANT_HOME" != "NO_ANT_HOME"; then
    AC_MSG_RESULT([Ant lib directory found.])
 fi
 AC_SUBST(ANT_LIB)
-fi
 
 ant_minver=1.6.0
-# update for more extensions...
-if test "$ENABLE_MEDIAWIKI" = "YES"; then
-  ant_minver=1.7.0
-fi
 ant_minminor1=`echo $ant_minver | cut -d"." -f2`
 
-AC_MSG_CHECKING([whether ant is >= $ant_minver])
+AC_MSG_CHECKING([whether Ant is >= $ant_minver])
 ant_version=`$ANT -version | $AWK '{ print $4; }'`
 ant_version_major=`echo $ant_version | cut -d. -f1`
 ant_version_minor=`echo $ant_version | cut -d. -f2`
@@ -6969,11 +8287,11 @@ if test "$ant_version_major" -ge "2"; then
 elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then
    AC_MSG_RESULT([yes, $ant_version])
 else
-   AC_MSG_ERROR([no, you need at least ant >= $ant_minver])
+   AC_MSG_ERROR([no, you need at least Ant >= $ant_minver])
 fi
 
 if test "$ENABLE_MEDIAWIKI" = "YES"; then
-AC_MSG_CHECKING([whether ant supports mapper type="regexp"])
+AC_MSG_CHECKING([whether Ant supports mapper type="regexp"])
 rm -rf confdir
 mkdir confdir
 cat > conftest.java << EOF
@@ -7007,7 +8325,7 @@ EOF
   fi
   AC_TRY_EVAL(ant_cmd)
   if test $? = 0 && test -f ./conftest.class ; then
-    AC_MSG_RESULT([yes]) 
+    AC_MSG_RESULT([yes])
     rm -rf confdir
   else
     echo "configure: Ant test failed" >&5
@@ -7018,11 +8336,12 @@ EOF
   fi
 fi
 rm -f conftest* core core.* *.core
+fi
 
 OOO_JUNIT_JAR=
 if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then
     AC_MSG_CHECKING([for JUnit 4])
-    if test "$with_junit" == "yes"; then
+    if test "$with_junit" = "yes"; then
         if test -e /usr/share/java/junit4.jar; then
             OOO_JUNIT_JAR=/usr/share/java/junit4.jar
         else
@@ -7041,7 +8360,15 @@ if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then
     "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" 2>&5 | \
         grep org/junit/Before.class > /dev/null 2>&5
     if test $? -eq 0; then
-        AC_MSG_RESULT([$OOO_JUNIT_JAR])
+        # check if either class-path entry is available for hamcrest or
+        # it's bundled
+        if "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" |grep hamcrest || \
+            "$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |grep -q 'Class-Path: hamcrest'; then
+            AC_MSG_RESULT([$OOO_JUNIT_JAR])
+        else
+            AC_MSG_ERROR([your junit jar neither sets a classpath nor includes hamcrest; please
+provide a full junit jar or use --without-junit])
+        fi
     else
         AC_MSG_RESULT([no])
         AC_MSG_ERROR([cannot find JUnit 4 jar; please install one in the default
@@ -7051,71 +8378,69 @@ location (/usr/share/java), specify its pathname via
 fi
 AC_SUBST(OOO_JUNIT_JAR)
 
+dnl ===================================================================
+dnl Dealing with l10n options
+dnl ===================================================================
+GIT_REPO_NAMES="artwork base calc components extensions extras filters help impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing ure writer"
 AC_MSG_CHECKING([which languages to be built])
+# get list of all languages
+# generate shell variable from completelangiso= from solenv/inc/langlist.mk
+# the sed command does the following:
+#   + if a line ends with a backslash, append the next line to it
+#   + adds " on the beginning of the value (after =)
+#   + adds " at the end of the value
+#   + removes en-US; we want to put it on the beginning
+#   + prints just the section starting with 'completelangiso=' and ending with the " at the end of line
+[eval $(sed -e :a -e '/\\$/N; s/\\\n//; ta' -n -e 's/=/="/;s/\([^\\]\)$/\1"/;s/en-US//;/^completelangiso/p' solenv/inc/langlist.mk)]
+ALL_LANGS="en-US $completelangiso"
+# check the configured localizations
 WITH_LANG="$with_lang"
 if test -z "$WITH_LANG"; then
    AC_MSG_RESULT([en-US])
 else
    AC_MSG_RESULT([$WITH_LANG])
-fi
+   GIT_REPO_NAMES="$GIT_REPO_NAMES translations"
+fi
+# check that the list is valid
+for lang in $WITH_LANG ; do
+   test "$lang" = "ALL" && continue;
+   test "$lang" = "kid" && continue;
+   # need to check for the exact string, so add space before and after the list of all languages
+   all_langs=" $ALL_LANGS "
+   test `echo "$all_langs" | sed "s|.* $lang .*|found|"` = "found" && continue;
+   AC_MSG_ERROR([invalid language: $lang; supported languages are: $ALL_LANGS])
+done
+AC_SUBST(ALL_LANGS)
 AC_SUBST(WITH_LANG)
+AC_SUBST(GIT_REPO_NAMES)
 
-AC_MSG_CHECKING([which languages have poor help localizations])
-WITH_POOR_HELP_LOCALIZATIONS="$with_poor_help_localizations"
-if test -z "$WITH_POOR_HELP_LOCALIZATIONS"; then
-   AC_MSG_RESULT([none])
-else
-   AC_MSG_RESULT([$WITH_POOR_HELP_LOCALIZATIONS])
-fi
-AC_SUBST(WITH_POOR_HELP_LOCALIZATIONS)
-
-AC_MSG_CHECKING([which dictionaries to include])
-if test -z "$with_dict"; then
-   WITH_DICT=,ALL,
-   AC_MSG_RESULT([ALL])
-else
-   WITH_DICT=","$with_dict","
-   AC_MSG_RESULT([$with_dict])
-fi
-AC_SUBST(WITH_DICT)
-
-AC_MSG_CHECKING([for additional 'intro' bitmaps])
-INTRO_BITMAPS=
-if test -z "$with_intro_bitmaps" -o "$with_intro_bitmaps" = "no" ; then
-   INTRO_BITMAPS=
+AC_MSG_CHECKING([for another 'intro' bitmap])
+INTRO_BITMAP=
+if test -z "$with_intro_bitmap" -o "$with_intro_bitmap" = "no" ; then
+   INTRO_BITMAP=
    AC_MSG_RESULT([none])
 else
-   for bitmap in `echo $with_intro_bitmaps | tr ',' ' '` ; do
-      case "$bitmap" in
-         *.bmp) ;;
-         *)     bitmap= ; AC_MSG_WARN([Intro bitmaps should be .bmp files!]) ;;
-      esac
-      if test -n "$bitmap" ; then
-         INTRO_BITMAPS="$INTRO_BITMAPS $bitmap"
-      fi
-   done
-   AC_MSG_RESULT([$INTRO_BITMAPS])
+   case "$with_intro_bitmap" in
+      *.png) INTRO_BITMAP="$with_intro_bitmap" ;;
+      *)     AC_MSG_WARN([Intro bitmap should be a .png file!]) ;;
+   esac
+   AC_MSG_RESULT([$INTRO_BITMAP])
 fi
-AC_SUBST(INTRO_BITMAPS)
+AC_SUBST(INTRO_BITMAP)
 
-AC_MSG_CHECKING([for additional 'about' bitmaps])
-ABOUT_BITMAPS=
-if test -z "$with_about_bitmaps" -o "$with_about_bitmaps" = "no" ; then
-   ABOUT_BITMAPS=
+AC_MSG_CHECKING([for another 'about' bitmap])
+ABOUT_BITMAP=
+if test -z "$with_about_bitmap" -o "$with_about_bitmap" = "no" ; then
+   ABOUT_BITMAP=
    AC_MSG_RESULT([none])
 else
-   for bitmap in `echo $with_about_bitmaps | tr ',' ' '` ; do
-      case "$bitmap" in
-         *.bmp) ;;
-         *)     bitmap= ; AC_MSG_WARN([About bitmaps should be .bmp files!]) ;;
-      esac
-      if test -n "$bitmap" ; then
-         ABOUT_BITMAPS="$ABOUT_BITMAPS $bitmap"
-      fi
-   done
-   AC_MSG_RESULT([$ABOUT_BITMAPS])
+   case "$with_about_bitmap" in
+      *.png) ABOUT_BITMAP="$with_about_bitmap" ;;
+      *)     AC_MSG_WARN([About bitmap should be a .png file!]) ;;
+   esac
+   AC_MSG_RESULT([$ABOUT_BITMAP])
 fi
-AC_SUBST(ABOUT_BITMAPS)
+AC_SUBST(ABOUT_BITMAP)
 
 OOO_VENDOR=
 AC_MSG_CHECKING([for vendor])
@@ -7142,7 +8467,7 @@ if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then
    ENABLE_STATIC_GTK="TRUE"
    AC_MSG_RESULT([yes])
 else
-   ENABLE_STATIC_GTK="FALSE"	
+   ENABLE_STATIC_GTK="FALSE"
    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_STATIC_GTK)
@@ -7152,7 +8477,7 @@ if test -n "$enable_layout" && test "$enable_layout" != "no"; then
    ENABLE_LAYOUT="TRUE"
    AC_MSG_RESULT([yes])
 else
-   ENABLE_LAYOUT="FALSE"	
+   ENABLE_LAYOUT="FALSE"
    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_LAYOUT)
@@ -7176,7 +8501,26 @@ fi
 AC_SUBST(VERBOSE)
 
 dnl ===================================================================
-dnl Hook up OOos nodep environmental variable to automake's equivalent
+dnl Use zenity during build
+dnl ===================================================================
+AC_MSG_CHECKING([whether to use zenity during build])
+if test "$enable_zenity" = "yes"; then
+   AC_MSG_RESULT([yes])
+   AC_PATH_PROGS( ZNTY, zenity )
+   if test -z "$ZNTY"; then
+      ENABLE_ZENITY=FALSE
+   else
+      ENABLE_ZENITY=TRUE
+   fi
+else
+    ENABLE_ZENITY=FALSE
+    AC_MSG_RESULT([no])
+fi
+AC_SUBST(ENABLE_ZENITY)
+
+
+dnl ===================================================================
+dnl Hook up LibreOffice's nodep environmental variable to automake's equivalent
 dnl --enable-dependency-tracking configure option
 dnl ===================================================================
 AC_MSG_CHECKING([whether to enable dependency tracking])
@@ -7189,13 +8533,42 @@ fi
 AC_SUBST(nodep)
 
 dnl ===================================================================
+dnl Number of CPUs to use during the build
+dnl ===================================================================
+AC_MSG_CHECKING([for number of processors to use])
+if test "z`uname -s`" = "zDarwin" -o "z`uname -s`" = "zNetBSD" -o "z`uname -s`" = "zOpenBSD"; then
+    BUILD_NCPUS=`sysctl -n hw.ncpu`
+else
+    BUILD_NCPUS=`grep $'^processor\t*:' /proc/cpuinfo | wc -l`
+fi
+if test "z$with_num_cpus" != "z"; then
+    BUILD_NCPUS=$with_num_cpus
+fi
+if echo "$BUILD_NCPUS" | $EGREP -q '^[[[:space:]]]*0[[[:space:]]]*$' ; then
+   BUILD_NCPUS=1
+fi
+AC_MSG_RESULT([$BUILD_NCPUS])
+AC_SUBST(BUILD_NCPUS)
+
+dnl ===================================================================
+dnl Number of parallel jobs to be executed by dmake
+dnl ===================================================================
+AC_MSG_CHECKING([for maximum of jobs per processor])
+BUILD_MAX_JOBS="1"
+if test "z$with_max_jobs" != "z"; then
+    BUILD_MAX_JOBS="$with_max_jobs"
+else
+   if test -n "$enable_icecream" && test "$enable_icecream" != "no" ; then
+      BUILD_MAX_JOBS="10"
+   fi
+fi
+AC_MSG_RESULT([$BUILD_MAX_JOBS])
+AC_SUBST(BUILD_MAX_JOBS)
+
+dnl ===================================================================
 dnl Setting up the environment.
 dnl ===================================================================
-echo "********************************************************************"
-echo "*                                                                  *"
-echo "*   Setting up the build environment variables.                    *"
-echo "*                                                                  *"
-echo "********************************************************************"
+echo "setting up the build environment variables..."
 
 if test -z "$COMPATH"; then
    AC_MSG_ERROR([No compiler found.])
@@ -7214,30 +8587,39 @@ AC_SUBST(LOCAL_SOLVER)
 
 AC_SUBST(BUILD_TYPE)
 
-# make sure config.guess is +x; we execute config.guess, so it has to be so; 
+# make sure config.guess is +x; we execute config.guess, so it has to be so;
 chmod +x ./config.guess
 
-AC_OUTPUT([set_soenv Makefile])
-
-dnl Executing the set_soenv script to setup the environment variables.
-chmod a+x set_soenv
-if test -z "$enable_check_only"; then
-   './set_soenv'
-else
-   echo
-   echo Test Complete
-   echo No environment file will be generated
-   echo
-   num_warnings=`wc -l warn`
-   _num=`echo $num_warnings | $AWK '{ print $1 }'`
-   if test $_num -gt 0; then
-      echo The following warning\(s\) were generated by configure
-      echo ----------------------------------------------------
-      echo
-      cat warn
-      echo
-   else
-      echo There were no warnings
-   fi
-   echo
-fi   
+dnl Setting up the post_download check script
+dnl Using autoconf here, so that the migration from the previous state
+dnl (checks for the additional Windows downloads were directly in
+dnl configure.in) is as easy as possible
+echo "setting up the post_download check script"
+autoconf post_download.in > post_download
+chmod +x post_download
+
+# Generate a configuration timestamp we can use for deps
+if test -f set_soenv; then
+   mv -f set_soenv set_soenv.last
+else
+   echo > set_soenv.last
+fi
+
+AC_OUTPUT([set_soenv Makefile bin/repo-list])
+
+# touch the config timestamp file set_soenv.stamp
+if test ! -f set_soenv.stamp; then
+   echo > set_soenv.stamp
+elif diff set_soenv set_soenv.last >/dev/null 2>&1; then
+   echo "Configuration unchanged - avoiding scp2 stamp update"
+else
+   echo > set_soenv.stamp
+fi
+
+dnl Run the set_soenv script to setup the *Env.sh script that sets
+dnl environment variables for the build.
+chmod +x set_soenv
+
+./set_soenv
+
+dnl vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
new file mode 100644
index 000000000000..927cf255a39f
--- /dev/null
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -0,0 +1,21 @@
+--host=arm-linux-androideabi
+--disable-cups
+--disable-fontconfig
+--disable-gconf
+--disable-gnome-vfs
+--disable-gstreamer
+--disable-lockdown
+--disable-mozilla
+--disable-nss-module
+--disable-odk
+--disable-opengl
+--disable-python
+--disable-randr
+--disable-randr-link
+--disable-systray
+--enable-python=internal
+--without-fonts
+--without-java
+--without-junit
+--without-ppds
+--without-stlport
diff --git a/distro-configs/LibreOfficeDragonFly.conf b/distro-configs/LibreOfficeDragonFly.conf
new file mode 100644
index 000000000000..5753203a5eb5
--- /dev/null
+++ b/distro-configs/LibreOfficeDragonFly.conf
@@ -0,0 +1,24 @@
+--enable-symbols
+--enable-debug
+--disable-epm
+--disable-mozilla
+--disable-neon
+--disable-nss-module
+--disable-odk
+--disable-opengl
+--disable-systray
+--with-alloc=system
+--with-fonts
+--with-system-headers
+--with-system-libs
+--with-system-libtextcat
+--with-system-python
+--with-vendor=DragonFly BSD
+--without-java
+--without-system-altlinuxhyph
+--without-system-boost
+--without-system-db
+--without-system-jars
+--without-system-mdds
+--without-system-mythes
+--x-includes=/usr/pkg/include
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
new file mode 100644
index 000000000000..8cecb92329b9
--- /dev/null
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -0,0 +1,49 @@
+--with-vendor=The Document Foundation
+--with-system-dicts
+--without-unix-wrapper
+--without-system-xrender-headers
+--without-system-zlib
+--without-system-stdlibs
+--without-system-poppler
+--without-system-openssl
+--without-system-mozilla
+--without-system-mesa-headers
+--without-system-libxslt
+--without-system-libxml
+--without-system-jpeg
+--without-system-jars
+--without-system-cairo
+--without-openldap
+--without-junit
+--without-helppack-integration
+--with-linker-hash-style=both
+--with-java-target-version=1.5
+--with-fonts
+--with-external-thes-dir=/usr/share/mythes
+--with-external-hyph-dir=/usr/share/hyphen
+--with-external-dict-dir=/usr/share/hunspell
+--with-extension-integration
+--enable-opengl
+--enable-odk
+--enable-lockdown
+--enable-kde
+--enable-gstreamer
+--enable-gnome-vfs
+--enable-ext-wiki-publisher
+--enable-ext-report-builder
+--enable-ext-presenter-minimizer
+--enable-ext-presenter-console
+--enable-ext-pdfimport
+--enable-ext-scripting-beanshell
+--enable-ext-scripting-javascript
+--enable-ext-scripting-python
+--enable-ext-nlpsolver
+--enable-epm
+--enable-cairo
+--enable-binfilter
+--enable-python=internal
+--disable-xrender-link
+--disable-unix-qstart-libpng
+--disable-randr-link
+--disable-kde4
+--disable-dbus
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
new file mode 100644
index 000000000000..1fb7e4ed54e0
--- /dev/null
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -0,0 +1,14 @@
+--with-vendor=The Document Foundation
+--enable-epm
+--enable-binfilter
+--with-java-target-version=1.5
+--enable-ext-presenter-minimizer
+--enable-ext-presenter-console
+--enable-ext-pdfimport
+--enable-ext-wiki-publisher
+--enable-ext-report-builder
+--enable-ext-scripting-beanshell
+--enable-ext-scripting-javascript
+--enable-ext-scripting-python
+--enable-ext-nlpsolver
+--with-extension-integration
diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf
new file mode 100644
index 000000000000..40c15e048a67
--- /dev/null
+++ b/distro-configs/LibreOfficeOpenBSD.conf
@@ -0,0 +1,57 @@
+--disable-build-mozilla
+--disable-dbus
+--disable-epm
+--disable-kde
+--disable-kde4
+--disable-mozilla
+--disable-nss-module
+--disable-odk
+--disable-opengl
+--disable-randr-link
+--disable-unix-qstart-libpng
+--disable-xrender-link
+--enable-binfilter
+--enable-cairo
+--enable-gnome-vfs
+--enable-gstreamer
+--enable-lockdown
+--enable-ext-presenter-minimizer
+--enable-ext-pdfimport
+--enable-ext-presenter-console
+--enable-ext-report-builder
+--enable-ext-wiki-publisher
+--with-alloc=system
+--with-ant-home=/usr/local/ant
+--with-extension-integration
+--with-fonts
+--with-java
+--with-java-target-version=1.5
+--with-jdk-home=/usr/local/jdk-1.5.0
+--with-myspell-dicts
+--with-system-boost
+--with-system-cairo
+--with-system-cppunit
+--with-system-curl
+--with-system-db
+--with-system-expat
+--with-system-hunspell
+--with-system-icu
+--with-system-jars
+--with-system-jpeg
+--with-system-libxml
+--with-system-libxslt
+--with-system-mesa-headers
+--with-system-neon
+--with-system-openssl
+--with-system-poppler
+--with-system-python
+--with-system-redland
+--with-system-stdlibs
+--with-system-xrender-headers
+--with-system-zlib
+--with-vendor=The OpenBSD project
+--without-junit
+--without-openldap
+--without-system-mozilla
+--without-unix-wrapper
+--without-system-libwpd
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
new file mode 100644
index 000000000000..c8c993fed023
--- /dev/null
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -0,0 +1,18 @@
+--with-vendor=The Document Foundation
+--without-system-mesa-headers
+--without-junit
+--without-helppack-integration
+--without-agfa-monotype-fonts
+--with-extension-integration
+--with-java-target-version=1.5
+--disable-xrender-link
+--disable-activex-component
+--enable-binfilter
+--enable-ext-scripting-beanshell
+--enable-ext-scripting-javascript
+--enable-ext-wiki-publisher
+--enable-ext-report-builder
+--enable-ext-presenter-minimizer
+--enable-ext-presenter-console
+--enable-ext-pdfimport
+--enable-ext-nlpsolver
diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf
new file mode 100644
index 000000000000..889237f03326
--- /dev/null
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -0,0 +1,9 @@
+--with-vendor=The Document Foundation
+--without-agfa-monotype-fonts
+--with-java-target-version=1.5
+--enable-cl-x64
+--disable-xrender-link
+--disable-activex-component
+--enable-ext-scripting-beanshell
+--enable-ext-scripting-javascript
+--enable-ext-scripting-python
diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf
new file mode 100644
index 000000000000..02008d5511fc
--- /dev/null
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -0,0 +1,23 @@
+--build=i386-apple-darwin10.7.0
+--host=arm-apple-darwin10
+--disable-cairo
+--disable-cups
+--disable-fontconfig
+--disable-gconf
+--disable-gnome-vfs
+--disable-gstreamer
+--disable-lockdown
+--disable-mozilla
+--disable-nss-module
+--disable-odk
+--disable-opengl
+--disable-python
+--disable-randr
+--disable-randr-link
+--disable-systray
+--without-fonts
+--without-java
+--without-junit
+--without-ppds
+--without-stlport
+--without-system-python
diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf
new file mode 100644
index 000000000000..eab1a604c37b
--- /dev/null
+++ b/distro-configs/OxygenOfficeLinux.conf
@@ -0,0 +1,79 @@
+--with-vendor=OxygenOffice Professional Team
+--with-build-version=OxygenOffice Professional Beta 3.4.0 M000 - OxygenOffice Build 0
+--with-intro-bitmap=$TARFILE_LOCATION/openintro_ooop.png
+--with-about-bitmap=$TARFILE_LOCATION/openabout_ooop.png
+--enable-binfilter
+--enable-vba
+--enable-build-mozilla
+--without-system-mozilla
+--with-package-format=rpm deb
+--enable-epm
+--enable-cups
+--disable-symbols
+--enable-systray
+--with-epm=internal
+--disable-kde
+--disable-kde4
+--enable-gtk
+--enable-evolution2
+--enable-lockdown
+--without-unix-wrapper
+--with-fonts
+--enable-extra-gallery
+--enable-extra-template
+--enable-extra-sample
+--enable-extra-font
+--with-lang=en-US hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv cs ko sl
+--enable-opengl
+--enable-dbus
+--enable-gnome-vfs
+--with-extension-integration
+--enable-ext-wiki-publisher
+--enable-ext-report-builder
+--enable-ext-presenter-minimizer
+--enable-ext-presenter-console
+--enable-ext-pdfimport
+--enable-ext-scripting-beanshell
+--enable-ext-scripting-javascript
+--enable-ext-scripting-python
+--enable-ext-google-docs
+--enable-ext-hunart
+--enable-ext-lightproof
+--enable-ext-nlpsolver
+--enable-ext-numbertext
+--enable-ext-typo
+--enable-ext-watch-window
+--enable-ext-diagram
+--enable-ext-validator
+--enable-ext-barcode
+--disable-ext-oooblogger
+--with-sun-templates
+--without-system-poppler
+--enable-neon
+--without-system-stdlibs
+--with-jdk-home=/usr/local/jdk1.6.0_23/
+--without-system-dicts
+--without-system-xrender-headers
+--without-system-zlib
+--without-system-stdlibs
+--without-system-poppler
+--without-system-openssl
+--without-system-mozilla
+--without-system-mesa-headers
+--without-system-libxslt
+--without-system-libxml
+--without-system-jpeg
+--without-system-jars
+--without-system-cairo
+--without-junit
+--with-helppack-integration
+--with-linker-hash-style=both
+--enable-odk
+--enable-gstreamer
+--enable-cairo
+--enable-graphite
+--enable-dependency-tracking
+--enable-mozilla
+--enable-python=internal
+--with-system-mozilla=mozilla
+--with-openldap
diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf
new file mode 100644
index 000000000000..ba6f999b653c
--- /dev/null
+++ b/distro-configs/OxygenOfficeWin32.conf
@@ -0,0 +1,46 @@
+--with-vendor=OxygenOffice Professional Team
+--with-build-version=OxygenOffice Professional Beta 3.4.0 M000 - OxygenOffice Build 0
+--with-intro-bitmap=$TARFILE_LOCATION/openintro_ooop.png
+--with-about-bitmap=$TARFILE_LOCATION/openabout_ooop.png
+--enable-binfilter
+--enable-vba
+--disable-build-mozilla
+--disable-symbols
+--enable-systray
+--with-fonts
+--enable-extra-gallery
+--enable-extra-template
+--enable-extra-sample
+--enable-extra-font
+--with-lang=hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv cs ko sl
+--with-extension-integration
+--enable-ext-wiki-publisher
+--enable-ext-report-builder
+--enable-ext-presenter-minimizer
+--enable-ext-presenter-console
+--enable-ext-pdfimport
+--enable-ext-scripting-beanshell
+--enable-ext-scripting-javascript
+--enable-ext-scripting-python
+--enable-ext-google-docs
+--enable-ext-hunart
+--enable-ext-lightproof
+--enable-ext-nlpsolver
+--enable-ext-numbertext
+--enable-ext-typo
+--enable-ext-watch-window
+--enable-ext-diagram
+--enable-ext-validator
+--enable-ext-barcode
+--disable-ext-oooblogger
+--with-sun-templates
+--disable-cairo
+--with-jdk-home=/usr/local/jdk1.6.0_23/
+--without-junit
+--with-helppack-integration
+--enable-cairo
+--enable-graphite
+--enable-dependency-tracking
+--enable-mozilla
+--with-system-mozilla=mozilla
+--with-openldap
diff --git a/dmake/.gitignore b/dmake/.gitignore
new file mode 100644
index 000000000000..addefdaaee95
--- /dev/null
+++ b/dmake/.gitignore
@@ -0,0 +1,11 @@
+Makefile
+.deps
+*.o
+/config.h
+/config.log
+/config.status
+/dmake
+/dmakeroot.h
+/stamp-h1
+/startup/config.mk
+/*/.dirstamp
diff --git a/dmake/configure b/dmake/configure
index 7e6d05ab8a65..840207bbb891 100755
--- a/dmake/configure
+++ b/dmake/configure
@@ -4084,7 +4084,7 @@ case "$_os" in
 	"AIX")
 	  OS_VERSION=sysvr4
 	  ;;
-	"OpenBSD")
+	"OpenBSD"|DragonFly)
 	  OS_VERSION=linux
 	  ;;
    *)
diff --git a/dmake/configure.in b/dmake/configure.in
index c903d94faab8..c196413f9da0 100755
--- a/dmake/configure.in
+++ b/dmake/configure.in
@@ -111,7 +111,7 @@ case "$_os" in
 	"AIX")
 	  OS_VERSION=sysvr4
 	  ;;
-	"OpenBSD")
+	"OpenBSD"|DragonFly)
 	  OS_VERSION=linux
 	  ;;
    *)
diff --git a/dmake/dbug/dbug/dbug.c b/dmake/dbug/dbug/dbug.c
index e63a4750ed5b..6262f89431dd 100644
--- a/dmake/dbug/dbug/dbug.c
+++ b/dmake/dbug/dbug/dbug.c
@@ -164,45 +164,6 @@ EXPORT BOOLEAN _db_pon_ = FALSE;    /* TRUE if debugging currently on */
  *  Externally supplied functions.
  */
 
-/* Disable the manual definitions, if something is missing use #include's! */
-#if 0
-
-#ifdef unix         /* Only needed for unix */
-IMPORT VOID perror ();      /* Print system/library error */
-IMPORT int chown ();        /* Change owner of a file */
-IMPORT int getgid ();       /* Get real group id */
-IMPORT int getuid ();       /* Get real user id */
-IMPORT int access ();       /* Test file for access */
-#else
-#if !(AMIGA || LATTICE || __TURBOC__)
-LOCAL VOID perror ();       /* Fake system/library error print routine */
-#endif
-#endif
-
-# if BSD4_3 || sun
-IMPORT int getrusage ();
-#endif
-
-IMPORT int atoi ();     /* Convert ascii to integer */
-IMPORT VOID exit ();        /* Terminate execution */
-IMPORT int fclose ();       /* Close a stream */
-IMPORT FILE *fopen ();      /* Open a stream */
-#if !defined(__BORLANDC__)
-IMPORT int fprintf ();      /* Formatted print on file */
-#endif
-IMPORT VOID free ();
-IMPORT char *malloc ();     /* Allocate memory */
-IMPORT int strcmp ();       /* Compare strings */
-IMPORT char *strcpy ();     /* Copy strings around */
-IMPORT int strlen ();       /* Find length of string */
-
-#ifndef fflush          /* This is sometimes a macro */
-IMPORT int fflush ();       /* Flush output for stream */
-#endif
-
-#endif
-
-
 /*
  *  The user may specify a list of functions to trace or
  *  debug.  These lists are kept in a linear linked list,
@@ -274,7 +235,7 @@ LOCAL BOOLEAN DoProfile (); /* Check if profiling is enabled */
 
                 /* Supplied in Sys V runtime environ */
 LOCAL char *strtok ();      /* Break string into tokens */
-LOCAL char *strrchr ();     /* Find last occurance of char */
+LOCAL char *strrchr ();     /* Find last occurrence of char */
 
 /*
  *  The following local variables are used to hold the state information
diff --git a/dmake/dbug/malloc/testmem.c b/dmake/dbug/malloc/testmem.c
index 46fba912f8c0..7da5e8ced89b 100644
--- a/dmake/dbug/malloc/testmem.c
+++ b/dmake/dbug/malloc/testmem.c
@@ -354,34 +354,6 @@ second()
     check(strpbrk(one, "bc") == NULL, 10);  /* Empty string. */
     check(strpbrk(one, "") == NULL, 11);    /* Both strings empty. */
 
-#if 0
-    /*
-     * strstr - somewhat like strchr
-     */
-    it = "strstr";
-    check(strstr("abcd", "z") == NULL, 1);  /* Not found. */
-    check(strstr("abcd", "abx") == NULL, 2);    /* Dead end. */
-    (void) strcpy(one, "abcd");
-    check(strstr(one, "c") == one+2, 3);    /* Basic test. */
-    check(strstr(one, "bc") == one+1, 4);   /* Multichar. */
-    check(strstr(one, "d") == one+3, 5);    /* End of string. */
-    check(strstr(one, "cd") == one+2, 6);   /* Tail of string. */
-    check(strstr(one, "abc") == one, 7);    /* Beginning. */
-    check(strstr(one, "abcd") == one, 8);   /* Exact match. */
-    check(strstr(one, "abcde") == NULL, 9); /* Too long. */
-    check(strstr(one, "de") == NULL, 10);   /* Past end. */
-    check(strstr(one, "") == one+4, 11);    /* Finding empty. */
-    (void) strcpy(one, "ababa");
-    check(strstr(one, "ba") == one+1, 12);  /* Finding first. */
-    (void) strcpy(one, "");
-    check(strstr(one, "b") == NULL, 13);    /* Empty string. */
-    check(strstr(one, "") == one, 14);  /* Empty in empty string. */
-    (void) strcpy(one, "bcbca");
-    check(strstr(one, "bca") == one+2, 15); /* False start. */
-    (void) strcpy(one, "bbbcabbca");
-    check(strstr(one, "bbca") == one+1, 16);    /* With overlap. */
-#endif
-
     /*
      * strspn
      */
diff --git a/dmake/dmake.c b/dmake/dmake.c
index ddfe3a88ad06..cf6763fc711f 100644
--- a/dmake/dmake.c
+++ b/dmake/dmake.c
@@ -292,7 +292,7 @@ char **argv;
                  HASHPTR hp;
                  /* This cleans the .SILENT setting */
                  hp = Def_macro(".SILENT", "", M_EXPANDED);
-                 /* This overrides the bitmask for further occurences of
+                 /* This overrides the bitmask for further occurrences of
                   * .SILENT to "no bits allowed", see bit variables in the
                   * set_macro_value() definition in dag.c.
                   * The bitmask is already set by Create_macro_vars() in
@@ -795,11 +795,7 @@ va_list  args;
 ** Print error message and abort
 */
 PUBLIC void
-#ifndef __MWERKS__
 Fatal(ARG(char *,fmt), ARG(va_alist_type,va_alist))
-#else
-Fatal(char * fmt, ...)
-#endif
 DARG(char *,fmt)
 DARG(va_alist_type,va_alist)
 {
@@ -815,11 +811,7 @@ DARG(va_alist_type,va_alist)
 ** error message and exit (unless -k)
 */
 PUBLIC void
-#ifndef __MWERKS__
 Error(ARG(char *,fmt), ARG(va_alist_type,va_alist))
-#else
-Error(char * fmt, ...)
-#endif
 DARG(char *,fmt)
 DARG(va_alist_type,va_alist)
 {
@@ -835,11 +827,7 @@ DARG(va_alist_type,va_alist)
 ** non-fatal message
 */
 PUBLIC void
-#ifndef __MWERKS__
 Warning(ARG(char *,fmt), ARG(va_alist_type,va_alist))
-#else
-Warning(char * fmt , ...)
-#endif
 DARG(char *,fmt)
 DARG(va_alist_type,va_alist)
 {
@@ -929,6 +917,7 @@ int eflag;
    puts("    -x   - export macro values to environment");
    puts("    -X   - ignore #! lines at start of makefile");
    }
+   FREE(fill);
 
    Quit(0);
 }
diff --git a/dmake/dmake.h b/dmake/dmake.h
index 457031fdb50d..c3003a3db911 100644
--- a/dmake/dmake.h
+++ b/dmake/dmake.h
@@ -28,7 +28,8 @@
 
 #define MAX_INC_DEPTH     10     /* max of ten nested include files      */
 #define MAX_COND_DEPTH    20     /* max nesting level of conditionals    */
-#define ERROR_EXIT_VALUE  255    /* return code of aborted make          */
+#define ERROR_ABORT_VALUE 254    /* return code of aborted make          */
+#define ERROR_EXIT_VALUE  255    /* return code of failed  make          */
 #define CONTINUATION_CHAR '\\'   /* line continuation \<nl>              */
 #define DEF_ESCAPE_CHAR   '\\'   /* escape char for used chars           */
 #define ESCAPE_CHAR       *Escape_char
diff --git a/dmake/dmstring.c b/dmake/dmstring.c
index 9659fc406768..53068a9deba0 100644
--- a/dmake/dmstring.c
+++ b/dmake/dmstring.c
@@ -200,7 +200,7 @@ char *str;
 PUBLIC char *
 DmStrPbrk( s1, s2 )/*
 ====================
-   find first occurence of char in s2 in string s1.
+   find first occurrence of char in s2 in string s1.
    Returns a pointer to the first occurrence.  NOTE '\0' is considered part
    of s2 and a pointer to it is returned if no other chars match. */
 
diff --git a/dmake/function.c b/dmake/function.c
index cd86810849e5..d0379f612971 100644
--- a/dmake/function.c
+++ b/dmake/function.c
@@ -587,7 +587,7 @@ int expand;
       Do_profile_output( "s", M_TARGET, &cell );
 
    /* Print the shell escape command. */
-   if( !(rcp.st_attr & A_SILENT) ) {
+   if( Verbose & V_FORCEECHO ) {
       printf( "%s: Executing shell macro: %s\n", Pname, data );
       fflush(stdout);
    }
diff --git a/dmake/getinp.c b/dmake/getinp.c
index 5445193d1a90..1ac312a53b59 100644
--- a/dmake/getinp.c
+++ b/dmake/getinp.c
@@ -88,17 +88,23 @@ FILE *fil;
       /* Reading the internal rule table.  Set rule_ind to zero after the
        * last entry so that ReadEnvironment() works as expected every time. */
 
-      while( (p = Rule_tab[ rule_ind++ ]) != NIL(char) )
+      while( (p = Rule_tab[ rule_ind++ ]) != NIL(char) ) {
      /* The last test in this if *p != '~', handles the environment
       * passing conventions used by MKS to pass arguments.  We want to
       * skip those environment entries. Also CYGWIN likes to export '!'
-      * prefixed environment variables that cause severe pain, axe them too */
-     if( !Readenv || (Readenv && (strchr(p,'=') != NIL(char)) && *p!='~' && *p!='!')){
+      * prefixed environment variables that cause severe pain, axe them too.
+      * And finally it is possible to do "env 'GGG HHH'='some value' bash"
+      * which causes that there are env variables with spaces in the name
+      * defined which causes dmake to malfunction too */
+     char *equal = strchr(p,'=');
+     char *space = strchr(p,' ');
+     if( !Readenv || (Readenv && (equal != NIL(char)) && (space == NIL(char) || space > equal) && *p!='~' && *p!='!')){
         strcpy( buf, p );
 
         DB_PRINT( "io", ("Returning [%s]", buf) );
         DB_RETURN( FALSE );
      }
+      }
 
       rule_ind = 0;
 
diff --git a/dmake/mac/arlib.c b/dmake/mac/arlib.c
deleted file mode 100644
index 2f06bca68f9e..000000000000
--- a/dmake/mac/arlib.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* RCS  $Id: arlib.c,v 1.1.1.1 2000-09-22 15:33:26 hr Exp $
---
--- SYNOPSIS
---      Library access code.
---
--- DESCRIPTION
---  This implementation uses the library timestamp inplace of the
---  library member timestamp.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-PUBLIC time_t
-seek_arch(name, lib)
-char*   name;
-char*   lib;
-{
-   static   int warned = FALSE;
-
-   if (!warned && !(Glob_attr&A_SILENT))
-       warned = TRUE,
-       Warning("Can't extract library member timestamp;\n\
-       using library timestamp instead.");
-   return (Do_stat(lib, NULL, NULL, TRUE));
-}
-
-PUBLIC int
-touch_arch(name, lib)
-char*   name;
-char*   lib;
-{
-   static   int warned = FALSE;
-
-   if (!warned && !(Glob_attr&A_SILENT))
-       warned = TRUE,
-       Warning("Can't update library member timestamp;\n\
-       touching library instead.");
-   return (Do_touch(lib, NULL, NULL));
-}
-
diff --git a/dmake/mac/bogus.c b/dmake/mac/bogus.c
deleted file mode 100644
index efd7d39b9470..000000000000
--- a/dmake/mac/bogus.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* RCS  $Id: bogus.c,v 1.1.1.1 2000-09-22 15:33:27 hr Exp $
---
--- SYNOPSIS
---      Write the shell of subroutines we can't or don't
---             need to implement
---
--- DESCRIPTION
---  dmake uses a couple of functions which I am either unable to figure out
---  how to implement or which are not needed.  The shells of these routines
---  are in this file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-
-
-/*
- * tzset() is a Microsoft "extension" to ANSI C.  It sets global
- * variables telling if we are in dayling savings time, the time
- * zone, and difference between the current time and GMT.
- * None of these globals are used by dmake, so this routine is
- * not needed
- */
-PUBLIC void
-tzset ()
-{
-}
-
-
-
-/*
- * Add an environmental variable that child processes can use.
- * Since MPW currently doesn't allow child processes, this isn't
- * needed.
- */
-PUBLIC int
-putenv (char *pEnvString)
-{
-  return (0);
-}
-
-
-
-/*
- * Execute a child process.  This may be able to be done with
- * the MPW system() call someday, but cannot be done currently.
- */
-PUBLIC int
-runargv (CELLPTR target, int ignore, int,
-     int last, int shell, char *pCmd)
-{
-    static int warned = FALSE;
-
-    if (!warned && !(Glob_attr & A_SILENT)) {
-        warned = TRUE;
-        Fatal ("Can't execute any targets:  use '-n' option.");
-    } /* if */
-
-    return (0);
-} /* int runargv () */
-
-
-
-/*
- * Wait for the child process to complete.  Only needed to be implemented
- * if we could executing multiple processes at once.
- */
-PUBLIC int
-Wait_for_child(int abort_flg, int pid)
-{
-  return (1);
-}
-
-
-
-/*
- * Do any cleanup for any processes when we quit.
- */
-PUBLIC void
-Clean_up_processes()
-{
-}
diff --git a/dmake/mac/config.mk b/dmake/mac/config.mk
deleted file mode 100644
index 2a6806cff159..000000000000
--- a/dmake/mac/config.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# This is an OS Mac specific configuration file
-#   It assumes that OBJDIR, TARGET and DEBUG are previously defined.
-#   It defines  CFLAGS, LDARGS, CPPFLAGS, STARTUPFILE, LDOBJS
-#   It augments SRC, OBJDIR, TARGET, CFLAGS, LDLIBS
-#
-
-STARTUPFILE = :$(OS):startup.mk
-
-CPPFLAGS    = $(CFLAGS)
-LDOBJS      = $(CSTARTUP) :$(OBJDIR):{$(<:f)}
-LDARGS      = $(LDFLAGS) -o $@ $(LDOBJS) $(LDLIBS)
-
-# Debug flags
-DB_CFLAGS   = -sym on 
-DB_LDFLAGS  = -sym on
-DB_LDLIBS   =
-
-# NO Debug flags
-NDB_CFLAGS  = -sym off
-NDB_LDFLAGS = -sym off
-NDB_LDLIBS  =
-
-# Local configuration modifications for CFLAGS.
-CFLAGS     += -I :$(OS) -d _MPW -s $(<:b)
-LDFLAGS    += -w -c 'MPS ' -t MPST
-
-# Since we writing out what files we want to execute, we can't use .SETDIR
-# to specify the files to compile in the Mac directory.
-# Instead, we copy the files to the (top-level) current directory and compile
-# them there.
-%.c : ":$(OS):%.c"
-    duplicate -y $< $@
-
-# Common Mac source files.
-OS_SRC = arlib.c bogus.c dirbrk.c directry.c environ.c main.c rmprq.c \
-         ruletab.c tempnam.c tomacfil.c
-.IF $(SHELL) != mwp
-   .SETDIR=$(OS) : $(OS_SRC)
-.ENDIF
-SRC += $(OS_SRC)
-
-# Set source dirs so that we can find files named in this
-# config file.
-.SOURCE.h : $(OS)
diff --git a/dmake/mac/dirbrk.c b/dmake/mac/dirbrk.c
deleted file mode 100644
index c584ad22cad1..000000000000
--- a/dmake/mac/dirbrk.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* RCS  $Id: dirbrk.c,v 1.1.1.1 2000-09-22 15:33:27 hr Exp $
---
--- SYNOPSIS
---      Define the directory separator string.
---
--- DESCRIPTION
---  Define this string for any character that may appear in a path name
---  and can be used as a directory separator.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-/* mac only uses ':' */
-char*   DirBrkStr = ":";
-
-/*
-** Return TRUE if the name is the full specification of a path name to a file
-** starting at the root of the file system, otherwise return FALSE
-*/
-PUBLIC int
-If_root_path(name)
-char *name;
-{
-   return( (strchr(name, ':') != NIL(char)) &&
-           (name[0] != ':') );
-}
diff --git a/dmake/mac/directry.c b/dmake/mac/directry.c
deleted file mode 100644
index b1d452d073ba..000000000000
--- a/dmake/mac/directry.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/* RCS  $Id: directry.c,v 1.1.1.1 2000-09-22 15:33:27 hr Exp $
---
--- SYNOPSIS
---      Fake directory and file functions for the Mac
---
--- DESCRIPTION
---  This file contains implementations for some ANSI standard routines dmake
---  uses which are not otherwise available for the mac.
---
---  Assume we are using at least 128K ROMS.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <Errors.h>
-#include <Files.h>
-#include <OSUtils.h>
-#include <StdLib.h>
-#include <Strings.h>
-/*
- * We now include LowMem.h instead of SysEqu.h as LowMem.h is what Apple recommends
- * we use.
- */
-#include <LowMem.h>
-#include "extern.h"
-
-
-
-/*
- * Implementation of stat function for dmake on the mac.
- *
- * Many fields aren't filled in, and the times are seconds from 1/1//1904,
- * but it should be enough for dmake (I think we only need st_mtime and
- * st_mode's S_IFDIR set correctly).
- */
-PUBLIC int
-stat(pPath, pStat)
-char *pPath;
-struct stat *pStat;
-{
-    CInfoPBRec infoPB;
-    OSErr err;
-    int retVal;
-
-    infoPB.hFileInfo.ioCompletion = NULL;
-    infoPB.hFileInfo.ioNamePtr = c2pstr (pPath);
-    infoPB.hFileInfo.ioVRefNum = 0;
-    infoPB.hFileInfo.ioFDirIndex = 0;
-    infoPB.hFileInfo.ioDirID = 0;
-    err = PBGetCatInfo(&infoPB, FALSE);
-    p2cstr ((StringPtr) pPath);
-
-    if (err == noErr) {
-        pStat->st_mtime = (time_t) infoPB.hFileInfo.ioFlMdDat;
-        pStat->st_ctime = (time_t) infoPB.hFileInfo.ioFlCrDat;
-        pStat->st_mode = S_IREAD | S_IEXEC;
-
-        /* If it is a directory ... */
-        if (infoPB.hFileInfo.ioFlAttrib & 0x10) {
-            pStat->st_size = infoPB.dirInfo.ioDrNmFls;
-            pStat->st_mode |= S_IFDIR;
-        } else {
-            pStat->st_size = infoPB.hFileInfo.ioFlLgLen;
-            pStat->st_mode |= S_IFREG;
-        } /* if ... else */
-
-        /* If it is writeable */
-        if ((infoPB.hFileInfo.ioFlAttrib & 0x1) == 0) {
-            pStat->st_mode |= S_IWRITE;
-        } /* if */
-
-        retVal = 0;
-
-    } else {
-        retVal = -1;
-    } /* if ... else */
-
-    return (retVal);
-} /* PUBLIC int stat () */
-
-
-
-/*
- * Return the current working directory, or NULL if there is an error.
- */
-PUBLIC char *
-getcwd(char *pPath, size_t pathSize)
-{
-    DirInfo dirInfo;
-    OSErr err;
-    Str255 dirName;
-    char *pBeginName;
-    char *pC;
-    size_t len;
-    size_t spaceForColon;
-
-    /* Set up the info for the PBGetCatInfo() calls */
-    dirInfo.ioCompletion = NULL;
-    dirInfo.ioNamePtr = dirName;
-    dirInfo.ioVRefNum = 0;
-    dirInfo.ioFDirIndex = -1;
-    dirInfo.ioDrDirID = 0;
-    pBeginName = pPath + pathSize - 1;
-    spaceForColon = 0;  /* Make sure we don't have an end colon on the name */
-
-    /*
-     * Keep going up the directory path until the end is reached or an error
-     * occurs.  Ideally, we would check for errors at every level and stop
-     * when we received an fnfErr (File Not Found), but it appears that there
-     * are some problems with network volumes.  (During testing, I received
-     * a paramErr (No Default Volume) beyond the top level.)  Thus, to keep it
-     * simple, I assume any error past the first directory indicates we have
-     * seen all directories.
-     */
-    while (TRUE) {
-        err = PBGetCatInfo ((CInfoPBPtr) &dirInfo, FALSE);
-        len = ((size_t)(unsigned char) dirName[0]);
-        if ((err == noErr) && (len < pBeginName - pPath)) {
-            p2cstr (dirName);
-            pBeginName -= len + spaceForColon;
-            strcpy (pBeginName, (char *)dirName);
-            /* Note that strcpy() adds the '\0' at the end of
-               the first directory for us */
-            if (spaceForColon == 1) {
-                pBeginName[len] = ':';
-            } else {
-                /* The end of the string shouldn't have a ':' */
-                spaceForColon = 1;
-            } /* if */
-
-            /* Set up for the next call to PBGetCatInfo() with
-               the parent's directory ID */
-            dirInfo.ioDrDirID = dirInfo.ioDrParID;
-
-        } else if (spaceForColon == 1) {
-            /* We got past the top-level directory */
-            break;
-
-        } else {
-            /* We either have an error when looking at the first directory
-               or have run out of room. */
-            return (NULL);
-        } /* if ... elses */
-    } /* while */
-
-    /* Now copy the directory string to the beginning of the path string.
-       (It's possible the directory already starts at the beginning of the
-       string, but this is unlikely and doesn't hurt anything if it does,
-       so we don't bother to check for it.) */
-    pC = pPath;
-    while ((*(pC++) = *(pBeginName++)) != '\0')
-        ;
-
-    return (pPath);
-} /* PUBLIC char *getcwd () */
-
-
-
-/*
- * Change the directory to a new default directory.
- *
- * Return 0 if successful, or -1 if there is an error.
- */
-PUBLIC int
-chdir(char *pPath)
-{
-    WDPBRec WDPB;
-    VolumeParam vParam;
-    OSErr err;
-    int result;
-    char *pC;
-    char c;
-
-    /* Set up the directory */
-    c2pstr (pPath);
-    WDPB.ioCompletion = NULL;
-    WDPB.ioNamePtr = (unsigned char *)pPath;
-    WDPB.ioVRefNum = 0;
-    WDPB.ioWDProcID = 0;
-    WDPB.ioWDDirID = 0;
-    err = PBOpenWD (&WDPB, FALSE);
-    /* Restore path to a C-type string in case the caller wants
-       to use it after this call. */
-    p2cstr ((unsigned char *)pPath);
-    if (err != noErr) {
-        return (-1);
-    } /* if */
-
-    /* Set up the volume if necessary */
-    if (*pPath != ':') {
-        for (pC = pPath + 1; (*pC != ':') && (*pC != '\0'); ++pC)
-            ;
-        c = *pC;
-        *pC = '\0';
-        vParam.ioCompletion = NULL;
-        vParam.ioNamePtr = c2pstr (pPath);
-        vParam.ioVRefNum = WDPB.ioVRefNum;
-        err = PBSetVol ((ParmBlkPtr) &vParam, FALSE);
-        p2cstr ((unsigned char *)pPath);
-        *pC = c;
-        result = ((err == noErr) ? 0 : -1);
-
-    } else {
-        result = 0;
-    } /* if ... else */
-
-    return (result);
-} /* PUBLIC int chdir () */
-
-
-
-/*
- * Change the modification time for the file to the current time.
- *
- * The normal version of utime can set the modification time to any
- * time, this function aborts the function if this is tried.
- *
- * We return 0 if the modification time was updated and -1 if there
- * was an error.
- */
-PUBLIC int
-utime(char *pPath, time_t *pTimes)
-{
-    CInfoPBRec infoPB;
-    OSErr err;
-
-    if (pTimes != NULL) {
-        Fatal ("SUBROUTINE SHORTCOMING: utime cannot take a utimbuf struct");
-    } /* if */
-
-    /* Get the old info */
-    infoPB.hFileInfo.ioCompletion = NULL;
-    infoPB.hFileInfo.ioNamePtr = c2pstr (pPath);
-    infoPB.hFileInfo.ioVRefNum = 0;
-    infoPB.hFileInfo.ioFDirIndex = 0;
-    infoPB.hFileInfo.ioDirID = 0;
-    err = PBGetCatInfo (&infoPB, FALSE);
-    if (err != noErr) {
-        p2cstr ((StringPtr) pPath);
-        return (-1);
-    } /* if */
-
-    /* Change the modification time and set the new info */
-    GetDateTime (&(infoPB.hFileInfo.ioFlMdDat));
-    infoPB.hFileInfo.ioDirID = 0;
-    err = PBSetCatInfo (&infoPB, FALSE);
-    p2cstr ((StringPtr) pPath);
-    return ((err == noErr) ? 0 : -1);
-} /* PUBLIC int utime () */
diff --git a/dmake/mac/dompwmak b/dmake/mac/dompwmak
deleted file mode 100644
index c71ed12ca16d..000000000000
--- a/dmake/mac/dompwmak
+++ /dev/null
@@ -1,67 +0,0 @@
-newfolder objects
-c -I. -I :mac -d _MPW -s infer -sym off -o :objects:infer.c.o infer.c
-c -I. -I :mac -d _MPW -s make -sym off -o :objects:make.c.o make.c
-c -I. -I :mac -d _MPW -s stat -sym off -o :objects:stat.c.o stat.c
-c -I. -I :mac -d _MPW -s expand -sym off -o :objects:expand.c.o expand.c
-c -I. -I :mac -d _MPW -s dmstring -sym off -o :objects:dmstring.c.o dmstring.c
-c -I. -I :mac -d _MPW -s hash -sym off -o :objects:hash.c.o hash.c
-c -I. -I :mac -d _MPW -s dag -sym off -o :objects:dag.c.o dag.c
-c -I. -I :mac -d _MPW -s dmake -sym off -o :objects:dmake.c.o dmake.c
-c -I. -I :mac -d _MPW -s path -sym off -o :objects:path.c.o path.c
-c -I. -I :mac -d _MPW -s imacs -sym off -o :objects:imacs.c.o imacs.c
-c -I. -I :mac -d _MPW -s sysintf -sym off -o :objects:sysintf.c.o sysintf.c
-c -I. -I :mac -d _MPW -s parse -sym off -o :objects:parse.c.o parse.c
-c -I. -I :mac -d _MPW -s getinp -sym off -o :objects:getinp.c.o getinp.c
-c -I. -I :mac -d _MPW -s quit -sym off -o :objects:quit.c.o quit.c
-c -I. -I :mac -d _MPW -s state -sym off -o :objects:state.c.o state.c
-c -I. -I :mac -d _MPW -s basename -sym off -o :objects:basename.c.o basename.c
-c -I. -I :mac -d _MPW -s dmdump -sym off -o :objects:dmdump.c.o dmdump.c
-c -I. -I :mac -d _MPW -s macparse -sym off -o :objects:macparse.c.o macparse.c
-c -I. -I :mac -d _MPW -s rulparse -sym off -o :objects:rulparse.c.o rulparse.c
-c -I. -I :mac -d _MPW -s percent -sym off -o :objects:percent.c.o percent.c
-c -I. -I :mac -d _MPW -s function -sym off -o :objects:function.c.o function.c
-duplicate -y :mac:arlib.c arlib.c
-c -I. -I :mac -d _MPW -s arlib -sym off -o :objects:arlib.c.o arlib.c
-delete arlib.c
-duplicate -y :mac:bogus.c bogus.c
-c -I. -I :mac -d _MPW -s bogus -sym off -o :objects:bogus.c.o bogus.c
-delete bogus.c
-duplicate -y :mac:dirbrk.c dirbrk.c
-c -I. -I :mac -d _MPW -s dirbrk -sym off -o :objects:dirbrk.c.o dirbrk.c
-delete dirbrk.c
-duplicate -y :mac:directry.c directry.c
-c -I. -I :mac -d _MPW -s directry -sym off -o :objects:directry.c.o directry.c
-delete directry.c
-duplicate -y :mac:environ.c environ.c
-c -I. -I :mac -d _MPW -s environ -sym off -o :objects:environ.c.o environ.c
-delete environ.c
-duplicate -y :mac:main.c main.c
-c -I. -I :mac -d _MPW -s main -sym off -o :objects:main.c.o main.c
-delete main.c
-duplicate -y :mac:rmprq.c rmprq.c
-c -I. -I :mac -d _MPW -s rmprq -sym off -o :objects:rmprq.c.o rmprq.c
-delete rmprq.c
-duplicate -y :mac:ruletab.c ruletab.c
-c -I. -I :mac -d _MPW -s ruletab -sym off -o :objects:ruletab.c.o ruletab.c
-delete ruletab.c
-duplicate -y :mac:tempnam.c tempnam.c
-c -I. -I :mac -d _MPW -s tempnam -sym off -o :objects:tempnam.c.o tempnam.c
-delete tempnam.c
-duplicate -y :mac:tomacfil.c tomacfil.c
-c -I. -I :mac -d _MPW -s tomacfil -sym off -o :objects:tomacfil.c.o tomacfil.c
-delete tomacfil.c
-Set p1 ":objects:infer.c.o :objects:make.c.o :objects:stat.c.o :objects:expand.c.o"
-Set p2 ":objects:dmstring.c.o :objects:hash.c.o :objects:dag.c.o :objects:dmake.c.o"
-Set p3 ":objects:path.c.o :objects:imacs.c.o :objects:sysintf.c.o :objects:parse.c.o"
-Set p4 ":objects:getinp.c.o :objects:quit.c.o :objects:state.c.o :objects:basename.c.o"
-Set p5 ":objects:dmdump.c.o :objects:macparse.c.o :objects:rulparse.c.o" 
-Set p6 ":objects:percent.c.o :objects:function.c.o :objects:arlib.c.o :objects:bogus.c.o"
-Set p7 ":objects:dirbrk.c.o :objects:directry.c.o :objects:environ.c.o :objects:main.c.o"
-Set p8 ":objects:rmprq.c.o :objects:ruletab.c.o :objects:tempnam.c.o"
-Set p9 ":objects:tomacfil.c.o Micah:MPW:Libraries:CLibraries:CSANELib.o" 
-Set p10 "Micah:MPW:Libraries:CLibraries:Math.o" 
-Set p11 "Micah:MPW:Libraries:CLibraries:StdCLib.o" 
-Set p12 "Micah:MPW:Libraries:Libraries:Runtime.o" 
-Set p13 "Micah:MPW:Libraries:Libraries:Interface.o Micah:MPW:Libraries:Libraries:Toollibs.o" 
-link -w -c 'MPS ' -t MPST -sym off -o dmake {p1} {p2} {p3} {p4} {p5} {p6} {p7} {p8} {p9} {p10} {p11} {p12} {p13}
-duplicate :mac:startup.mk startup.mk
diff --git a/dmake/mac/environ.c b/dmake/mac/environ.c
deleted file mode 100644
index b9bd6d014da9..000000000000
--- a/dmake/mac/environ.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/* RCS  $Id: environ.c,v 1.1.1.1 2000-09-22 15:33:27 hr Exp $
---
--- SYNOPSIS
---      Set up and free for environ
---
--- DESCRIPTION
---  This file contains routines that will fill in and dispose of the
---  list of environmental variables in the environ global variable.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-/* The char used to replace the equal signs in environmental variable names. */
-const char kEqualReplace = '_';
-
-/* Maximum size of a "name=value" environmental string, including the ending '\0'.
-   Larger environmental variables will be clipped before dmake sees them.
-   (Caution: When I tested the program, the Mac or dmake trashed memory
-    when environmental variables of >4K were read in.  I looked around a bit
-    and couldn't find out the exact cause, so I simply made this variable.
-    The memory trashing may be related to the value for MAXLINELENGTH.) */
-const int kMaxEnvLen = 1024;
-
-
-/* The list of environmental variables in the form "name=value".
-   (Once make_env() has been called.) */
-char **environ = NULL;
-
-/* Characters replaced during make_env() */
-struct ReplaceChar {
-    char *fpPos;
-    char fC;
-    struct ReplaceChar *fpNext;
-}; /* struct ReplaceChar */
-struct ReplaceChar *gpReplaceList = NULL;
-
-
-void AddReplace (char *pReplacePos);
-
-
-
-/*
- * Set up the environmental variables in a format used by
- * the environ global variable.
- *
- * environ has already been set to main's envp argument when
- * this suboroutine is called.  We assume that envp is a copy
- * MPW makes for this process' use alone, so we can modify it
- * below.
- */
-PUBLIC void
-make_env()
-{
-    char **ppCurEnv;
-    char *pCurPos;
-#if 0
-    char **ppMacEnv;
-    char *pMacPos;
-
-    if (!gMECalled) {
-        gMECalled = TRUE;
-
-environ = MALLOC (1, char *);
-*environ = NULL;
-#endif
-#if 0
-{
-    int numenv;
-    int len;
-    int firstnil;
-
-    numenv = 1;
-    ppMacEnv = environ;
-    while (*(ppMacEnv++) != NULL) {
-        ++numenv;
-    } /* while */
-
-    ppMacEnv = environ;
-    if ((environ = MALLOC (numenv, char *)) == NULL) {
-        No_ram ();
-    } /* if */
-
-numenv = 80;
-    for (ppCurEnv = environ; (numenv-- > 0) && (*ppMacEnv != NULL); ++ppCurEnv, ++ppMacEnv) {
-        pMacPos = *ppMacEnv;
-        len = strlen (pMacPos) + 1;
-        len += strlen (pMacPos + len) + 1;
-#define MAXLEN 4098
-if (len > MAXLEN) len = MAXLEN;
-        if ((*ppCurEnv = MALLOC (len, char)) == NULL) {
-            No_ram ();
-        } /* if */
-
-        firstnil = TRUE;
-        for (pCurPos = *ppCurEnv; ((pCurPos - *ppCurEnv) < MAXLEN - 1); ++pCurPos, ++pMacPos) {
-            if (*pMacPos == '=') {
-                *pCurPos = gEqualReplace;
-
-            } else if (*pMacPos == '\0') {
-                if (firstnil) {
-                    *pCurPos = '=';
-                    firstnil = FALSE;
-                } else {
-                    *pCurPos = *pMacPos;
-                    break;
-                } /* if ... else */
-
-            } else {
-                *pCurPos = *pMacPos;
-            } /* if ... elses */
-        } /* for */
-firstnil = FALSE;
-    } /* for */
-    *ppCurEnv = NULL;
-}
-#endif
-{
-        int firstnil;
-
-        /* Get rid of any equal signs in any environmental name, and put
-           equal signs between the names and their values */
-        for (ppCurEnv = environ; *ppCurEnv != NULL; ++ppCurEnv) {
-
-            firstnil = TRUE;
-            for (pCurPos = *ppCurEnv;
-                 ((pCurPos - *ppCurEnv < kMaxEnvLen - 1) &&
-                  ((*pCurPos != '\0') || firstnil));
-                 ++pCurPos) {
-                if (*pCurPos == '=') {
-                    AddReplace (pCurPos);
-                    *pCurPos = kEqualReplace;
-
-                } else if (*pCurPos == '\0') {
-                    AddReplace (pCurPos);
-                    *pCurPos = '=';
-                    firstnil = FALSE;
-                } /* if ... else if */
-            } /* for */
-
-            /* If the environtmental variable was too large ... */
-            if (*pCurPos != '\0') {
-                AddReplace (pCurPos);
-                *pCurPos = '\0';
-                if (firstnil) {
-                    AddReplace (--pCurPos);
-                    *pCurPos = '=';
-                } /* if */
-            } /* if */
-        } /* for */
-}
-#if 0
-    } /* if */
-#endif
-} /* PUBLIC void make_env () */
-
-
-/*
- * The character at pReplacePos is about to be replaced.  Remember the
- * old value so we can restore it when we're done.
- */
-void AddReplace (char *pReplacePos) {
-    struct ReplaceChar *pReplaceChar;
-
-    if ((pReplaceChar = MALLOC (1, struct ReplaceChar)) == NULL) {
-        No_ram ();
-    } /* if */
-    pReplaceChar->fpPos = pReplacePos;
-    pReplaceChar->fC = *pReplacePos;
-    pReplaceChar->fpNext = gpReplaceList;
-    gpReplaceList = pReplaceChar;
-} /* void AddReplace () */
-
-
-/*
- * Restore the old environmental variables to the way they looked before
- * the make_env() call, on the unlikely chance that something else will look
- * at our copy of the environmental variables during the program execution.
- *
- */
-PUBLIC void
-free_env()
-{
-    struct ReplaceChar *pReplaceChar;
-
-    while (gpReplaceList != NULL) {
-        pReplaceChar = gpReplaceList;
-        gpReplaceList = pReplaceChar->fpNext;
-
-        *(pReplaceChar->fpPos) = pReplaceChar->fC;
-
-        FREE (pReplaceChar);
-    } /* while */
-
-#if 0
-    char **ppCurEnv;
-    char *pCurPos;
-
-    if (!gFECalled) {
-        gFECalled = TRUE;
-
-//FREE (environ);
-environ = NULL;
-#endif
-#if 0
-        /* Restore the environment list to what it was before we
-           read it in. */
-        for (ppCurEnv = environ; *ppCurEnv != NULL; ++ppCurEnv) {
-            for (pCurPos = *ppCurEnv; *pCurPos != '='; ++pCurPos)
-                ;
-            *pCurPos = '\0';
-        } /* for */
-    } /* if */
-#endif
-} /* PUBLIC void free_env () */
diff --git a/dmake/mac/eold.c b/dmake/mac/eold.c
deleted file mode 100644
index 5c389c5851db..000000000000
--- a/dmake/mac/eold.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* RCS  $Id: eold.c,v 1.1.1.1 2000-09-22 15:33:27 hr Exp $
---
--- SYNOPSIS
---      Set up and free for environ
---
--- DESCRIPTION
---  This file contains routines that will fill in and dispose of the
---  list of environmental variables in the environ global variable.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-
-/*
- * Keep track of any environmental variables that have '='s in their
- * name.
- */
-struct EqualPos {
-    char *fpPos;
-    struct equalsign *fpNext;
-} /* struct EqualPos */
-
-struct EqualPos *gpEqualList;
-
-/*
- * The character used to replae the equal signs.
- */
-const char gEqualReplace = '_';
-
-
-
-/*
- * Set up the environmental variables in a format used by
- * the environ global variable.
- *
- * environ has already been set to main's envp argument when
- * this suboroutine is called.
- */
-void main_env () {
-    char **ppCurEnv;
-    char *pCurPos;
-    struct equalpos *pNewEqual;
-
-    gpEqualList = NULL;
-
-    for (ppCurEnv = environ; *ppCurEnv != NULL; ++ppCurEnv) {
-        for (pCurPos = *ppCurEnv; *pCurPos != '\0'; ++pCurPos) {
-            if (*pCurPos == '=') {
-                if ((pNewEqual =
-                     (struct EqualPos *) malloc (sizeof (struct EqualPos))) ==
-                    NULL) {
-                    fputs ("Out of Memory", stderr);
-                    exit (EXIT_FAILURE);
-                } /* if */
-                pNewEqual->fpPos = pCurPos;
-                pNewEqual->fpNext = gpEqualList;
-                gpEqualList = pNewEqual;
-
-                *pCurPos = gEqualReplace;
-            } /* if */
-        } /* for */
-
-        *pCurPos = '=';
-    } /* for */
-} /* void main_env () */
-
-
-
-/*
- * Reset the environmental variables so they look like they did
- * before the main_env() call.
- *
- * environ has already been set to main's envp argument when
- * this suboroutine is called.
- */
-void main_env () {
-    char **ppCurEnv;
-    char *pCurPos;
-    struct equalpos *pNewEqual;
-
-    gpEqualList = NULL;
-
-    for (ppCurEnv = environ; *ppCurEnv != NULL; ++ppCurEnv) {
-        for (pCurPos = *ppCurEnv; *pCurPos != '\0'; ++pCurPos) {
-            if (*pCurPos == '=') {
-                if ((pNewEqual =
-                     (struct EqualPos *) malloc (sizeof (struct EqualPos))) ==
-                    NULL) {
-                    fputs ("Out of Memory", stderr);
-                    exit (EXIT_FAILURE);
-                } /* if */
-                pNewEqual->fpPos = pCurPos;
-                pNewEqual->fpNext = gpEqualList;
-                gpEqualList = pNewEqual;
-
-                *pCurPos = gEqualReplace;
-            } /* if */
-        } /* for */
-
-        *pCurPos = '=';
-    } /* for */
-} /* void main_env () */
diff --git a/dmake/mac/main.c b/dmake/mac/main.c
deleted file mode 100644
index ab97476d4237..000000000000
--- a/dmake/mac/main.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* RCS  $Id: main.c,v 1.3 2003-03-25 14:02:21 hr Exp $
---
--- SYNOPSIS
---      The real main function
---
--- DESCRIPTION
---  In order to get the third argument to main(), which is a list of
---  environmental variables, we have #defined main to dmakemain,
---  and put the real main here.
---
---  The environmental variables are placed in the environ global variable
---  and set up for processing by dmake in make_env().
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-
-
-/*
- * Put envp in environ and call dmake's main().
- */
-#undef main
-void main(int argc, char **argv, char **envp) {
-    environ = envp;
-    dmakemain (argc, argv);
-} /* void main () */
diff --git a/dmake/mac/make.sh b/dmake/mac/make.sh
deleted file mode 100644
index fc2b8db02b0f..000000000000
--- a/dmake/mac/make.sh
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# $Id: make.sh,v 1.1.1.1 2000-09-22 15:33:27 hr Exp $
-#
-# This MPW script builds the dmake executable using the Metroworks PPC compiler
-# and linker. The resulting dmake binary will only run on the PPC platform.
-#
-# To execute this script, you will need the following tools:
-# - MacOS 8 or later
-# - CodeWarrior for MacOS Release 5 or later
-#
-# To run this script, you need to open the MPW Shell that is bundled with CodeWarrior.
-# If you have another instance of MPW installed other than the one bundled with
-# CodeWarrior, you may encounter problems. Once you open the MPW Shell that is bundled
-# with CodeWarrior, you will need to set MPW's working directory to the "dmake"
-# directory (the directory above the directory that this script is in). Then, execute
-# this script from the MPW Worksheet by typing the following command:
-#
-#   :mac:make.sh
-#
-set Exit 1
-if ( "{0}" != ':mac:make.sh' )
-  Echo "You cannot run this script from the current directory."
-  Echo "To run this script, you need to be in the �"dmake�" directory and then"
-  Echo "execute the following command: �":mac:make.sh�""
-  Exit
-end
-if ( ! `Exists -d objects` )
-  NewFolder :objects
-end
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle infer.c
-Move -y infer.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle make.c
-Move -y make.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle stat.c
-Move -y stat.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle expand.c
-Move -y expand.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle dmstring.c
-Move -y dmstring.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle hash.c
-Move -y hash.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle dag.c
-Move -y dag.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle dmake.c
-Move -y dmake.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle path.c
-Move -y path.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle imacs.c
-Move -y imacs.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle sysintf.c
-Move -y sysintf.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle parse.c
-Move -y parse.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle getinp.c
-Move -y getinp.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle quit.c
-Move -y quit.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle state.c
-Move -y state.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle dmdump.c
-Move -y dmdump.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle macparse.c
-Move -y macparse.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle rulparse.c
-Move -y rulparse.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle percent.c
-Move -y percent.c.o :objects
-# Note that function.c needs to have __useAppleExts__ defined. Otherwise, it won't link.
-MWCPPC -o : -ansi off -I :mac -d _MPW -d __useAppleExts__ -sym off -proto ignoreoldstyle function.c
-Move -y function.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:arlib.c
-Move -y arlib.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:bogus.c
-Move -y bogus.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:dirbrk.c
-Move -y dirbrk.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:directry.c
-Move -y directry.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:environ.c
-Move -y environ.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:main.c
-Move -y main.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:rmprq.c
-Move -y rmprq.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:ruletab.c
-Move -y ruletab.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:tempnam.c
-Move -y tempnam.c.o :objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:tomacfil.c
-Move -y tomacfil.c.o :objects
-MWLinkPPC -w -c 'MPS ' -t MPST -sym off -xm m -o dmake :objects:infer.c.o :objects:make.c.o �
-  :objects:stat.c.o :objects:expand.c.o :objects:dmstring.c.o :objects:hash.c.o �
-  :objects:dag.c.o :objects:dmake.c.o :objects:path.c.o :objects:imacs.c.o �
-  :objects:sysintf.c.o :objects:parse.c.o :objects:getinp.c.o :objects:quit.c.o �
-  :objects:state.c.o :objects:dmdump.c.o :objects:macparse.c.o :objects:rulparse.c.o �
-  :objects:percent.c.o :objects:function.c.o :objects:arlib.c.o :objects:bogus.c.o �
-  :objects:dirbrk.c.o :objects:directry.c.o :objects:environ.c.o :objects:main.c.o �
-  :objects:rmprq.c.o :objects:ruletab.c.o :objects:tempnam.c.o :objects:tomacfil.c.o �
-  "{SharedLibraries}StdCLib" �
-  "{SharedLibraries}InterfaceLib" �
-  "{PPCLibraries}StdCRuntime.o" �
-  "{PPCLibraries}PPCCRuntime.o" �
-  "{PPCLibraries}PPCToolLibs.o"
-if ( `Exists -f :startup:config.mk` )
-  SetFile -a l :startup:config.mk
-end
-Duplicate -y :mac:template.mk :startup:config.mk
diff --git a/dmake/mac/make_mac.sh b/dmake/mac/make_mac.sh
deleted file mode 100644
index 9e6c4cc54949..000000000000
--- a/dmake/mac/make_mac.sh
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# $Id: make_mac.sh,v 1.1.1.1 2000-09-22 15:33:26 hr Exp $
-#
-# This MPW script builds the dmake executable using the Metroworks PPC compiler
-# and linker. The resulting dmake binary will only run on the PPC platform.
-#
-# To execute this script, you will need the following tools:
-# - MacOS 8 or later
-# - CodeWarrior for MacOS Release 5 or later
-#
-# To run this script, you need to open the MPW Shell that is bundled with CodeWarrior.
-# If you have another instance of MPW installed other than the one bundled with
-# CodeWarrior, you may encounter problems. Once you open the MPW Shell that is bundled
-# with CodeWarrior, you will need to set MPW's working directory to the "dmake"
-# directory (the directory above the directory that this script is in). Then, execute
-# this script from the MPW Worksheet by typing the following command:
-#
-#   :mac:make_mac.sh
-#
-set Exit 1
-if ( "{0}" != ':mac:make_mac.sh' )
-  Echo "You cannot run this script from the current directory."
-  Echo "To run this script, you need to be in the �"dmake�" directory and then"
-  Echo "execute the following command: �":mac:make_mac.sh�""
-  Exit
-end
-if ( ! `Exists -d objects` )
-  NewFolder objects
-end
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle infer.c
-Move -y infer.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle make.c
-Move -y make.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle stat.c
-Move -y stat.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle expand.c
-Move -y expand.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle dmstring.c
-Move -y dmstring.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle hash.c
-Move -y hash.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle dag.c
-Move -y dag.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle dmake.c
-Move -y dmake.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle path.c
-Move -y path.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle imacs.c
-Move -y imacs.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle sysintf.c
-Move -y sysintf.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle parse.c
-Move -y parse.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle getinp.c
-Move -y getinp.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle quit.c
-Move -y quit.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle state.c
-Move -y state.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle dmdump.c
-Move -y dmdump.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle macparse.c
-Move -y macparse.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle rulparse.c
-Move -y rulparse.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle percent.c
-Move -y percent.c.o objects
-# Note that function.c needs to have __useAppleExts__ defined. Otherwise, it won't link.
-MWCPPC -o : -ansi off -I :mac -d _MPW -d __useAppleExts__ -sym off -proto ignoreoldstyle function.c
-Move -y function.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:arlib.c
-Move -y arlib.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:bogus.c
-Move -y bogus.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:dirbrk.c
-Move -y dirbrk.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:directry.c
-Move -y directry.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:environ.c
-Move -y environ.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:main.c
-Move -y main.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:rmprq.c
-Move -y rmprq.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:ruletab.c
-Move -y ruletab.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:tempnam.c
-Move -y tempnam.c.o objects
-MWCPPC -o : -ansi off -I :mac -d _MPW -sym off -proto ignoreoldstyle :mac:tomacfil.c
-Move -y tomacfil.c.o objects
-MWLinkPPC -w -c 'MPS ' -t MPST -sym off -xm m -o dmake :objects:infer.c.o :objects:make.c.o �
-  :objects:stat.c.o :objects:expand.c.o :objects:dmstring.c.o :objects:hash.c.o �
-  :objects:dag.c.o :objects:dmake.c.o :objects:path.c.o :objects:imacs.c.o �
-  :objects:sysintf.c.o :objects:parse.c.o :objects:getinp.c.o :objects:quit.c.o �
-  :objects:state.c.o :objects:dmdump.c.o :objects:macparse.c.o :objects:rulparse.c.o �
-  :objects:percent.c.o :objects:function.c.o :objects:arlib.c.o :objects:bogus.c.o �
-  :objects:dirbrk.c.o :objects:directry.c.o :objects:environ.c.o :objects:main.c.o �
-  :objects:rmprq.c.o :objects:ruletab.c.o :objects:tempnam.c.o :objects:tomacfil.c.o �
-  "{SharedLibraries}StdCLib" �
-  "{SharedLibraries}InterfaceLib" �
-  "{PPCLibraries}StdCRuntime.o" �
-  "{PPCLibraries}PPCCRuntime.o" �
-  "{PPCLibraries}PPCToolLibs.o"
-SetFile -a l :startup:config.mk
-Duplicate -y :mac:template.mk :startup:config.mk
diff --git a/dmake/mac/public.h b/dmake/mac/public.h
deleted file mode 100644
index 9404c0e4d40c..000000000000
--- a/dmake/mac/public.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:42:19 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char*, char*));
-int touch_arch ANSI((char*, char*));
-//void tzset () {}/PUBLIC int putenv (char *pEnvString) {return (0); }/ ANSI(());
-void tzset ANSI(());
-int Wait_for_child ANSI((int ,int ));
-void Clean_up_processes ANSI(());
-int If_root_path ANSI((char *));
-int stat ANSI((char *, struct stat *));
-char *getcwd ANSI((char *,size_t ));
-int chdir ANSI((char *));
-int utime ANSI((char *,time_t *));
-void make_env ANSI(());
-void free_env ANSI(());
-void Remove_prq ANSI((CELLPTR));
-char *tempnam ANSI((char *,char *));
-
-#endif
diff --git a/dmake/mac/rmprq.c b/dmake/mac/rmprq.c
deleted file mode 100644
index 424b9a060009..000000000000
--- a/dmake/mac/rmprq.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* RCS  $Id: rmprq.c,v 1.1.1.1 2000-09-22 15:33:27 hr Exp $
---
--- SYNOPSIS
---      Remove prerequisites code.
---
--- DESCRIPTION
---  This code is different for The Mac and for UNIX and parallel make
---  architectures since the parallel case requires the rm's to be
---  run in parallel, whereas The Mac guarantees to run them sequentially.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-PUBLIC void
-Remove_prq( tcp )
-CELLPTR tcp;
-{
-   tcp->ce_flag &= ~(F_MADE|F_VISITED);
-   tcp->ce_time  = 0L;
-
-   Make( tcp, tcp );
-}
diff --git a/dmake/mac/ruletab.c b/dmake/mac/ruletab.c
deleted file mode 100644
index 520e2089201e..000000000000
--- a/dmake/mac/ruletab.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* RCS  $Id: ruletab.c,v 1.2 2006-04-20 12:05:16 hr Exp $
---
--- SYNOPSIS
---      Default initial configuration of dmake.
---
--- DESCRIPTION
---  Define here the initial set of rules that are defined before
---  dmake performs any processing.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* These are control macros for dmake that MUST be defined at some point
- * if they are NOT dmake will not work!  These are default definitions.  They
- * may be overridden inside the .STARTUP makefile, they are here
- * strictly so that dmake can parse the STARTUP makefile */
-
-static char *_rules[] = {
-    "MAXLINELENGTH := 4094",
-    "MAXPROCESSLIMIT := 1",
-    "MAXPROCESS := 1",
-    ".IMPORT .IGNORE: DMAKEROOT",
-    ".MAKEFILES : makefile.mk Makefile makefile",
-    ".SOURCE    : .NULL",
-#include "startup.h"
-    0 };
-
-char **Rule_tab = _rules; /* for sundry reasons in Get_environment() */
-
diff --git a/dmake/mac/startup.h b/dmake/mac/startup.h
deleted file mode 100644
index f4d18a5d6506..000000000000
--- a/dmake/mac/startup.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* RCS  $Id: startup.h,v 1.1.1.1 2000-09-22 15:33:27 hr Exp $
---
--- SYNOPSIS
---      Default value of MAKESTARTUP.
---
--- DESCRIPTION
---      Default value is used if the environment variable is not
---      defined.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-"MAKESTARTUP := $(DMAKEROOT):startup.mk",
-
diff --git a/dmake/mac/sysintf.h b/dmake/mac/sysintf.h
deleted file mode 100644
index 717b968041b1..000000000000
--- a/dmake/mac/sysintf.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* RCS  $Id: sysintf.h,v 1.2 2007-01-18 09:33:25 vg Exp $
---
--- SYNOPSIS
---      Assorted bits of system interface
---
--- DESCRIPTION
---      This file is used to abstract away some of the functions in
---      sysintf.c.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-#define DMSTAT stat
-#define VOID_LCACHE(l,m)
-#define Hook_std_writes(A)
-#define GETPID 1
-
-/* for directory cache */
-#define CacheStat(A,B)  really_dostat(A,&buf)
-
-/*
-** standard C items
-*/
-
-/*
-** Mac interface standard items
-*/
-#define getswitchar()   '-'
diff --git a/dmake/mac/template.mk b/dmake/mac/template.mk
deleted file mode 100644
index 0cf10289c826..000000000000
--- a/dmake/mac/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= mac
-   OSRELEASE     *:= 
-   OSENVIRONMENT *:= 
diff --git a/dmake/mac/tempnam.c b/dmake/mac/tempnam.c
deleted file mode 100644
index ee86ccb6a0a2..000000000000
--- a/dmake/mac/tempnam.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* RCS  $Id: tempnam.c,v 1.1.1.1 2000-09-22 15:33:27 hr Exp $
---
--- SYNOPSIS
---      Fake tempnam function for the mac
---
--- DESCRIPTION
---  Get a temporary file name.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-
-#include "extern.h"
-#include <StdIO.h>
-#include <String.h>
-
-
-
-/*
- * Try to open a temporary file in the given directory (if non-NULL)
- * with the given prefix (if non-NULL).
- *
- * We ignore the directory argument.
- */
-PUBLIC char *
-tempnam(char *pDir, char * pPrefix)
-{
-    char *pName;
-    char *pFullName;
-
-    pName = tmpnam ((char *) NULL);
-
-    /* Assume that if the name returned by tmpnam is not being used,
-       the name with the prefix is also not being used. */
-    pFullName = MALLOC (((pPrefix != NULL) ? strlen (pPrefix) : 0) +
-                        strlen (pName) + 1, char);
-
-    /* Copy in the name if we successfully allocated space for it. */
-    if (pFullName != NULL) {
-        if (pPrefix != NULL) {
-            strcpy (pFullName, pPrefix);
-        } else {
-            *pFullName = '\0';
-        } /* if ... else */
-
-        strcat (pFullName, pName);
-    } /* if */
-
-    return (pFullName);
-} /* PUBLIC char *tempnam () */
diff --git a/dmake/mac/tomacfil.c b/dmake/mac/tomacfil.c
deleted file mode 100644
index d5f1ea72a496..000000000000
--- a/dmake/mac/tomacfil.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* RCS  $Id: tomacfil.c,v 1.1.1.1 2000-09-22 15:33:27 hr Exp $
---
--- SYNOPSIS
---      Routines to change unix file names to mac file names
---
--- DESCRIPTION
---  Dmake sometimes assumes that files have '/' as a directory parameter in some makefiles.
---  This works, even on DOS, but not on the Mac.  In fact, on the Mac, you can't even do a
---  a simple switch of ':' for '/' because all other the Mac has decided to reverse the use
---  of a first-character directory delimiter to mean a relative path rather than absolute path.
---  (i.e., ':test:b' means directory test is relative to the current directory, rather than
---  a top-level directory.  Thus, this file attempts to do the directory conversion behind
---  the back of the rest of the program.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* This file no longer contains an override to the fopen() function as we now accept only
- * Mac style path names
- */
-#include <Files.h>
-
-#include "extern.h"
diff --git a/dmake/make.c b/dmake/make.c
index 67af0653d35f..2f9a9b1b6022 100644
--- a/dmake/make.c
+++ b/dmake/make.c
@@ -1044,6 +1044,7 @@ char *pat;
       cmp1 = DmStrPbrk(pfx,DirBrkStr);
       result = DmStrJoin(result,up,-1,TRUE);
    }
+   FREE(up);
 
    pat = DmStrSpn(pat,DirBrkStr);
    /* Append pat to result. */
@@ -1254,7 +1255,7 @@ Exec_commands( cp )/*
 
   The function returns 0, if the command is executed and has successfully
   returned, and it returns 1 if the command is executing but has not yet
-  returned or -1 if an error occured (Return value from Do_cmnd()).
+  returned or -1 if an error occurred (Return value from Do_cmnd()).
 
   Macros that are found in recipe lines are expanded in this function, in
   parallel builds this can mean they are expanded before the previous recipe
@@ -1519,7 +1520,6 @@ char *name;
 int  ignore;
 {
    STRINGPTR   new_dir;
-   int         freedir=FALSE;
 
    DB_ENTER( "Push_dir" );
 
@@ -1527,12 +1527,9 @@ int  ignore;
    if( *dir == '\'' && dir[strlen(dir)-1] == '\'' ) {
       dir = DmStrDup(dir+1);
       dir[strlen(dir)-1]='\0';
-      freedir=TRUE;
    }
-   else if (strchr(dir,'$') != NIL(char)) {
+   else if (strchr(dir,'$') != NIL(char))
       dir = Expand(dir);
-      freedir=TRUE;
-   }
    else
       dir = DmStrDup(dir);
 
@@ -1540,7 +1537,7 @@ int  ignore;
       if( !ignore )
          Fatal( "Unable to change to directory `%s', target is [%s]",
             dir, name );
-      if (freedir) FREE(dir);
+      FREE(dir);
       DB_RETURN( 0 );
    }
 
@@ -1548,7 +1545,7 @@ int  ignore;
    if( Verbose & V_DIR_SET )
       printf( "%s:  Changed to directory [%s]\n", Pname, dir  );
 
-   if (freedir) FREE( dir );
+   FREE( dir );
    TALLOC( new_dir, 1, STRING );
    new_dir->st_next   = dir_stack;
    dir_stack          = new_dir;
diff --git a/dmake/path.c b/dmake/path.c
index ead163394175..d50b7593eec1 100644
--- a/dmake/path.c
+++ b/dmake/path.c
@@ -181,7 +181,7 @@ char *path;
 
 #ifdef HAVE_DRIVE_LETTERS
 
-   /* Change all occurences from DirBrkStr to *DirSepStr. This assumes
+   /* Change all occurrences from DirBrkStr to *DirSepStr. This assumes
     * that when HAVE_DRIVE_LETTERS is set the directory separator is
     * either '\' or '/'. */
    if (*DirSepStr == '/')
diff --git a/dmake/quit.c b/dmake/quit.c
index 54043093de24..68ade197fd24 100644
--- a/dmake/quit.c
+++ b/dmake/quit.c
@@ -37,6 +37,8 @@ Quit( sig )/*
 ======== Error or quit */
 int sig;
 {
+   int ret = ERROR_ABORT_VALUE;
+
    if( sig == SIGINT )
       fprintf(stderr, "Caught SIGINT. Trying to quit ...\n");
    else
@@ -48,7 +50,7 @@ int sig;
 #endif
    if( sig == 0 )
       /* Don't be verbose during regular program termination. */
-      ;
+      ret = ERROR_EXIT_VALUE;
    else
       fprintf(stderr, "Caught signal %d. Trying to quit ...\n", sig);
 
@@ -78,7 +80,7 @@ int sig;
    if( _quitting == 0 ) _handle_quit( ".ERROR" );
 
    Set_dir( Makedir );      /* No Error message if we can't do it */
-   Epilog( ERROR_EXIT_VALUE );
+   Epilog( ret );
 }
 
 
diff --git a/dmake/rulparse.c b/dmake/rulparse.c
index f47f166ef7ae..b5cb72e65f77 100644
--- a/dmake/rulparse.c
+++ b/dmake/rulparse.c
@@ -451,12 +451,6 @@ int flag;
       DB_PRINT( "par", ("Binding to %s, %04x", tg->CE_NAME, tg->ce_flag) );
       magic = tg->ce_flag & F_PERCENT;
 
-#if 0
-      /* Check to see if we had a rule of the form '%.o : a.h b.h ; xxx'
-       * In which case we must build a NULL prq node to hold the recipe */
-      if( _sv_globprq_only && (_sv_rules != NIL(STRING)) )
-     _build_graph( _sv_op, tg, NIL(CELL) );
-#endif
 
       /* NOTE:  For targets that are magic or special we ignore any
        * previously defined rules, ie. We throw away the old definition
@@ -1199,7 +1193,7 @@ CELLPTR prereq;
     * definitions for the %-target members are stored in the prerequisites
     * list of the master target. */
    /* This relies on target->ce_prq being NULL if this is the first
-    * occurence of this %-target and therefore not yet having a %-target
+    * occurrence of this %-target and therefore not yet having a %-target
     * master. */
    match = FALSE;
    for(edl=target->ce_prq; !match && edl != NIL(LINK); edl=edl->cl_next) {
diff --git a/dmake/startup/mac/macros.mk b/dmake/startup/mac/macros.mk
deleted file mode 100644
index ca161a8baa5c..000000000000
--- a/dmake/startup/mac/macros.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# Define MPW MAC specific macros.
-# Assumes CodeWarrior for Mac 5.0 C, change as needed.
-#
-
-A            *:= .lib
-S	         *:= .s
-V            *:= v
-TMPDIR       *:= $(TempFolder)
-
-# import library definitions
-.IMPORT .IGNORE : CLibraries Libraries
-
-# Set arguments for the SHELL.  Since we can't execute sub-processes,
-# these variables are not important, except for some makefiles that check
-# for some values to determine the platform.
-SHELL       *:= "{MPW}MPW Shell"
-SHELLFLAGS  *:=
-GROUPFLAGS  *:=
-SHELLMETAS  *:=
-
-# Define toolkit macros
-CC          *:= MWCPPC
-AS          *:= PPCAsm
-LD          *:= MWLinkPPC
-AR          *:=
-ARFLAGS     *:=
-RM          *:= delete
-RMFLAGS     *:= 
-MV          *:= rename
-YTAB        *:=
-LEXYY       *:=
-
-LDLIBS      *=  "{SharedLibraries}StdCLib" "{SharedLibraries}InterfaceLib" \
-                "{PPCLibraries}StdCRuntime.o" "{PPCLibraries}PPCCRuntime.o" \
-                "{Libraries}MathLib.o" "{PPCLibraries}PPCToolLibs.o"
-
-# Disable the print command
-PRINT       *=
-
-# Make certain to disable defining how to make executables.
-__.EXECS !:=
diff --git a/dmake/sysintf.c b/dmake/sysintf.c
index 65104114923f..c8cf756b19b9 100644
--- a/dmake/sysintf.c
+++ b/dmake/sysintf.c
@@ -278,7 +278,7 @@ int     last;   /* Last recipe line in target. */
       DB_RETURN( 0 );
    }
 
-   /* Stop making the rest of the recipies for this target if an error occured
+   /* Stop making the rest of the recipies for this target if an error occurred
     * but the Continue (-k) flag is set to build as much as possible. */
    if ( target->ce_attr & A_ERROR ) {
       if ( last ) {
diff --git a/dmake/unix/runargv.c b/dmake/unix/runargv.c
index e8e39d21bd3d..42b9c25e66a9 100644
--- a/dmake/unix/runargv.c
+++ b/dmake/unix/runargv.c
@@ -438,7 +438,8 @@ private_strerror (errnum)
      int errnum;
 {
 #ifndef __APPLE__
-# if defined(arm32) || defined(linux) || defined(__FreeBSD__) || defined(__OpenBSD__)
+# if defined(arm32) || defined(linux) || defined(__FreeBSD__) || \
+     defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
   extern  const char * const sys_errlist[];
 # else
   extern  char *sys_errlist[];
diff --git a/dmake/win95/dchdir.c b/dmake/win95/dchdir.c
index dab1d7163ede..6a77d45b69fe 100644
--- a/dmake/win95/dchdir.c
+++ b/dmake/win95/dchdir.c
@@ -23,9 +23,6 @@
 --      Use cvs log to obtain detailed change logs.
 */
 
-#if 0
-#include <dir.h>
-#endif
 #include <direct.h>
 #include "extern.h"
 
diff --git a/download b/download
new file mode 100755
index 000000000000..86a02efb30e1
--- /dev/null
+++ b/download
@@ -0,0 +1,314 @@
+#!/bin/sh
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# environment setup yet?
+if [ -z "$TARFILE_LOCATION" ]; then
+    . ./*Env.Set.sh
+fi
+
+# we want to clone if we are in the bootstrap git repo and clone does not exist yet
+# we need to test for a .git in order not to clone after rsync if we are called in
+# the inner autogen of the buid-repo based build
+
+check_file()
+{
+    echo "Looking for $1 ..."
+    if test -f $1; then
+	    echo "ok"
+    else
+	    echo "missing required archive; run './download' again";
+	    exit 1;
+    fi
+}
+
+if [ -d .git ] ; then
+    if [ -z "$GIT_LINK_SRC" ]; then
+        ./g -f clone
+    else
+        # space-saving clone from another local workdir
+        mkdir clone
+        for i in $GIT_REPO_NAMES ; do
+            bin/git-new-workdir $GIT_LINK_SRC/$i clone/$i
+            for i in clone/$i/* ; do
+                ln -sf $i $(basename $i)
+            done
+        done
+    fi
+fi
+
+if [ ! -d "$TARFILE_LOCATION" ]; then
+    mkdir $TARFILE_LOCATION
+fi
+if [ ! -d "$TARFILE_LOCATION" ]; then
+    echo "Error: Cannot create $TARFILE_LOCATION."
+    exit 1
+fi
+
+FILELIST="$1"
+if [ -z "$FILELIST" ]; then
+    echo "No filelist provided, using the default ooo.lst."
+    FILELIST="ooo.lst"
+fi
+
+# check for wget and md5sum
+wget=
+md5sum=
+curl=`which curl 2>/dev/null`
+
+for i in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/wget /opt/local/bin/wget; do
+    eval "$i --version" > /dev/null 2>&1
+    ret=$?
+    if [ $ret -eq 0 ]; then
+        wget=$i
+        break
+    fi
+done
+
+if [ -z "$wget" -a -z "$curl" ]; then
+    echo "ERROR: neither  wget nor curl found!"
+    exit 1
+fi
+
+for i in md5 md5sum /usr/local/bin/md5sum gmd5sum /usr/sfw/bin/md5sum /opt/sfw/bin/gmd5sum /opt/local/bin/md5sum; do
+    if [ "$i" = "md5" ]; then
+        eval "$i -x" > /dev/null 2>&1
+    else
+        eval "$i --version" > /dev/null 2>&1
+    fi
+    ret=$?
+    if [ $ret -eq 0 ]; then
+        md5sum=$i
+        break
+    fi
+done
+
+if [ "$md5sum" = "md5" ]; then
+    if md5 -r < /dev/null > /dev/null 2>/dev/null; then
+        md5special=-r
+    elif md5 -n < /dev/null > /dev/null 2>/dev/null; then
+        md5special=-n
+    fi
+fi
+
+if [ -z "$md5sum" ]; then
+    echo "Warning: no md5sum: found!"
+fi
+
+start_dir=`pwd`
+logfile=$TARFILE_LOCATION/fetch.log
+date >> $logfile
+
+downloaditem()
+{
+    if [ "$1" != "" ]; then
+        if [ ! -f "../$2" ]; then
+            echo $2
+            if [ ! -z "$wget" ]; then
+                $wget --progress=dot:mega -N $1/$2 2>&1 | tee -a $logfile
+            else
+                echo fetching $2
+                $curl $file_date_check -O $1/$2 2>&1 | tee -a $logfile
+            fi
+            wret=$?
+            if [ $wret -ne 0 ]; then
+                mv $2 ${i}_broken
+                failed="$failed $2"
+                wret=0
+            fi
+            if [ -f $2 -a -n "$3" -a -n "$md5sum" ]; then
+                sum=`$md5sum $md5special $2 | sed "s/ .*//"`
+                if [ "$sum" != "$3" ]; then
+                    echo checksum failure for $2 2>&1 | tee -a $logfile
+                    failed="$failed $2"
+                    mv $2 ${i}_broken
+                else
+                    mv $2 ..
+                fi
+            else
+                mv $2 ..
+            fi
+        fi
+    fi
+}
+
+filelist=`cat $FILELIST`
+mkdir -p $TARFILE_LOCATION/tmp
+cd $TARFILE_LOCATION/tmp
+echo $$ > fetch-running
+for i in $filelist ; do
+#    echo $i
+    if [ "$i" != `echo $i | sed "s/^http:\///"` ]; then
+        tarurl=$i
+    # TODO: check for comment    
+    else
+        if [ "$tarurl" != "" ]; then
+            sum=`echo $i | sed "s/-.*//"`
+            downloaditem $tarurl $i $sum
+        fi
+    fi
+done
+
+if [ "$COM" = "MSC" ]; then
+    downloaditem "http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.1/W9XNT4/EN-US/" "dbghinst.EXE" "096f1d53d9ba09cde27d6f7c2ea6cc47"
+    downloaditem "http://download.microsoft.com/download/a/b/c/abc45517-97a0-4cee-a362-1957be2f24e1/" "WindowsXP-KB975337-x86-ENU.exe" "946d00d87e4094f3a6e425e2d538eadd"
+
+    msvcver=`$SRC_ROOT/oowintool --msvc-ver`
+    case "$msvcver" in
+        9.0)
+          downloaditem "http://download.microsoft.com/download/9/7/7/977B481A-7BA6-4E30-AC40-ED51EB2028F2/" "vcredist_x86.exe" "fd30acc7a696c32f661b33668e73bf7b"
+          downloaditem "http://download.microsoft.com/download/d/2/4/d242c3fb-da5a-4542-ad66-f9661d0a8d19/" "vcredist_x64.exe" "a31dc1a74f1dee5caf63aec8ebb5fe20"
+        ;;
+    *)
+        ;;
+    esac
+
+fi
+
+if [ -f $start_dir/bootstrap.ver -a ! -d $start_dir/.git ] ; then
+    # bootstrap is from sources, so get the other source tarballs
+    . $start_dir/bootstrap.ver
+    lo_src_dir="$start_dir/src"
+    mkdir -p "$lo_src_dir"
+    for piece in `cat $start_dir/bin/repo-list` ; do
+        tarname="libreoffice-$piece-$lo_bootstrap_ver"
+        if [ ! -f "$TARFILE_LOCATION/$tarname.tar.bz2" ] ; then
+	    downloaditem "http://download.documentfoundation.org/libreoffice/src/" "$tarname.tar.bz2" ""
+	fi
+	if [ ! -d $lo_src_dir/$tarname ] ; then
+	    echo "Unpacking $tarname.tar.bz2..."
+	    tar -xf "$TARFILE_LOCATION/$tarname.tar.bz2" -C "$lo_src_dir"
+	fi
+	# create symlinks
+	for dir in `find "$lo_src_dir/$tarname" -mindepth 1 -maxdepth 1 -type d` ; do
+	    ln -sf "$dir" "$start_dir"
+	done
+    done
+fi
+
+rm $TARFILE_LOCATION/tmp/*-*
+cd $start_dir
+
+if [ ! -z "$failed" ]; then
+    echo
+    echo ERROR: failed on:
+    for i in $failed ; do
+        echo $i
+    done
+    exit 1
+fi
+
+if [ "$COM" = "MSC" -a -n "$md5sum" ]; then
+    # This can be run only on Windows itself (Cygwin)
+    TMPUNPACK=`cygpath -d $TARFILE_LOCATION/tmp`
+    chmod a+w $TARFILE_LOCATION/tmp
+    if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/dbghinst.EXE ]; then
+	if [ ! -x $TARFILE_LOCATION/dbghinst.EXE ]; then
+	    chmod +x $TARFILE_LOCATION/dbghinst.EXE
+	fi
+        $TARFILE_LOCATION/dbghinst.EXE /T:$TMPUNPACK /C
+        sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/dbghelp.exe | sed "s/ .*//"`
+        if [ "$sum" = "cd3086a91e37965dd761ef5fd5df5b15" ]; then
+            unzip -LL -j -o -d ./external/dbghelp $TARFILE_LOCATION/tmp/dbghelp.exe
+        fi
+    fi
+    if [ ! -f ./external/gdiplus/gdiplus.dll -a -f $TARFILE_LOCATION/WindowsXP-KB975337-x86-ENU.exe ]; then
+	gdiplus_dll_path=asms/10/msft/windows/gdiplus/gdiplus.dll
+
+	# Run it through cmd so that the UAC prompt is displayed
+	echo
+	echo "NOTE: We are running the Microsoft KB975337 security fix installer"
+	echo "to get gdiplus.dll. You will most probably get a UAC prompt now."
+	echo "If you trust us, just enter your administrator password."
+	echo "The security fix is run with the /extract switch to just unpack"
+	echo "its files."
+	echo "If you don't trust us, just get gdiplus.dll yourself and put it"
+	echo "in external/gdiplus/gdiplus.dll."
+	echo "gdiplus.dll is included in the LibreOffice installer for the benefit of"
+	echo "Windows 2000 users."
+	# A few empty lines so that the above is visible even if the taskbar's auto-hide is turned on,
+	# and the UAC prompt caused it to taise (with a blinking icon for the UAC prompt)
+	echo
+	echo
+	echo
+        cmd /c "`cygpath -d $TARFILE_LOCATION/WindowsXP-KB975337-x86-ENU.exe` /extract:$TMPUNPACK /q"
+	if [ -f $TARFILE_LOCATION/tmp/$gdiplus_dll_path ]; then
+	    echo "Extraction succeeded"
+	    sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/$gdiplus_dll_path | sed "s/ .*//"`
+	    if [ "$sum" = "4721ab485e0c29cd1617a5f296b9cc47" ]; then
+		cp $TARFILE_LOCATION/tmp/$gdiplus_dll_path ./external/gdiplus/gdiplus.dll
+	    else
+		echo "But unexpected checksum of $gdiplus_dll_path"
+	    fi
+	else
+	    echo "WindowsXP-KB975337-x86-ENU.exe did not unpack the expected $gdiplus_dll_path"
+        fi
+    fi
+    if [ ! -f ./external/vcredist/vcredist_x86.exe -a -f $TARFILE_LOCATION/vcredist_x86.exe ]; then
+        cp $TARFILE_LOCATION/vcredist_x86.exe ./external/vcredist/vcredist_x86.exe
+    fi
+    if [ ! -f ./external/vcredist/vcredist_x64.exe -a -f $TARFILE_LOCATION/vcredist_x64.exe ]; then
+        cp $TARFILE_LOCATION/vcredist_x64.exe ./external/vcredist/vcredist_x64.exe
+    fi
+fi
+
+# OxygenOffice extras
+for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLATES_PACK ; do
+    check_file $TARFILE_LOCATION/$pack
+    echo "Unpacking OxygenOffice extra '$pack' ..."
+    unzip -o -q $TARFILE_LOCATION/$pack -d $SRC_ROOT/extras/source
+done
+
+# Extensions copy
+for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK $OOOBLOGGER_EXTENSION_PACK $LIGHTPROOF_HU_PACK $LIGHTPROOF_EN_US_PACK $SUNTEMPLATES_DE_PACK $SUNTEMPLATES_EN_US_PACK $SUNTEMPLATES_ES_PACK $SUNTEMPLATES_FR_PACK $SUNTEMPLATES_HU_PACK $SUNTEMPLATES_IT_PACK; do
+    check_file $TARFILE_LOCATION/$pack
+    packfilename=`echo "$pack" | cut -f 2- -s -d - | cut -f 1 -d _`
+    echo "Copy extension: '$pack' as '$packfilename.oxt' ..."
+    mkdir -p $SRC_ROOT/extras/source/extensions/ || exit 1
+    cp $TARFILE_LOCATION/$pack $SRC_ROOT/extras/source/extensions/$packfilename.oxt || exit 1
+done
+
+[ -x "post_download" ] || { echo "'post_download' script not found, run ./autogen.sh." ; exit 1 ; }
+
+# Save the config.log from the main configure script
+# and restore it after running post_download.
+mv config.log config.log.save
+
+./post_download --build=$BUILD_PLATFORM --host=$HOST_PLATFORM
+post_download_status=$?
+
+test -f config.log && mv config.log post_download.log
+mv config.log.save config.log
+
+exit $post_download_status
+
+# Local Variables:
+# tab-width: 4
+# indent-tabs-mode: nil
+# End:
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/fetch_tarballs.sh b/fetch_tarballs.sh
deleted file mode 100755
index e08b553f8171..000000000000
--- a/fetch_tarballs.sh
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/bin/sh
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-if [ -z "$TARFILE_LOCATION" ]; then
-    echo "ERROR: no destination defined! please set TARFILE_LOCATION!"
-    exit
-fi
-
-if [ ! -d "$TARFILE_LOCATION" ]; then
-    mkdir $TARFILE_LOCATION
-fi
-if [ ! -d "$TARFILE_LOCATION" ]; then
-    echo "ERROR: can't create"
-    exit
-fi
-
-if [ -z "$1" ]; then
-    echo "ERROR: parameter missing!"
-    echo "usage: $0 <fetch list>"
-    echo "first line must define the base url."
-    exit
-fi
-
-# check for wget and md5sum
-wget=
-md5sum=
-curl=
-
-for i in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/wget /opt/local/bin/wget; do
-    eval "$i --version" > /dev/null 2>&1
-    ret=$?
-    if [ $ret -eq 0 ]; then
-        wget=$i
-        echo found wget: $wget
-        break 2
-    fi
-done
-
-if [ -z "$wget" ]; then
-    for i in curl /usr/bin/curl /usr/local/bin/curl /usr/sfw/bin/curl /opt/sfw/bin/curl /opt/local/bin/curl; do
-    # mac curl returns "2" on --version
-    #    eval "$i --version" > /dev/null 2>&1
-    #    ret=$?
-    #    if [ $ret -eq 0 ]; then
-        if [ -x $i ]; then
-            curl=$i
-            echo found curl: $curl
-            break 2
-        fi
-    done
-fi
-
-if [ -z "$wget" -a -z "$curl" ]; then
-    echo "ERROR: neither  wget nor curl found!"
-    exit
-fi
-
-for i in md5 md5sum /usr/local/bin/md5sum gmd5sum /usr/sfw/bin/md5sum /opt/sfw/bin/gmd5sum /opt/local/bin/md5sum; do
-    if [ "$i" = "md5" ]; then
-        eval "$i -x" > /dev/null 2>&1
-    else
-        eval "$i --version" > /dev/null 2>&1
-    fi
-    ret=$?
-    if [ $ret -eq 0 ]; then
-        md5sum=$i
-        echo found md5sum: $md5sum
-        break 2
-    fi
-done
-
-if [ "$md5sum" = "md5" ]; then
-    md5special=-r
-fi
-
-if [ -z "$md5sum" ]; then
-    echo "Warning: no md5sum: found!"
-fi
-
-start_dir=`pwd`
-logfile=$TARFILE_LOCATION/fetch.log
-date >> $logfile
-
-filelist=`cat $1`
-mkdir -p $TARFILE_LOCATION/tmp
-cd $TARFILE_LOCATION/tmp
-echo $$ > fetch-running
-for i in $filelist ; do
-#    echo $i
-    if [ "$i" != `echo $i | sed "s/^http:\///"` ]; then
-        tarurl=$i
-    # TODO: check for comment
-    else
-        if [ "$tarurl" != "" ]; then
-            if [ ! -f "../$i" ]; then
-                echo $i
-                if [ ! -z "$wget" ]; then
-                    $wget -nv -N $tarurl/$i 2>&1 | tee -a $logfile
-                else
-                    echo fetching $i
-                    $curl $file_date_check -O $tarurl/$i 2>&1 | tee -a $logfile
-                fi
-                wret=$?
-                if [ $wret -ne 0 ]; then
-                    mv $i ${i}_broken
-                    failed="$failed $i"
-                    wret=0
-                fi
-                if [ -f $i -a -n "$md5sum" ]; then
-                    sum=`$md5sum $md5special $i | sed "s/ .*//"`
-                    sum2=`echo $i | sed "s/-.*//"`
-                    if [ "$sum" != "$sum2" ]; then
-                        echo checksum failure for $i 2>&1 | tee -a $logfile
-                        failed="$failed $i"
-                        mv $i ${i}_broken
-                    else
-                        mv $i ..
-                    fi
-                else
-                    mv $i ..
-                fi
-            fi
-        fi
-    fi
-done
-rm $TARFILE_LOCATION/tmp/*-*
-cd $start_dir
-
-if [ ! -z "$failed" ]; then
-    echo
-    echo ERROR: failed on:
-    for i in $failed ; do
-        echo $i
-    done
-    exit 1
-fi
-
diff --git a/g b/g
new file mode 100755
index 000000000000..bf6d8871ad85
--- /dev/null
+++ b/g
@@ -0,0 +1,306 @@
+#!/usr/bin/env bash
+#
+# Wrapper for git to handle more subdirs at the same time
+#
+
+# no params, no action
+if [ "$#" -eq "0" ] ; then
+    git
+    echo
+    echo "Additional options available only in this 'g' wrapper:"
+    echo
+    echo "Usage: g [options] [git commands]"
+    echo "   -f         Force - act on all the repos, not only the changed ones"
+    echo "   -s         Silent - do not report the repo names."
+    echo "   -1         report the repos name on the first line of the output as <repo>:"
+    echo "   --set-push-user [username] re-write an existing tree's config with an fd.o commit account name"
+    exit $?
+fi
+
+CLONEDIR=$(perl -e 'use Cwd "abs_path"; print abs_path(shift);' $0 | sed -e ' s/\/g$/\/clone/')
+if [ ! -e ${CLONEDIR} ]; then mkdir -p $CLONEDIR; fi
+RAWBUILDDIR=$(perl -e 'use Cwd "abs_path"; print abs_path(shift);' $0 | sed -e ' s/\/g$//')
+if [ ! -e ${RAWBUILDDIR} ]; then mkdir -p $RAWBUILDDIR; fi
+
+# should we need to update the hooks
+function update_hooks()
+{
+    HOOKDIR="$1"
+    for H in $(cd "$RAWBUILDDIR/git-hooks" ; echo *) ; do
+        HOOK=".git/hooks/$H"
+        if [ ! -x "$HOOK" -a ! -L "$HOOK" ] ; then
+            rm -f "$HOOK"
+            ln -s "$HOOKDIR/$H" "$HOOK"
+        fi
+    done
+    if [ -z "$(git config push.default)" ] ; then
+        git config push.default tracking
+    fi
+    if [ "$PWD" != "$RAWBUILDDIR" -a ! -e .gitattributes ]; then
+        ln -s $RAWBUILDDIR/.gitattributes .
+    fi
+}
+
+# extra params for some commands, like log
+EXTRA=
+COMMAND="$1"
+PAGER=
+RELATIVIZE=1
+PUSH_ALL=
+ALLOW_EMPTY=
+KEEP_GOING=0
+REPORT_REPOS=1
+REPORT_COMPACT=0
+
+while [ "${COMMAND:0:1}" = "-" ] ; do
+    case "$COMMAND" in
+        -f) KEEP_GOING=1
+            ;;
+        -s) REPORT_REPOS=0
+            ;;
+		-1) REPORT_COMPACT=1
+            ;;
+	    --set-push-user)
+	        shift
+	        PUSH_USER="$1"
+	        ;;
+    esac
+    shift
+    COMMAND="$1"
+done
+
+case "$COMMAND" in
+    apply)
+        EXTRA="-p0 --stat --apply --index --ignore-space-change --whitespace=error"
+        RELATIVIZE=0
+        ;;
+    diff)
+        PAGER='--no-pager'
+        REPORT_REPOS=0
+        ;;
+    log)
+        if [ "$#" = "1" ] ; then
+            EXTRA='-1'
+        fi
+        PAGER='--no-pager'
+        ;;
+    push)
+        if [ "$#" != "1" ] ; then
+            PUSH_ALL=1
+        fi
+        ;;
+esac
+
+# absolutize the parameters first
+unset FILES
+FILESNUM=0
+while shift ; do
+    PARAM="$1"
+    if [ -z "$PARAM" ] ; then
+        continue
+    elif [ "${PARAM:0:1}" = "-" ] ; then
+        if [ \( "$COMMAND" = "checkout" -a "$PARAM" = "-b" \) -o \
+             \( "$COMMAND" = "clone"    -a "$PARAM" = "--reference" \) -o \
+             \( "$COMMAND" = "commit"   -a "$PARAM" = "-m" \) -o \
+             \( "$COMMAND" = "commit"   -a "$PARAM" = "-am" \) -o \
+             \( "$COMMAND" = "tag"      -a "$PARAM" = "-m" \) ]
+        then
+            # params that take an argument
+            FILES[$FILESNUM]="$PARAM"
+            FILESNUM=$(($FILESNUM+1))
+            shift
+            FILES[$FILESNUM]="$1"
+            FILESNUM=$(($FILESNUM+1))
+        else
+            if [ "$COMMAND" = "commit" -a "$PARAM" = "-F" ]
+            then
+                shift
+                # this still needs some magic to handle relative paths
+                EXTRA="${EXTRA} -F ${1}"
+            else
+                [ "$COMMAND" = "commit" -a "$PARAM" = "--allow-empty" ] && ALLOW_EMPTY=1
+                FILES[$FILESNUM]="$PARAM"
+                FILESNUM=$(($FILESNUM+1))
+            fi
+        fi
+    else
+        if [ "$COMMAND" = "apply" ] ; then
+            grep -qs $'^+ *\t' "$PARAM" && {
+                echo "Patch '$PARAM' introduces tabs in indentation, aborting."
+                echo
+                echo "Please fix the patch (something like s/^\(+ *\)\t/\1    /) and try again."
+                echo
+                exit 1
+            }
+        fi
+
+        # make the paths absolute
+        FILES[$FILESNUM]=$(perl -e 'use Cwd "abs_path"; print abs_path(shift);' "$PARAM")
+        if [ -z "${FILES[$FILESNUM]}" -o ! -e "${FILES[$FILESNUM]}" ] ; then
+            # it is probably not a file, but a tag name, or something
+            FILES[$FILESNUM]="$PARAM"
+        fi
+        FILESNUM=$(($FILESNUM+1))
+    fi
+done
+
+# do it!
+DIRS="bootstrap $(cd $CLONEDIR ; ls)"
+if [ "$COMMAND" = "clone" ] ; then
+    DIRS=$(cat "$RAWBUILDDIR/bin/repo-list")
+    # update hooks in the main repo too
+    ( cd "$RAWBUILDDIR" ; update_hooks "../../git-hooks" )
+fi
+for REPO in $DIRS ; do
+    DIR="$CLONEDIR/$REPO"
+    NAME="$REPO"
+    HOOKDIR="../../../../git-hooks"
+    if [ "$REPO" = "bootstrap" ] ; then
+        DIR="$RAWBUILDDIR"
+        NAME="main repo"
+        HOOKDIR="../../git-hooks"
+    fi
+
+    if [ -d "$DIR" -a "z$PUSH_USER" != "z" ]; then
+       echo "setting up push url for $DIR"
+	   (cd $DIR && git config remote.origin.pushurl "ssh://${PUSH_USER}@git.freedesktop.org/git/libreoffice/${REPO}")
+    elif [ \( -d "$DIR" -a -d "$DIR"/.git \) -o \( "$COMMAND" = "clone" \) ] ; then
+        (
+            # executed in a subshell
+            if [ "$COMMAND" != "clone" ] ; then
+                cd "$DIR"
+                update_hooks "$HOOKDIR"
+            else
+                cd "$CLONEDIR"
+            fi
+
+            # relativize the absolutized params again if we want to operate
+            # only on the files belonging to this exact repo
+            if [ "$RELATIVIZE" = "1" -a -n "$FILES" ] ; then
+                FILESNUM=0
+                INSERTNUM=0
+                PWD=$(pwd)
+                PWDLEN=$(pwd | wc -c)
+                for I in "${FILES[@]}" ; do
+                    I="${I//@REPO@/${REPO}}"
+                    unset FILES[$FILESNUM]
+                    FILESNUM=$(($FILESNUM+1))
+                    # filter out files that don't belong to this repo
+                    if [ \( "${I:0:1}" = "/" \) -a \( "$COMMAND" != "clone" \) ] ; then
+                        if [ "${I:0:$PWDLEN}" = "$PWD/" ] ; then
+                            FILES[$INSERTNUM]="${I:$PWDLEN}"
+                            INSERTNUM=$(($INSERTNUM+1))
+                        fi
+                    else
+                        FILES[$INSERTNUM]="$I"
+                        INSERTNUM=$(($INSERTNUM+1))
+                    fi
+                done
+                [ "$INSERTNUM" = "0" ] && exit 0
+            fi
+
+            # some extra params
+            case "$COMMAND" in
+                apply)
+                    for I in * ; do
+                        if [ -d "$I" ] ; then
+                            EXTRA="$EXTRA --include=$I/*"
+                        else
+                            EXTRA="$EXTRA --include=$I"
+                        fi
+                    done
+                    ;;
+                commit)
+                    if [ "$ALLOW_EMPTY" != "1" ] ; then
+                        [ -z "$(git diff-index --name-only HEAD --)" ] && exit 0
+                    fi
+                    ;;
+                push)
+                    if [ "$PUSH_ALL" != "1" ] ; then
+                        [ -n "$(git rev-list origin..HEAD)" ] || exit 0
+                    fi
+                    ;;
+                status)
+                    LOCALCOMMITS="$(git rev-list origin..HEAD)"
+                    if [ -z "$LOCALCOMMITS" ] ; then
+                        [ -z "$(git diff-index --name-only HEAD --)" ] && exit 0
+                    fi
+                    ;;
+                clone)
+                    EXTRA="$(git config remote.origin.url)"
+		    EXTRA=${EXTRA/bootstrap/${REPO}}
+                    ;;
+            esac
+
+            # do it!
+            if [ "$COMMAND" != "clone" -o ! -d $DIR ] ; then
+                if [ "$REPORT_REPOS" = "1" -a "$COMMAND" != "grep" ] ; then
+                    if [ "$REPORT_COMPACT" = "1" ] ; then
+                        echo -n "${REPO}:"
+                    else
+                        echo "===== $NAME ====="
+                    fi
+                fi
+                git $PAGER "$COMMAND" $EXTRA "${FILES[@]}"
+                RETURN=$?
+            fi
+
+            # now we can change the dir in case of clone as well
+            if [ "$COMMAND" = "clone" ] ; then
+                cd $DIR
+                update_hooks "$HOOKDIR"
+            fi
+
+            case "$COMMAND" in
+                pull|clone)
+                    # update links
+		    if [ "$DIR" != "$RAWBUILDDIR" ]; then
+			for link in $(ls) ; do
+			    if [ ! -e "$RAWBUILDDIR/$link" ] ; then
+			        if test -h "$RAWBUILDDIR/$link"; then
+				    rm "$RAWBUILDDIR/$link"
+				    echo -n "re-"
+			        fi
+                                echo "creating missing link $link"
+                                ln -s "$DIR/$link" "$RAWBUILDDIR/$link"
+                            fi
+                        done
+		    fi
+                    ;;
+                status)
+                    # git status returns error in some versions, clear that
+                    RETURN=0
+                    ;;
+                grep)
+                    # git grep return an 'error' if nothing is found
+                    # still we should continue grepping the other repos
+                    RETURN=0
+                    ;;
+            esac
+            if [  "$KEEP_GOING" = "1" ] ; then
+                RETURN=0
+            fi
+
+            exit $RETURN
+        ) || exit $?
+    fi
+done
+
+# Cleanup the broken links
+if [ "$COMMAND" = "pull" ] ; then
+    for link in $(ls $RAWBUILDDIR) ; do
+        if [ -h "$RAWBUILDDIR/$link" -a ! -e "$RAWBUILDDIR/$link" ]; then
+            echo "Removing broken link $link"
+            rm $RAWBUILDDIR/$link
+        fi
+    done
+fi
+
+# warn
+if [ "$COMMAND" = "apply" ] ; then
+    echo
+    echo "Don't forget to check the status & commit now ;-)"
+    echo
+fi
+
+# vi:set shiftwidth=4 expandtab:
diff --git a/git-hooks/commit-msg b/git-hooks/commit-msg
new file mode 100755
index 000000000000..d51a33035855
--- /dev/null
+++ b/git-hooks/commit-msg
@@ -0,0 +1,62 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by git-commit with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, make this file executable.
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+abort() {
+    cp $1 $1.save
+    cat >&2 <<EOF
+Commit aborted, your commit message was saved as '$1.save'.
+
+Reason: $2
+
+EOF
+    exit 1
+}
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	abort "$1" "Duplicate Signed-off-by lines."
+}
+
+# Check that the first line exists, and is not an asterisk
+
+if [ -z "`head -n 1 $1 | grep -v '^[ \t]*\*'`" ] ; then
+    abort "$1" "Please provide the general description on the first line."
+fi
+
+# ...and that it is not too long
+
+if [ "`head -n 1 $1 | wc -c`" -gt 79 ] ; then
+    abort "$1" "The first line is too long, please try to fit into 79 characters."
+fi
+
+# ...and that it does not continue on the second line
+if [ "`wc -l < $1`" -gt 1 -a -n "`head -n 2 $1 | tail -n 1 | sed 's/^#.*//'`" ] ; then
+    abort "$1" "The second line is not empty - maybe the first line continues there?"
+fi
+
+# Check that the message is not a ChangeLog-like one
+
+if [ -n "`head -n 1 $1 | grep '^[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}.*<.*@.*>'`" ] ; then
+    abort "$1" "The commit message looks like ChangeLog, please use the git form."
+fi
+
+# Check for whitespace in front of *'s
+
+if [ -n "`grep '^[[:space:]]\+\*.*:' $1`" -a -z "`grep '^\*' $1`" ] ; then
+    abort "$1" "Please don't use whitespace in front of '* file: Description.' entries."
+fi
+
+exit 0
diff --git a/git-hooks/post-merge b/git-hooks/post-merge
new file mode 100755
index 000000000000..25e62ed8a97f
--- /dev/null
+++ b/git-hooks/post-merge
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Do not warn if there were no real merge
+git rev-parse -q --verify HEAD^2 >/dev/null || exit
+
+echo
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+echo "! You probably used 'git pull' instead of 'git pull -r' !"
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+echo
+echo "You can still fix it - please do 'git pull -r' now."
+echo
diff --git a/git-hooks/pre-commit b/git-hooks/pre-commit
new file mode 100755
index 000000000000..f71ad6f98214
--- /dev/null
+++ b/git-hooks/pre-commit
@@ -0,0 +1,236 @@
+#!/usr/bin/env perl
+
+# A hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message
+# if it wants to stop the commit.
+
+use strict;
+use File::Temp qw/ :mktemp  /;
+use File::Copy;
+use Cwd;
+
+$ENV{LC_ALL} = "C";
+
+# attempt to fix whitespace in one file
+# $1 - file to fix
+# $2 - list of lines containing whitespace errors
+sub fix_whitespace($$) {
+    my ( $file, $lines ) = @_;
+
+    open( IN, "$file" ) || die "Cannot open $file for reading";
+    my ( $out, $tmpfile ) = mkstemp( "/tmp/whitespace-fixing-XXXXXX" );
+
+    my $changed = 0;
+    my $line_no = 1;
+    while ( my $line = <IN> ) {
+        if ( $lines->{$line_no} && $line =~ /^(.*[^ \t])[ \t]+$/ ) {
+            $changed = 1;
+            print $out "$1\n";
+        }
+        elsif ( $lines->{$line_no} && $line =~ /^[ \t]+$/ ) {
+            $changed = 1;
+            print $out "\n";
+        }
+        else {
+            print $out $line;
+        }
+        ++$line_no;
+    }
+    close( $out );
+    close( IN );
+
+    if ( $changed )
+    {
+        move( $tmpfile, $file ) or die "Cannot move '$tmpfile' to '$file'";
+
+        system( "git add $file" );
+        print "Fixed whitespace in '$file'\n";
+    }
+}
+
+# go through the patch and collect lines to fix
+sub check_and_fix_whitespace($)
+{
+    my ( $head ) = @_;
+
+    my $file = "";
+    my %lines = ();
+    my $line_no = 0;
+    my $line_max = -1;
+
+    my $stash = "";
+
+    # any not staged changes to stash away?
+    system( "git update-index -q --refresh" );
+    if ( `git diff --name-only --` ) {
+        my $fd;
+        ( $fd, $stash ) = mkstemp( "/tmp/unstaged-changes-XXXXXX" );
+        close( $fd );
+
+        # this will keep the staged changes
+        system( "git diff > $stash" );
+        system( "git checkout ." );
+    }
+    open( FILES, "git diff-index --cached --diff-filter=ACM --name-only $head |" ) || die "Cannot run git diff-index.";
+    while( my $file = <FILES> ) {
+        chomp( $file );
+        if ( $file ne "GNUmakefile" &&
+           ( $file =~ /\.(c|cpp|cxx|h|hrc|hxx|idl|inl|java|map|MK|pl|pm|pmk|py|sdi|sh|src|tab)/ ) ) {
+            open( F, "git diff-index -p --cached $head -- $file |" );
+            while ( my $line = <F> ) {
+                if ( $line =~ /^\+\+\+ (.*)/ ) {
+                    %lines = ();
+                    $line_no = 0;
+                    $line_max = -1;
+                }
+                elsif ( $line =~ /^@@ -[0-9]+,[0-9]+ \+([0-9]+),([0-9]+) @@/ ) {
+                    $line_no = $1;
+                    $line_max = $line_no + $2;
+                }
+                elsif ( ( $line_no < $line_max ) && ( $line =~ /^[ +]/ ) ) {
+                    if ( $line =~ /^\+.*[ \t]$/ ) {
+                        $lines{$line_no} = 1;
+                    }
+                    ++$line_no;
+                }
+            }
+            fix_whitespace( $file, \%lines );
+            close( IN );
+            if ($stash) {
+                system( "git apply < $stash" );
+                unlink( $stash );
+            }
+        }
+    }
+}
+
+# Do the work :-)
+
+# Initial commit: diff against an empty tree object
+my $against="4b825dc642cb6eb9a060e54bf8d69288fbee4904";
+if ( system( "git rev-parse --verify HEAD >/dev/null 2>&1" ) == 0 ) {
+    $against="HEAD"
+}
+
+# If you want to allow non-ascii filenames set this variable to true.
+my $allownonascii=`git config hooks.allownonascii`;
+
+# Cross platform projects tend to avoid non-ascii filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if ( $allownonascii ne "true" &&
+    # Note that the use of brackets around a tr range is ok here, (it's
+    # even required, for portability to Solaris 10's /usr/bin/tr), since
+    # the square bracket bytes happen to fall in the designated range.
+    `git diff --cached --name-only --diff-filter=A -z $against | \
+     LC_ALL=C tr -d '[ -~]\\0'` ne "" )
+{
+    print <<EOM;
+Error: Attempt to add a non-ascii file name."
+
+This can cause problems if you want to work"
+with people on other platforms."
+
+To be portable it is advisable to rename the file ..."
+
+If you know what you are doing you can disable this"
+check using:"
+
+  git config hooks.allownonascii true"
+
+EOM
+    exit( 1 );
+}
+
+# check for missing doxygen comments in new files
+my $doxycheck = "../../bin/find-undocumented-classes";
+if (! -e $doxycheck) {
+    # bootstrap repo
+    $doxycheck =~ s|../../||;
+}
+open(FILES, "git diff-index --cached --name-only --diff-filter=A $against |") || die "Cannot run git diff-index.";
+while (my $file = <FILES>) {
+    chomp($file);
+    if ($file =~ /\.hxx$/) {
+        system("$doxycheck -q $file | sed 's|".getcwd()."/||;'");
+    }
+}
+
+# run 'msgcat --nowrap' when committing *.po files
+open(FILES, "git diff-index --cached --name-only $against |") || die "Cannot run git diff-index.";
+while (my $file = <FILES>) {
+    chomp($file);
+    if ($file =~ /\.po$/ && -e $file) {
+        system("msgcat --no-wrap $file > $file.KQnBbK6wQE;mv $file.KQnBbK6wQE $file;");
+        system("git add $file");
+    }
+}
+
+# be strict about tabs - we don't want them at all, setup your editor
+# correctly ;-)
+my $err_ext = "";
+
+open( FILES, "git diff-index --cached --name-only $against |" ) || die "Cannot run git diff-index.";
+while ( my $file = <FILES> ) {
+    chomp( $file );
+    if ( $file ne "GNUmakefile" &&
+         $file =~ /\.(c|cpp|cxx|h|hrc|hxx|idl|inl|java|map|MK|pmk|pl|pm|sdi|sh|src|tab|xcu|xml)$/) {
+        open( F, "git diff-index -p --cached $against -- '$file' |" );
+        while ( my $line = <F> ) {
+            if ( $line =~ /^\+ *\t/ ) {
+                $err_ext .= "$file\n";
+                last;
+            }
+        }
+    }
+    close( F );
+}
+close( FILES );
+
+if ( $err_ext ne "" ) {
+    print <<EOM;
+Error: Your change in the following files introduces tabs in indentation:
+
+$err_ext
+Please setup your editor not to use tabs, fix the files, and try again.
+We have had enough trouble with tabs in the past :-(
+
+EOM
+    exit( 1 );
+}
+
+# check for old licenses
+my $check_licenses='^+.*\(Sun Industry Standards Source License Version\|GNU Lesser General Public License Version 2.1\)';
+my $err_licenses=`git diff-index --cached --name-only $against | while read FILE ; do \
+                      if git diff-index -p --cached $against -- "\$FILE" | grep -qs "$check_licenses" ; then \
+                          echo "\$FILE" \
+                      fi \
+                  done`;
+chomp( $err_licenses );
+if ( $err_licenses ne "" && $err_licenses ne "git-hooks/pre-commit" ) {
+    print <<EOM;
+Error: Your change in the following files introduces old licenses:
+
+$err_licenses
+
+Please check with the author(s) that they agree with upgrading the
+license to LGPL3, and change the license accondingly.
+
+EOM
+    exit( 1 );
+}
+
+# fix whitespace in code
+check_and_fix_whitespace( $against );
+
+# check the rest of the files
+my $filter_patches=`git diff-index --check --cached $against -- | sed '/\.\(diff\|patch\):/,/.*/d'`;
+chomp( $filter_patches );
+if ( $filter_patches ne "" ) {
+    print "WARNING:\n\n$filter_patches\n";
+}
+
+# all OK
+exit( 0 );
+# vi:set shiftwidth=4 expandtab:
diff --git a/guw/guw.cc b/guw/guw.cc
index ea7c84d5cf4e..431866cb83c1 100644
--- a/guw/guw.cc
+++ b/guw/guw.cc
@@ -98,15 +98,7 @@ const string transformvars[] = { "SOLAR_VERSION",
                                  "SOLARVERSION",
                                  "SOLARVER",
                                  "SRC_ROOT",
-                                 "LOCALINI",
-                                 "GLOBALINI",
                                  "SOLARENV",
-                                 "STAR_INSTPATH",
-                                 "STAR_SOLARPATH",
-                                 "STAR_PACKMISC",
-                                 "STAR_SOLARENVPATH",
-                                 "STAR_INITROOT",
-                                 "STAR_STANDLST",
                                  "CLASSPATH",
                                  "JAVA_HOME" };
 
@@ -290,7 +282,7 @@ void init_ignorepara(string fullcommand) {
 bool is_ignorepara(const string &para) {
 
   for( vector<string>::iterator it = ignorepara_vec.begin();
-       it != ignorepara_vec.end(); it++ ) {
+       it != ignorepara_vec.end(); ++it ) {
     if ( para.find(*it) != string::npos ) {
       if ( debug )
         cerr << "Found execption para: " << para << endl;
@@ -641,7 +633,7 @@ void rep_subn_cyg(string &argument)
   regfree(&re);
 }
 
-// Replace all occurences of subexpression number "subexp" with "repl"
+// Replace all occurrences of subexpression number "subexp" with "repl"
 void rep_subn( string &argument, const char *pattern, int subexp, const char repl)
 {
   int status, pos=0;
diff --git a/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp
deleted file mode 100644
index 9b367631b65c..000000000000
--- a/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp
+++ /dev/null
diff --git a/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp
deleted file mode 100644
index 8b160e68ec8c..000000000000
--- a/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp
+++ /dev/null
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt
new file mode 100644
index 000000000000..7263a0a9e9bb
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt
@@ -0,0 +1,73 @@
+Action	Description	Template
+s72	L0	L0
+WINDOWSENCODINGTEMPLATE	ActionText	Action
+Advertise	OOO_ACTIONTEXT_1	
+AllocateRegistrySpace	OOO_ACTIONTEXT_2	OOO_ACTIONTEXT_3
+AppSearch	OOO_ACTIONTEXT_4	OOO_ACTIONTEXT_5
+BindImage	OOO_ACTIONTEXT_6	OOO_ACTIONTEXT_7
+caCreateVRoots	OOO_ACTIONTEXT_8	
+caRemoveVRoots	OOO_ACTIONTEXT_9	
+CCPSearch	OOO_ACTIONTEXT_10	
+CostFinalize	OOO_ACTIONTEXT_11	
+CostInitialize	OOO_ACTIONTEXT_12	
+CreateFolders	OOO_ACTIONTEXT_13	OOO_ACTIONTEXT_14
+CreateShortcuts	OOO_ACTIONTEXT_15	OOO_ACTIONTEXT_16
+DeleteServices	OOO_ACTIONTEXT_17	OOO_ACTIONTEXT_18
+DuplicateFiles	OOO_ACTIONTEXT_19	OOO_ACTIONTEXT_20
+FileCost	OOO_ACTIONTEXT_21	
+FindRelatedProducts	OOO_ACTIONTEXT_22	OOO_ACTIONTEXT_23
+GenerateScript	OOO_ACTIONTEXT_24	OOO_ACTIONTEXT_25
+InstallAdminPackage	OOO_ACTIONTEXT_26	OOO_ACTIONTEXT_27
+InstallFiles	OOO_ACTIONTEXT_28	OOO_ACTIONTEXT_29
+InstallODBC	OOO_ACTIONTEXT_30	
+InstallServices	OOO_ACTIONTEXT_31	OOO_ACTIONTEXT_32
+InstallSFPCatalogFile	OOO_ACTIONTEXT_33	OOO_ACTIONTEXT_34
+InstallValidate	OOO_ACTIONTEXT_35	
+LaunchConditions	OOO_ACTIONTEXT_36	
+MigrateFeatureStates	OOO_ACTIONTEXT_37	OOO_ACTIONTEXT_38
+MoveFiles	OOO_ACTIONTEXT_39	OOO_ACTIONTEXT_40
+PatchFiles	OOO_ACTIONTEXT_41	OOO_ACTIONTEXT_42
+ProcessComponents	OOO_ACTIONTEXT_43	
+PublishComponents	OOO_ACTIONTEXT_44	OOO_ACTIONTEXT_45
+PublishFeatures	OOO_ACTIONTEXT_46	OOO_ACTIONTEXT_47
+PublishProduct	OOO_ACTIONTEXT_48	
+RegisterClassInfo	OOO_ACTIONTEXT_49	OOO_ACTIONTEXT_50
+RegisterComPlus	OOO_ACTIONTEXT_51	OOO_ACTIONTEXT_52
+RegisterExtensionInfo	OOO_ACTIONTEXT_53	OOO_ACTIONTEXT_54
+RegisterFonts	OOO_ACTIONTEXT_55	OOO_ACTIONTEXT_56
+RegisterMIMEInfo	OOO_ACTIONTEXT_57	OOO_ACTIONTEXT_58
+RegisterProduct	OOO_ACTIONTEXT_59	OOO_ACTIONTEXT_60
+RegisterProgIdInfo	OOO_ACTIONTEXT_61	OOO_ACTIONTEXT_62
+RegisterTypeLibraries	OOO_ACTIONTEXT_63	OOO_ACTIONTEXT_64
+RegisterUser	OOO_ACTIONTEXT_65	OOO_ACTIONTEXT_66
+RemoveDuplicateFiles	OOO_ACTIONTEXT_67	OOO_ACTIONTEXT_68
+RemoveEnvironmentStrings	OOO_ACTIONTEXT_69	OOO_ACTIONTEXT_70
+RemoveExistingProducts	OOO_ACTIONTEXT_71	OOO_ACTIONTEXT_72
+RemoveFiles	OOO_ACTIONTEXT_73	OOO_ACTIONTEXT_74
+RemoveFolders	OOO_ACTIONTEXT_75	OOO_ACTIONTEXT_76
+RemoveIniValues	OOO_ACTIONTEXT_77	OOO_ACTIONTEXT_78
+RemoveODBC	OOO_ACTIONTEXT_79	
+RemoveRegistryValues	OOO_ACTIONTEXT_80	OOO_ACTIONTEXT_81
+RemoveShortcuts	OOO_ACTIONTEXT_82	OOO_ACTIONTEXT_83
+RMCCPSearch	OOO_ACTIONTEXT_84	
+Rollback	OOO_ACTIONTEXT_85	OOO_ACTIONTEXT_86
+RollbackCleanup	OOO_ACTIONTEXT_87	OOO_ACTIONTEXT_88
+SelfRegModules	OOO_ACTIONTEXT_89	OOO_ACTIONTEXT_90
+SelfUnregModules	OOO_ACTIONTEXT_91	OOO_ACTIONTEXT_92
+SetODBCFolders	OOO_ACTIONTEXT_93	
+StartServices	OOO_ACTIONTEXT_94	OOO_ACTIONTEXT_95
+StopServices	OOO_ACTIONTEXT_96	OOO_ACTIONTEXT_97
+UnmoveFiles	OOO_ACTIONTEXT_98	OOO_ACTIONTEXT_99
+UnpublishComponents	OOO_ACTIONTEXT_100	OOO_ACTIONTEXT_101
+UnpublishFeatures	OOO_ACTIONTEXT_102	OOO_ACTIONTEXT_103
+UnpublishProduct	OOO_ACTIONTEXT_104	
+UnregisterClassInfo	OOO_ACTIONTEXT_105	OOO_ACTIONTEXT_106
+UnregisterComPlus	OOO_ACTIONTEXT_107	OOO_ACTIONTEXT_108
+UnregisterExtensionInfo	OOO_ACTIONTEXT_109	OOO_ACTIONTEXT_110
+UnregisterFonts	OOO_ACTIONTEXT_111	OOO_ACTIONTEXT_112
+UnregisterMIMEInfo	OOO_ACTIONTEXT_113	OOO_ACTIONTEXT_114
+UnregisterProgIdInfo	OOO_ACTIONTEXT_115	OOO_ACTIONTEXT_116
+UnregisterTypeLibraries	OOO_ACTIONTEXT_117	OOO_ACTIONTEXT_118
+WriteEnvironmentStrings	OOO_ACTIONTEXT_119	OOO_ACTIONTEXT_120
+WriteIniValues	OOO_ACTIONTEXT_121	OOO_ACTIONTEXT_122
+WriteRegistryValues	OOO_ACTIONTEXT_123	OOO_ACTIONTEXT_124
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/AdminExe.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/AdminExe.idt
new file mode 100644
index 000000000000..ede3f7cb4f42
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/AdminExe.idt
@@ -0,0 +1,13 @@
+Action	Condition	Sequence
+s72	S255	I2
+AdminExecuteSequence	Action
+CostFinalize		150
+CostInitialize		50
+CreateFolders		325
+FileCost		100
+InstallAdminPackage		300
+InstallFiles		350
+InstallFinalize		400
+InstallInitialize		250
+InstallValidate		200
+ScheduleReboot	ISSCHEDULEREBOOT	375
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/AdminUIS.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/AdminUIS.idt
new file mode 100644
index 000000000000..3d92e28a43b1
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/AdminUIS.idt
@@ -0,0 +1,14 @@
+Action	Condition	Sequence
+s72	S255	I2
+AdminUISequence	Action
+AdminWelcome	Not PATCH	250
+CostFinalize		200
+CostInitialize		100
+ExecuteAction		350
+FileCost		150
+PatchWelcome	PATCH	260
+SetupCompleteError		-3
+SetupCompleteSuccess		-1
+SetupInitialization		50
+SetupInterrupted		-2
+SetupProgress		300
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/AdvtExec.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/AdvtExec.idt
new file mode 100644
index 000000000000..32b74d61a9f5
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/AdvtExec.idt
@@ -0,0 +1,19 @@
+Action	Condition	Sequence
+s72	S255	I2
+AdvtExecuteSequence	Action
+CostFinalize		100
+CostInitialize		50
+CreateShortcuts		250
+InstallFinalize		700
+InstallInitialize		200
+InstallValidate		150
+MsiPublishAssemblies		575
+PublishComponents		550
+PublishFeatures		600
+PublishProduct		650
+RegisterClassInfo		300
+RegisterExtensionInfo		350
+RegisterMIMEInfo		450
+RegisterProgIdInfo		400
+RegisterTypeLibraries		500
+ScheduleReboot	ISSCHEDULEREBOOT	675
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary.idt
new file mode 100644
index 000000000000..0b638cb0e9d9
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary.idt
@@ -0,0 +1,20 @@
+Name	Data
+s72	v0
+Binary	Name
+ImageBmp	Image.bmp
+BannerBmp	Banner.bmp
+CautionIco	caution.ico
+DontInstallIco	dontinstall.ico
+OpenFolderIco	openfolder.ico
+InstallIco	install.ico
+InstallFirstUseIco	installfirstuse.ico
+InstallPartialIco	installpartial.ico
+InstallStateMenuIco	installstatemenu.ico
+NetworkInstallIco	networkinstall.ico
+NewFolderIco	newfolder.ico
+SetupCompleteIco	setupcomplete.ico
+SetupIco	setup.ico
+SetupPartialIco	setuppartial.ico
+SetupRepairIco	setuprepair.ico
+TrashcanIco	trashcan.ico
+UpIco	up.ico
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Banner.bmp
new file mode 100644
index 000000000000..a453f1fcdd05
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Banner.bmp
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Image.bmp
new file mode 100644
index 000000000000..11acb28b1aad
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Image.bmp
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/caution.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/caution.ico
new file mode 100644
index 000000000000..1c6f14ee08fb
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/caution.ico
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/dontinstall.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/dontinstall.ico
new file mode 100644
index 000000000000..e7136d0e8b2d
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/dontinstall.ico
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/install.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/install.ico
new file mode 100644
index 000000000000..2eb32becb63a
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/install.ico
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installfirstuse.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installfirstuse.ico
new file mode 100644
index 000000000000..dc1e6542ece2
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installfirstuse.ico
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installpartial.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installpartial.ico
new file mode 100644
index 000000000000..bd576796943e
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installpartial.ico
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installstatemenu.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installstatemenu.ico
new file mode 100644
index 000000000000..914340dbbd88
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installstatemenu.ico
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/networkinstall.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/networkinstall.ico
new file mode 100644
index 000000000000..ae11ed11348d
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/networkinstall.ico
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/newfolder.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/newfolder.ico
new file mode 100644
index 000000000000..324adbcba0a0
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/newfolder.ico
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/openfolder.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/openfolder.ico
new file mode 100644
index 000000000000..ef88d2e4731e
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/openfolder.ico
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setup.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setup.ico
new file mode 100644
index 000000000000..3580448fe32e
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setup.ico
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setupcomplete.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setupcomplete.ico
new file mode 100644
index 000000000000..609276af083b
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setupcomplete.ico
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuppartial.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuppartial.ico
new file mode 100644
index 000000000000..ac158ab39873
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuppartial.ico
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuprepair.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuprepair.ico
new file mode 100644
index 000000000000..2f4a24d0b696
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuprepair.ico
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/trashcan.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/trashcan.ico
new file mode 100644
index 000000000000..f1cc8083f0f7
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/trashcan.ico
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/up.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/up.ico
new file mode 100644
index 000000000000..5dc25fae6a1e
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/up.ico
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CheckBox.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CheckBox.idt
new file mode 100644
index 000000000000..c7c8e06d7bb3
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CheckBox.idt
@@ -0,0 +1,4 @@
+Property	Value
+s72	S64
+CheckBox	Property
+ISCHECKFORPRODUCTUPDATES	1
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
new file mode 100644
index 000000000000..e5be5e4d6ea7
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -0,0 +1,380 @@
+Dialog_	Control	Type	X	Y	Width	Height	Attributes	Property	Text	Control_Next	Help
+s72	s50	s20	i2	i2	i2	i2	I4	S50	L0	S50	L50
+WINDOWSENCODINGTEMPLATE	Control	Dialog_	Control
+AdminChangeFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+AdminChangeFolder	BannerLine	Line	0	44	374	0	1				
+AdminChangeFolder	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
+AdminChangeFolder	Branding2	Text	3	228	140	13	65537		[ProductName]		
+AdminChangeFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_3	ComboText	
+AdminChangeFolder	Combo	DirectoryCombo	21	64	277	80	458755	TARGETDIR		Up	
+AdminChangeFolder	ComboText	Text	21	50	99	14	3		OOO_CONTROL_5	Combo	
+AdminChangeFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_6		
+AdminChangeFolder	DlgLine	Line	145	234	229	0	1				
+AdminChangeFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_7		
+AdminChangeFolder	List	DirectoryList	21	90	332	97	7	TARGETDIR		TailText	
+AdminChangeFolder	NewFolder	PushButton	335	66	19	19	3670019		NewFolderIco	List	OOO_CONTROL_9
+AdminChangeFolder	OK	PushButton	230	243	66	17	3		OOO_CONTROL_10	Cancel	
+AdminChangeFolder	Tail	PathEdit	21	207	332	17	3	TARGETDIR		OK	
+AdminChangeFolder	TailText	Text	21	193	99	13	3		OOO_CONTROL_12	Tail	
+AdminChangeFolder	Up	PushButton	310	66	19	19	3670019		UpIco	NewFolder	OOO_CONTROL_13
+AdminNetworkLocation	Back	PushButton	164	243	66	17	3		OOO_CONTROL_14	InstallNow	
+AdminNetworkLocation	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+AdminNetworkLocation	BannerLine	Line	0	44	374	0	1				
+AdminNetworkLocation	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
+AdminNetworkLocation	Branding2	Text	3	228	140	13	65537		[ProductName]		
+AdminNetworkLocation	Browse	PushButton	286	124	66	17	3		OOO_CONTROL_17	Back	
+AdminNetworkLocation	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_18	LBBrowse	
+AdminNetworkLocation	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_19		
+AdminNetworkLocation	DlgLine	Line	145	234	229	0	1				
+AdminNetworkLocation	DlgText	Text	21	51	326	40	3		OOO_CONTROL_20		
+AdminNetworkLocation	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_21		
+AdminNetworkLocation	InstallNow	PushButton	230	243	66	17	3		OOO_CONTROL_22	Cancel	
+AdminNetworkLocation	LBBrowse	Text	21	90	100	10	3		OOO_CONTROL_23	SetupPathEdit	
+AdminNetworkLocation	SetupPathEdit	PathEdit	21	102	330	17	3	TARGETDIR		Browse	
+AdminWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_24	Next	
+AdminWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_25	Back	
+AdminWelcome	DlgLine	Line	0	234	326	0	1				
+AdminWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
+AdminWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_26	Cancel	
+AdminWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_27		
+AdminWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_28		
+CancelSetup	Icon	Icon	15	15	24	24	5242881		CautionIco		
+CancelSetup	No	PushButton	135	57	66	17	3		OOO_CONTROL_29	Yes	
+CancelSetup	Text	Text	48	15	194	30	3		OOO_CONTROL_30		
+CancelSetup	Yes	PushButton	62	57	66	17	3		OOO_CONTROL_31	No	
+CustomerInformation	Back	PushButton	164	243	66	17	3		OOO_CONTROL_32	Next	
+CustomerInformation	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+CustomerInformation	BannerLine	Line	0	44	374	0	1				
+CustomerInformation	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
+CustomerInformation	Branding2	Text	3	228	140	13	65537		[ProductName]		
+CustomerInformation	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_35	NameLabel	
+CustomerInformation	CompanyEdit	Edit	21	100	237	17	3	COMPANYNAME	OOO_CONTROL_36	SerialLabel	
+CustomerInformation	CompanyLabel	Text	21	89	75	10	3		OOO_CONTROL_37	CompanyEdit	
+CustomerInformation	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_38		
+CustomerInformation	DlgLine	Line	145	234	229	0	1				
+CustomerInformation	DlgRadioGroupText	Text	21	161	300	14	3		OOO_CONTROL_39		
+CustomerInformation	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_40		
+CustomerInformation	NameEdit	Edit	21	63	237	17	3	USERNAME	OOO_CONTROL_41	CompanyLabel	
+CustomerInformation	NameLabel	Text	21	52	75	10	3		OOO_CONTROL_42	NameEdit	
+CustomerInformation	Next	PushButton	230	243	66	17	3		OOO_CONTROL_43	Cancel	
+CustomerInformation	RadioGroup	RadioButtonGroup	63	170	300	50	3	ApplicationUsers		Back	
+CustomerInformation	SerialLabel	Text	21	127	109	10	2		OOO_CONTROL_45	SerialNumber	
+CustomerInformation	SerialNumber	MaskedEdit	21	138	237	17	2	ISX_SERIALNUM		RadioGroup	
+CustomSetup	Back	PushButton	164	243	66	17	3		OOO_CONTROL_46	Next	
+CustomSetup	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+CustomSetup	BannerLine	Line	0	44	374	0	1				
+CustomSetup	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
+CustomSetup	Branding2	Text	3	228	140	13	65537		[ProductName]		
+CustomSetup	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_49	Tree	
+CustomSetup	ChangeFolder	PushButton	301	203	66	17	3		OOO_CONTROL_50	Help	
+CustomSetup	Details	PushButton	93	243	66	17	3		OOO_CONTROL_51	Back	
+CustomSetup	DlgDesc	Text	17	23	276	25	65539		OOO_CONTROL_52		
+CustomSetup	DlgLine	Line	145	234	229	0	1				
+CustomSetup	DlgText	Text	9	51	360	10	3		OOO_CONTROL_53		
+CustomSetup	DlgTitle	Text	9	6	284	25	65539		OOO_CONTROL_54		
+CustomSetup	FeatureGroup	GroupBox	235	67	131	120	1		OOO_CONTROL_55		
+CustomSetup	Help	PushButton	22	243	66	17	3		OOO_CONTROL_56	Details	
+CustomSetup	InstallLabel	Text	8	190	360	10	3		OOO_CONTROL_57		
+CustomSetup	ItemDescription	Text	241	80	120	50	3		OOO_CONTROL_58		
+CustomSetup	Location	Text	8	203	291	20	3		OOO_CONTROL_59		
+CustomSetup	Next	PushButton	230	243	66	17	3		OOO_CONTROL_60	Cancel	
+CustomSetup	Size	Text	241	133	120	50	3		OOO_CONTROL_61		
+CustomSetup	Tree	SelectionTree	8	70	220	118	7	_BrowseProperty		ChangeFolder	
+CustomSetupTips	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+CustomSetupTips	BannerLine	Line	0	44	374	0	1				
+CustomSetupTips	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
+CustomSetupTips	Branding2	Text	3	228	140	13	65537		[ProductName]		
+CustomSetupTips	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_64		
+CustomSetupTips	DlgLine	Line	145	234	229	0	1				
+CustomSetupTips	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_65		
+CustomSetupTips	DontInstall	Icon	21	155	24	24	5242881		DontInstallIco		
+CustomSetupTips	DontInstallText	Text	60	155	300	20	3		OOO_CONTROL_66		
+CustomSetupTips	Install	Icon	21	105	24	24	5242881		InstallIco		
+CustomSetupTips	InstallPartial	Icon	21	130	24	24	5242881		InstallPartialIco		
+CustomSetupTips	InstallStateMenu	Icon	21	52	24	24	5242881		InstallStateMenuIco		
+CustomSetupTips	InstallStateText	Text	21	91	300	10	3		OOO_CONTROL_68		
+CustomSetupTips	InstallText	Text	60	105	300	20	3		OOO_CONTROL_69		
+CustomSetupTips	MenuText	Text	50	52	300	36	3		OOO_CONTROL_70		
+CustomSetupTips	OK	PushButton	301	243	66	17	3		OOO_CONTROL_72		
+CustomSetupTips	PartialText	Text	60	130	300	20	3		OOO_CONTROL_73		
+DatabaseFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_74	Next	
+DatabaseFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+DatabaseFolder	BannerLine	Line	0	44	374	0	1				
+DatabaseFolder	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
+DatabaseFolder	Branding2	Text	3	228	140	13	65537		[ProductName]		
+DatabaseFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_77	ChangeFolder	
+DatabaseFolder	ChangeFolder	PushButton	301	65	66	17	3		OOO_CONTROL_78	Back	
+DatabaseFolder	DatabaseFolder	Icon	21	52	24	24	5242881		OpenFolderIco		
+DatabaseFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_79		
+DatabaseFolder	DlgLine	Line	145	234	229	0	1				
+DatabaseFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_80		
+DatabaseFolder	Location	Text	57	65	240	40	3	_BrowseProperty	OOO_CONTROL_81		
+DatabaseFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_82		
+DatabaseFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_83	Cancel	
+DestinationFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_84	Next	
+DestinationFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+DestinationFolder	BannerLine	Line	0	44	374	0	1				
+DestinationFolder	Branding1	Text	4	229	110	13	3		{&MSSWhiteSerif8}[ProductName]		
+DestinationFolder	Branding2	Text	3	228	110	13	65537		[ProductName]		
+DestinationFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_87	ChangeFolder	
+DestinationFolder	ChangeFolder	PushButton	301	125	66	17	3		OOO_CONTROL_88	Back	
+DestinationFolder	DestFolder	Icon	21	112	24	24	5242881		OpenFolderIco		
+DestinationFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_304		
+DestinationFolder	DlgLine	Line	114	234	260	0	1				
+DestinationFolder	DlgTitle	Text	13	6	280	25	65539		{&MSSansBold8}[ProductName]		
+DestinationFolder	Location	Text	57	128	240	40	3	_BrowseProperty	[INSTALLLOCATION]		
+DestinationFolder	LocLabel	Text	57	115	290	10	3		OOO_CONTROL_92		
+DestinationFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_93	Cancel	
+DestinationFolder	LabelStartInstall	Text	21	52	290	30	2		OOO_CONTROL_300		
+DestinationFolder	LabelInvalidDir	Text	21	52	290	30	2		OOO_CONTROL_301		
+DestinationFolder	LabelWrongProduct	Text	21	52	290	30	2		OOO_CONTROL_303		
+DestinationFolder	LabelStartInstall2	Text	21	82	290	30	2		OOO_CONTROL_305		
+DestinationFolder	LabelInvalidDir2	Text	21	82	290	30	2		OOO_CONTROL_307		
+DestinationFolder	LabelWrongProduct2	Text	21	82	290	30	2		OOO_CONTROL_306		
+DiskSpaceRequirements	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+DiskSpaceRequirements	BannerLine	Line	0	44	374	0	1				
+DiskSpaceRequirements	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
+DiskSpaceRequirements	Branding2	Text	3	228	140	13	65537		[ProductName]		
+DiskSpaceRequirements	DlgDesc	Text	17	23	276	25	65539		OOO_CONTROL_96		
+DiskSpaceRequirements	DlgLine	Line	145	234	229	0	1				
+DiskSpaceRequirements	DlgText	Text	10	185	358	41	3		OOO_CONTROL_97		
+DiskSpaceRequirements	DlgTitle	Text	9	6	284	25	65539		OOO_CONTROL_98		
+DiskSpaceRequirements	List	VolumeCostList	8	55	358	125	393223		{120}{70}{70}{70}{70}		
+DiskSpaceRequirements	OK	PushButton	301	243	66	17	3		OOO_CONTROL_100		
+FilesInUse	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+FilesInUse	BannerLine	Line	0	44	374	0	1				
+FilesInUse	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
+FilesInUse	Branding2	Text	3	228	140	13	65537		[ProductName]		
+FilesInUse	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_103		
+FilesInUse	DlgLine	Line	145	234	229	0	1				
+FilesInUse	DlgText	Text	21	51	348	29	3		OOO_CONTROL_104		
+FilesInUse	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_105		
+FilesInUse	Exit	PushButton	301	243	66	17	3		OOO_CONTROL_106	List	
+FilesInUse	Ignore	PushButton	230	243	66	17	3		OOO_CONTROL_107	Exit	
+FilesInUse	List	ListBox	21	87	331	135	7	FileInUseProcess		Retry	
+FilesInUse	Retry	PushButton	164	243	66	17	3		OOO_CONTROL_108	Ignore	
+FileTypeDialog	Back	PushButton	164	243	66	17	3		OOO_CONTROL_135	Next	
+FileTypeDialog	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+FileTypeDialog	BannerLine	Line	0	44	374	0	1				
+FileTypeDialog	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
+FileTypeDialog	Branding2	Text	3	228	140	13	65537		[ProductName]		
+FileTypeDialog	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_138	CheckBox1	
+FileTypeDialog	CheckBox1	CheckBox	41	106	200	10	3	SELECT_WORD	 OOO_CONTROL_270	CheckBox2	
+FileTypeDialog	CheckBox2	CheckBox	41	131	200	10	3	SELECT_EXCEL	 OOO_CONTROL_271	CheckBox3	
+FileTypeDialog	CheckBox3	CheckBox	41	156	200	10	3	SELECT_POWERPOINT	 OOO_CONTROL_272	Back	
+FileTypeDialog	DlgDesc	Text	21	20	272	25	65539		OOO_CONTROL_274		
+FileTypeDialog	DlgLine	Line	145	234	229	0	1				
+FileTypeDialog	DlgText	Text	21	56	326	40	3		OOO_CONTROL_275		
+FileTypeDialog	DlgText2	Text	21	190	326	30	3		OOO_CONTROL_309		
+FileTypeDialog	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_278		
+FileTypeDialog	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel	
+InstallChangeFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+InstallChangeFolder	BannerLine	Line	0	44	374	0	1				
+InstallChangeFolder	Branding1	Text	4	229	110	13	3		{&MSSWhiteSerif8}[ProductName]		
+InstallChangeFolder	Branding2	Text	3	228	110	13	65537		[ProductName]		
+InstallChangeFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_111	ComboText	
+InstallChangeFolder	Combo	DirectoryCombo	21	64	302	80	4128779	_BrowseProperty		Up	
+InstallChangeFolder	ComboText	Text	21	50	99	14	3		OOO_CONTROL_113	Combo	
+InstallChangeFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_114		
+InstallChangeFolder	DlgLine	Line	114	234	260	0	1				
+InstallChangeFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_115		
+InstallChangeFolder	List	DirectoryList	21	90	332	97	15	_BrowseProperty		TailText	
+InstallChangeFolder	OK	PushButton	230	243	66	17	3		OOO_CONTROL_118	Cancel	
+InstallChangeFolder	Tail	PathEdit	21	207	332	17	15	_BrowseProperty		OK	
+InstallChangeFolder	TailText	Text	21	193	99	13	3		OOO_CONTROL_120	Tail	
+InstallChangeFolder	Up	PushButton	333	64	19	19	3670019		UpIco	List	OOO_CONTROL_121
+InstallWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_122	Copyright	
+InstallWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_123	Back	
+InstallWelcome	Copyright	Text	135	144	228	73	65539		OOO_CONTROL_124	Next	
+InstallWelcome	DlgLine	Line	0	234	374	0	1				
+InstallWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
+InstallWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_125	Cancel	
+InstallWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_126		
+InstallWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_127		
+LicenseAgreement	Agree	RadioButtonGroup	8	190	330	40	3	AgreeToLicense		Back	
+LicenseAgreement	Back	PushButton	164	243	66	17	3		OOO_CONTROL_128	Next	
+LicenseAgreement	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+LicenseAgreement	BannerLine	Line	0	44	374	0	1				
+LicenseAgreement	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
+LicenseAgreement	Branding2	Text	3	228	140	13	65537		[ProductName]		
+LicenseAgreement	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_131	Agree	
+LicenseAgreement	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_132		
+LicenseAgreement	DlgLine	Line	145	234	229	0	1				
+LicenseAgreement	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_133		
+LicenseAgreement	Memo	ScrollableText	8	54	358	130	7				
+LicenseAgreement	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel	
+MaintenanceType	Back	PushButton	164	243	66	17	3		OOO_CONTROL_135	Next	
+MaintenanceType	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+MaintenanceType	BannerLine	Line	0	44	374	0	1				
+MaintenanceType	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
+MaintenanceType	Branding2	Text	3	228	140	13	65537		[ProductName]		
+MaintenanceType	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_138	RadioGroup	
+MaintenanceType	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_139		
+MaintenanceType	DlgLine	Line	145	234	229	0	1				
+MaintenanceType	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_140		
+MaintenanceType	Ico1	Icon	35	75	24	24	5242881		SetupRepairIco		
+MaintenanceType	Ico2	Icon	35	135	24	24	5242881		TrashcanIco		
+MaintenanceType	Next	PushButton	230	243	66	17	3		OOO_CONTROL_141	Cancel	
+MaintenanceType	RadioGroup	RadioButtonGroup	21	55	290	170	3	_IsMaintenance		Back	
+MaintenanceType	Text1	Text	80	72	260	35	3		OOO_CONTROL_144		
+MaintenanceType	Text2	Text	80	135	260	35	3		OOO_CONTROL_145		
+MaintenanceWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_146	Next	
+MaintenanceWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_147	Back	
+MaintenanceWelcome	DlgLine	Line	0	234	374	0	1				
+MaintenanceWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
+MaintenanceWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_148	Cancel	
+MaintenanceWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_149		
+MaintenanceWelcome	TextLine2	Text	135	55	228	50	65539		OOO_CONTROL_150		
+OutOfSpace	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+OutOfSpace	BannerLine	Line	0	44	374	0	1				
+OutOfSpace	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
+OutOfSpace	Branding2	Text	3	228	140	13	65537		[ProductName]		
+OutOfSpace	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_153		
+OutOfSpace	DlgLine	Line	145	234	229	0	1				
+OutOfSpace	DlgText	Text	21	51	326	43	3		OOO_CONTROL_154		
+OutOfSpace	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_155		
+OutOfSpace	List	VolumeCostList	21	95	332	120	393223		OOO_CONTROL_156		
+OutOfSpace	Resume	PushButton	301	243	66	17	3		OOO_CONTROL_157		
+PatchWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_158	Next	
+PatchWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_159	Back	
+PatchWelcome	DlgLine	Line	0	234	374	0	1				
+PatchWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
+PatchWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_160	Cancel	
+PatchWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_161		
+PatchWelcome	TextLine2	Text	135	54	228	45	65539		OOO_CONTROL_162		
+ReadyToInstall	Back	PushButton	164	243	66	17	3		OOO_CONTROL_163	InstallNow	
+ReadyToInstall	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+ReadyToInstall	BannerLine	Line	0	44	374	0	1				
+ReadyToInstall	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
+ReadyToInstall	Branding2	Text	3	228	140	13	65537		[ProductName]		
+ReadyToInstall	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_166	Back	
+ReadyToInstall	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_167		
+ReadyToInstall	DlgLine	Line	145	234	229	0	1				
+ReadyToInstall	DlgText	Text	21	51	326	20	3		OOO_CONTROL_168		
+ReadyToInstall	DlgText1	Text	21	70	330	24	3		OOO_CONTROL_169		
+ReadyToInstall	DlgTitle	Text	13	6	280	25	65538		OOO_CONTROL_170		
+ReadyToInstall	DlgTitle2	Text	13	6	280	25	65538		OOO_CONTROL_171		
+ReadyToInstall	DlgTitle3	Text	13	6	280	25	65538		OOO_CONTROL_172		
+ReadyToInstall	InstallNow	PushButton	230	243	66	17	3		OOO_CONTROL_173	Cancel	
+ReadyToRemove	Back	PushButton	164	243	66	17	3		OOO_CONTROL_174	RemoveNow	
+ReadyToRemove	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+ReadyToRemove	BannerLine	Line	0	44	374	0	1				
+ReadyToRemove	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
+ReadyToRemove	Branding2	Text	3	228	140	13	65537		[ProductName]		
+ReadyToRemove	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_177	Back	
+ReadyToRemove	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_178		
+ReadyToRemove	DlgLine	Line	145	234	229	0	1				
+ReadyToRemove	DlgText	Text	21	51	326	24	3		OOO_CONTROL_179		
+ReadyToRemove	DlgText1	Text	21	79	330	23	3		OOO_CONTROL_180		
+ReadyToRemove	DlgText2	Text	21	102	330	24	3				
+ReadyToRemove	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_181		
+ReadyToRemove	RemoveNow	PushButton	230	243	66	17	3		OOO_CONTROL_182	Cancel	
+SetupCompleteError	Back	PushButton	164	243	66	17	1		OOO_CONTROL_183	Finish	
+SetupCompleteError	Cancel	PushButton	301	243	66	17	1		OOO_CONTROL_184	Back	
+SetupCompleteError	DlgLine	Line	0	234	374	0	1				
+SetupCompleteError	Finish	PushButton	230	243	66	17	3		OOO_CONTROL_185	Cancel	
+SetupCompleteError	FinishText1	Text	135	80	228	50	65539		OOO_CONTROL_186		
+SetupCompleteError	FinishText2	Text	135	135	228	25	65539		OOO_CONTROL_187		
+SetupCompleteError	Image	Bitmap	0	0	122	234	1		ImageBmp		
+SetupCompleteError	RestContText1	Text	135	80	228	50	65539		OOO_CONTROL_188		
+SetupCompleteError	RestContText2	Text	135	135	228	25	65539		OOO_CONTROL_189		
+SetupCompleteError	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_190		
+SetupCompleteError	TextLine2	Text	135	55	228	25	65539		OOO_CONTROL_191		
+SetupCompleteSuccess	Back	PushButton	164	243	66	17	1		OOO_CONTROL_192	OK	
+SetupCompleteSuccess	Cancel	PushButton	301	243	66	17	1		OOO_CONTROL_193	Image	
+SetupCompleteSuccess	CheckBoxUpdates	CheckBox	135	164	10	9	2	ISCHECKFORPRODUCTUPDATES	CheckBox1	Back	
+SetupCompleteSuccess	CheckForUpdatesText	Text	152	162	190	30	65538		OOO_CONTROL_194		
+SetupCompleteSuccess	CheckLaunchProgram	CheckBox	151	114	10	9	2	LAUNCHPROGRAM			
+SetupCompleteSuccess	CheckLaunchReadme	CheckBox	151	148	10	9	2	LAUNCHREADME			
+SetupCompleteSuccess	DlgLine	Line	0	234	374	0	1				
+SetupCompleteSuccess	Image	Bitmap	0	0	122	234	1		ImageBmp	CheckBoxUpdates	
+SetupCompleteSuccess	LaunchProgramText	Text	164	112	198	15	65538		OOO_CONTROL_195		
+SetupCompleteSuccess	LaunchReadmeText	Text	164	148	198	13	65538		OOO_CONTROL_196		
+SetupCompleteSuccess	OK	PushButton	230	243	66	17	3		OOO_CONTROL_197	Cancel	
+SetupCompleteSuccess	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_198		
+SetupCompleteSuccess	TextLine2	Text	135	55	228	45	65538		OOO_CONTROL_199		
+SetupCompleteSuccess	TextLine3	Text	135	55	228	45	65538		OOO_CONTROL_200		
+SetupCompleteSuccess	UpdateTextLine1	Text	135	30	228	45	65538		OOO_CONTROL_201		
+SetupCompleteSuccess	UpdateTextLine2	Text	135	80	228	45	65538		OOO_CONTROL_202		
+SetupCompleteSuccess	UpdateTextLine3	Text	135	120	228	45	65538		OOO_CONTROL_203		
+SetupError	A	PushButton	192	80	66	17	3		OOO_CONTROL_204		
+SetupError	C	PushButton	192	80	66	17	3		OOO_CONTROL_205		
+SetupError	ErrorText	Text	50	15	200	50	3		OOO_CONTROL_206		
+SetupError	I	PushButton	192	80	66	17	3		OOO_CONTROL_207		
+SetupError	N	PushButton	192	80	66	17	3		OOO_CONTROL_208		
+SetupError	O	PushButton	192	80	66	17	3		OOO_CONTROL_209		
+SetupError	R	PushButton	192	80	66	17	3		OOO_CONTROL_210		
+SetupError	WarningIcon	Icon	15	15	24	24	5242881		CautionIco		
+SetupError	Y	PushButton	192	80	66	17	3		OOO_CONTROL_211		
+SetupInitialization	ActionData	Text	135	125	228	12	65539				
+SetupInitialization	ActionText	Text	135	109	220	36	65539				
+SetupInitialization	Back	PushButton	164	243	66	17	1		OOO_CONTROL_214		
+SetupInitialization	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_215		
+SetupInitialization	DlgLine	Line	0	234	374	0	1				
+SetupInitialization	Image	Bitmap	0	0	122	234	1		ImageBmp		
+SetupInitialization	Next	PushButton	230	243	66	17	1		OOO_CONTROL_216		
+SetupInitialization	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_217		
+SetupInitialization	TextLine2	Text	135	55	228	30	65539		OOO_CONTROL_218		
+SetupInterrupted	Back	PushButton	164	243	66	17	1		OOO_CONTROL_219		
+SetupInterrupted	Cancel	PushButton	301	243	66	17	1		OOO_CONTROL_220		
+SetupInterrupted	DlgLine	Line	0	234	374	0	1				
+SetupInterrupted	Finish	PushButton	230	243	66	17	3		OOO_CONTROL_221		
+SetupInterrupted	FinishText1	Text	135	80	228	50	65539		OOO_CONTROL_222		
+SetupInterrupted	FinishText2	Text	135	135	228	25	65539		OOO_CONTROL_223		
+SetupInterrupted	Image	Bitmap	0	0	122	234	1		ImageBmp		
+SetupInterrupted	RestContText1	Text	135	80	228	50	65539		OOO_CONTROL_224		
+SetupInterrupted	RestContText2	Text	135	135	228	25	65539		OOO_CONTROL_225		
+SetupInterrupted	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_226		
+SetupInterrupted	TextLine2	Text	135	55	228	25	65539		OOO_CONTROL_227		
+SetupProgress	ActionProgress95	ProgressBar	59	113	275	12	65537		OOO_CONTROL_228		
+SetupProgress	ActionText	Text	59	100	275	12	3				
+SetupProgress	Back	PushButton	164	243	66	17	1		OOO_CONTROL_230	Next	
+SetupProgress	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+SetupProgress	BannerLine	Line	0	44	374	0	1				
+SetupProgress	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
+SetupProgress	Branding2	Text	3	228	140	13	65537		[ProductName]		
+SetupProgress	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_233	Back	
+SetupProgress	DlgDesc	Text	21	23	272	25	65538		OOO_CONTROL_234		
+SetupProgress	DlgDesc2	Text	21	23	272	25	65538		OOO_CONTROL_235		
+SetupProgress	DlgLine	Line	145	234	229	0	1				
+SetupProgress	DlgText	Text	59	51	275	30	65538		OOO_CONTROL_236		
+SetupProgress	DlgText2	Text	59	51	275	30	65538		OOO_CONTROL_237		
+SetupProgress	DlgTitle	Text	13	6	280	25	65538		OOO_CONTROL_238		
+SetupProgress	DlgTitle2	Text	13	6	280	25	65538		OOO_CONTROL_239		
+SetupProgress	LbSec	Text	172	139	32	12	2		OOO_CONTROL_240		
+SetupProgress	LbStatus	Text	59	85	70	12	3		OOO_CONTROL_241		
+SetupProgress	Next	PushButton	230	243	66	17	1		OOO_CONTROL_242	Cancel	
+SetupProgress	SetupIcon	Icon	21	51	24	24	5242881		SetupIco		
+SetupProgress	ShowTime	Text	155	139	17	12	2				
+SetupProgress	TextTime	Text	59	139	96	12	2		OOO_CONTROL_244		
+SetupResume	Back	PushButton	164	243	66	17	1		OOO_CONTROL_245	Next	
+SetupResume	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_246	Back	
+SetupResume	DlgLine	Line	0	234	374	0	1				
+SetupResume	Image	Bitmap	0	0	122	234	1		ImageBmp		
+SetupResume	Next	PushButton	230	243	66	17	3		OOO_CONTROL_247	Cancel	
+SetupResume	PreselectedText	Text	135	55	228	45	65539		OOO_CONTROL_248		
+SetupResume	ResumeText	Text	135	46	228	45	65539		OOO_CONTROL_249		
+SetupResume	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_250		
+SetupType	Back	PushButton	164	243	66	17	3		OOO_CONTROL_251	Next	
+SetupType	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+SetupType	BannerLine	Line	0	44	374	0	1				
+SetupType	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
+SetupType	Branding2	Text	3	228	140	13	65537		[ProductName]		
+SetupType	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_254	RadioGroup	
+SetupType	CompleteIco	Icon	34	94	24	24	5242881		SetupCompleteIco		
+SetupType	CompText	Text	80	94	246	35	3		OOO_CONTROL_255		
+SetupType	CustomIco	Icon	34	154	24	24	5242881		SetupPartialIco		
+SetupType	CustText	Text	80	154	246	35	3		OOO_CONTROL_256		
+SetupType	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_257		
+SetupType	DlgLine	Line	145	234	229	0	1				
+SetupType	DlgText	Text	21	51	326	10	3		OOO_CONTROL_258		
+SetupType	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_259		
+SetupType	Next	PushButton	230	243	66	17	3		OOO_CONTROL_260	Cancel	
+SetupType	RadioGroup	RadioButtonGroup	21	79	264	120	3	_IsSetupTypeMin		Back	
+SplashBitmap	Back	PushButton	164	243	66	17	1		OOO_CONTROL_262	Next	
+SplashBitmap	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
+SplashBitmap	Branding2	Text	3	228	140	13	65537		[ProductName]		
+SplashBitmap	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_265	Back	
+SplashBitmap	DlgLine	Line	145	234	229	0	1				
+SplashBitmap	Image	Bitmap	13	12	114	211	1		ImageBmp		
+SplashBitmap	Next	PushButton	230	243	66	17	3		OOO_CONTROL_266	Cancel	
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
new file mode 100644
index 000000000000..6f6e3cb59b7f
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
@@ -0,0 +1,70 @@
+Dialog_	Control_	Action	Condition
+s72	s50	s50	s255
+ControlCondition	Dialog_	Control_	Action	Condition
+CustomerInformation	DlgRadioGroupText	Hide	NOT Privileged
+CustomerInformation	DlgRadioGroupText	Hide	ProductState > 0
+CustomerInformation	DlgRadioGroupText	Hide	Version9X
+CustomerInformation	RadioGroup	Hide	NOT Privileged
+CustomerInformation	RadioGroup	Hide	ProductState > 0
+CustomerInformation	RadioGroup	Hide	Version9X
+CustomerInformation	SerialLabel	Show	SERIALNUMSHOW
+CustomerInformation	SerialNumber	Show	SERIALNUMSHOW
+CustomSetup	ChangeFolder	Hide	Installed
+CustomSetup	Details	Hide	Installed
+CustomSetup	InstallLabel	Hide	Installed
+InstallWelcome	Copyright	Hide	SHOWCOPYRIGHT="No"
+InstallWelcome	Copyright	Show	SHOWCOPYRIGHT="Yes"
+LicenseAgreement	Next	Disable	AgreeToLicense <> "Yes"
+LicenseAgreement	Next	Enable	AgreeToLicense = "Yes"
+ReadyToInstall	DlgTitle	Show	ProgressType0="Modify"
+ReadyToInstall	DlgTitle2	Show	ProgressType0="Repair"
+ReadyToInstall	DlgTitle3	Show	ProgressType0="install"
+SetupCompleteError	Back	Default	UpdateStarted
+SetupCompleteError	Back	Disable	NOT UpdateStarted
+SetupCompleteError	Back	Enable	UpdateStarted
+SetupCompleteError	Cancel	Disable	NOT UpdateStarted
+SetupCompleteError	Cancel	Enable	UpdateStarted
+SetupCompleteError	Finish	Default	NOT UpdateStarted
+SetupCompleteError	FinishText1	Hide	UpdateStarted
+SetupCompleteError	FinishText1	Show	NOT UpdateStarted
+SetupCompleteError	FinishText2	Hide	UpdateStarted
+SetupCompleteError	FinishText2	Show	NOT UpdateStarted
+SetupCompleteError	RestContText1	Hide	NOT UpdateStarted
+SetupCompleteError	RestContText1	Show	UpdateStarted
+SetupCompleteError	RestContText2	Hide	NOT UpdateStarted
+SetupCompleteError	RestContText2	Show	UpdateStarted
+SetupCompleteSuccess	CheckBoxUpdates	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
+SetupCompleteSuccess	CheckForUpdatesText	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
+SetupCompleteSuccess	CheckLaunchProgram	Show	SHOWLAUNCHPROGRAM="-1" And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
+SetupCompleteSuccess	CheckLaunchReadme	Show	SHOWLAUNCHREADME="-1"  And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
+SetupCompleteSuccess	LaunchProgramText	Show	SHOWLAUNCHPROGRAM="-1" And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
+SetupCompleteSuccess	LaunchReadmeText	Show	SHOWLAUNCHREADME="-1"  And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
+SetupCompleteSuccess	TextLine2	Show	ProgressType2="installed" And ((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR (ISENABLEDWUSFINISHDIALOG And Installed))
+SetupCompleteSuccess	TextLine3	Show	ProgressType2="uninstalled" And ((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR (ISENABLEDWUSFINISHDIALOG And Installed))
+SetupCompleteSuccess	UpdateTextLine1	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
+SetupCompleteSuccess	UpdateTextLine2	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
+SetupCompleteSuccess	UpdateTextLine3	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
+SetupInterrupted	Back	Default	UpdateStarted
+SetupInterrupted	Back	Disable	NOT UpdateStarted
+SetupInterrupted	Back	Enable	UpdateStarted
+SetupInterrupted	Cancel	Disable	NOT UpdateStarted
+SetupInterrupted	Cancel	Enable	UpdateStarted
+SetupInterrupted	Finish	Default	NOT UpdateStarted
+SetupInterrupted	FinishText1	Hide	UpdateStarted
+SetupInterrupted	FinishText1	Show	NOT UpdateStarted
+SetupInterrupted	FinishText2	Hide	UpdateStarted
+SetupInterrupted	FinishText2	Show	NOT UpdateStarted
+SetupInterrupted	RestContText1	Hide	NOT UpdateStarted
+SetupInterrupted	RestContText1	Show	UpdateStarted
+SetupInterrupted	RestContText2	Hide	NOT UpdateStarted
+SetupInterrupted	RestContText2	Show	UpdateStarted
+SetupProgress	DlgDesc	Show	ProgressType2="installed"
+SetupProgress	DlgDesc2	Show	ProgressType2="uninstalled"
+SetupProgress	DlgText	Show	ProgressType3="installs"
+SetupProgress	DlgText2	Show	ProgressType3="uninstalls"
+SetupProgress	DlgTitle	Show	ProgressType1="Installing"
+SetupProgress	DlgTitle2	Show	ProgressType1="Uninstalling"
+SetupResume	PreselectedText	Hide	RESUME
+SetupResume	PreselectedText	Show	NOT RESUME
+SetupResume	ResumeText	Hide	NOT RESUME
+SetupResume	ResumeText	Show	RESUME
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
new file mode 100644
index 000000000000..21f7fe7726a5
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
@@ -0,0 +1,138 @@
+Dialog_	Control_	Event	Argument	Condition	Ordering
+s72	s50	s50	s255	S255	I2
+ControlEvent	Dialog_	Control_	Event	Argument	Condition
+AdminChangeFolder	Cancel	EndDialog	Return	1	2
+AdminChangeFolder	Cancel	Reset	0	1	1
+AdminChangeFolder	NewFolder	DirectoryListNew	0	1	0
+AdminChangeFolder	OK	EndDialog	Return	1	0
+AdminChangeFolder	OK	SetTargetPath	TARGETDIR	1	1
+AdminChangeFolder	Up	DirectoryListUp	0	1	0
+AdminNetworkLocation	Back	NewDialog	AdminWelcome	1	0
+AdminNetworkLocation	Browse	SpawnDialog	AdminChangeFolder	1	0
+AdminNetworkLocation	Cancel	SpawnDialog	CancelSetup	1	0
+AdminNetworkLocation	InstallNow	EndDialog	Return	OutOfNoRbDiskSpace <> 1	3
+AdminNetworkLocation	InstallNow	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	2
+AdminNetworkLocation	InstallNow	SetTargetPath	TARGETDIR	1	1
+AdminWelcome	Cancel	SpawnDialog	CancelSetup	1	0
+AdminWelcome	Next	NewDialog	AdminNetworkLocation	1	0
+CancelSetup	No	EndDialog	Return	1	0
+CancelSetup	Yes	EndDialog	Exit	1	2
+CustomerInformation	Back	NewDialog	LicenseAgreement	1	1
+CustomerInformation	Cancel	SpawnDialog	CancelSetup	1	0
+CustomerInformation	Next	[ALLUSERS]	{}	ApplicationUsers = "OnlyCurrentUser" And Privileged	2
+CustomerInformation	Next	[ALLUSERS]	1	ApplicationUsers = "AllUsers" And Privileged	1
+CustomerInformation	Next	EndDialog	Exit	(SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT<0) And (SERIALNUMVALRETURN<>SERIALNUMVALSUCCESSRETVAL)	3
+CustomerInformation	Next	NewDialog	SetupType	((Not SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL))	4
+CustomSetup	Back	NewDialog	MaintenanceType	Installed	0
+CustomSetup	Back	NewDialog	SetupType	NOT Installed	0
+CustomSetup	Cancel	SpawnDialog	CancelSetup	1	0
+CustomSetup	ChangeFolder	SelectionBrowse	InstallChangeFolder	1	0
+CustomSetup	Details	SelectionBrowse	DiskSpaceRequirements	1	1
+CustomSetup	Help	SpawnDialog	CustomSetupTips	1	1
+CustomSetup	Next	[_IsSetupTypeMin]	Custom	1	0
+CustomSetup	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
+CustomSetup	Next	NewDialog	ReadyToInstall	OutOfNoRbDiskSpace <> 1	0
+CustomSetupTips	OK	EndDialog	Return	1	1
+DatabaseFolder	Back	NewDialog	CustomerInformation	1	1
+DatabaseFolder	Cancel	SpawnDialog	CancelSetup	1	1
+DatabaseFolder	ChangeFolder	[_BrowseProperty]	DATABASEDIR	1	2
+DatabaseFolder	ChangeFolder	SpawnDialog	InstallChangeFolder	1	1
+DatabaseFolder	Next	NewDialog	SetupType	1	1
+DestinationFolder	Back	NewDialog	LicenseAgreement	HIDEEULA <> 1	0
+DestinationFolder	Back	NewDialog	InstallWelcome	HIDEEULA = 1	0
+DestinationFolder	Cancel	SpawnDialog	CancelSetup	1	1
+DestinationFolder	ChangeFolder	[_BrowseProperty]	INSTALLLOCATION	1	2
+DestinationFolder	ChangeFolder	NewDialog	InstallChangeFolder	1	1
+DestinationFolder	Next	NewDialog	ReadyToInstall	1	0
+DiskSpaceRequirements	OK	EndDialog	Return	1	0
+FilesInUse	Exit	EndDialog	Exit	1	0
+FilesInUse	Ignore	EndDialog	Ignore	1	0
+FilesInUse	Retry	EndDialog	Retry	1	0
+FileTypeDialog	Back	NewDialog	CustomSetup	Installed OR _IsSetupTypeMin = "Custom"	2
+FileTypeDialog	Back	NewDialog	SetupType	NOT Installed AND _IsSetupTypeMin <> "Custom"	1
+FileTypeDialog	Cancel	SpawnDialog	CancelSetup	1	0
+FileTypeDialog	Next	NewDialog	ReadyToInstall	1	0
+InstallChangeFolder	Cancel	NewDialog	DestinationFolder	1	2
+InstallChangeFolder	Cancel	Reset	0	1	1
+InstallChangeFolder	OK	NewDialog	DestinationFolder	1	3
+InstallChangeFolder	OK	SetTargetPath	[_BrowseProperty]	1	2
+InstallChangeFolder	Up	DirectoryListUp	0	1	0
+InstallWelcome	Back	NewDialog	SplashBitmap	Display_IsBitmapDlg	1
+InstallWelcome	Cancel	SpawnDialog	CancelSetup	1	0
+InstallWelcome	Next	NewDialog	LicenseAgreement	HIDEEULA <> 1	0
+InstallWelcome	Next	NewDialog	DestinationFolder	HIDEEULA = 1	0
+LicenseAgreement	Back	NewDialog	InstallWelcome	1	0
+LicenseAgreement	Cancel	SpawnDialog	CancelSetup	1	0
+LicenseAgreement	Next	NewDialog	DestinationFolder	AgreeToLicense = "Yes"	0
+MaintenanceType	Back	NewDialog	MaintenanceWelcome	1	0
+MaintenanceType	Cancel	SpawnDialog	CancelSetup	1	0
+MaintenanceType	Next	[ProgressType0]	Modify	_IsMaintenance = "Change"	2
+MaintenanceType	Next	[ProgressType0]	Repair	_IsMaintenance = "Reinstall"	1
+MaintenanceType	Next	[ProgressType1]	Modifying	_IsMaintenance = "Change"	3
+MaintenanceType	Next	[ProgressType1]	Repairing	_IsMaintenance = "Reinstall"	4
+MaintenanceType	Next	[ProgressType2]	modified	_IsMaintenance = "Change"	6
+MaintenanceType	Next	[ProgressType2]	repairs	_IsMaintenance = "Reinstall"	5
+MaintenanceType	Next	[ProgressType3]	modifies	_IsMaintenance = "Change"	7
+MaintenanceType	Next	[ProgressType3]	repairs	_IsMaintenance = "Reinstall"	8
+MaintenanceType	Next	NewDialog	CustomSetup	_IsMaintenance = "Change"	12
+MaintenanceType	Next	NewDialog	ReadyToInstall	_IsMaintenance = "Reinstall"	13
+MaintenanceType	Next	NewDialog	ReadyToRemove	_IsMaintenance = "Remove"	11
+MaintenanceType	Next	Reinstall	ALL	_IsMaintenance = "Reinstall"	10
+MaintenanceType	Next	ReinstallMode	[ReinstallModeText]	_IsMaintenance = "Reinstall"	9
+MaintenanceWelcome	Cancel	SpawnDialog	CancelSetup	1	0
+MaintenanceWelcome	Next	NewDialog	MaintenanceType	1	0
+OutOfSpace	Resume	NewDialog	AdminNetworkLocation	ACTION = "ADMIN"	0
+OutOfSpace	Resume	NewDialog	DestinationFolder	ACTION <> "ADMIN"	0
+PatchWelcome	Back	NewDialog	SplashBitmap	Display_IsBitmapDlg	0
+PatchWelcome	Cancel	SpawnDialog	CancelSetup	1	1
+PatchWelcome	Next	EndDialog	Return	1	3
+PatchWelcome	Next	Reinstall	ALL	PATCH And REINSTALL=""	1
+PatchWelcome	Next	ReinstallMode	omus	PATCH And REINSTALLMODE=""	2
+ReadyToInstall	Back	NewDialog	DestinationFolder	Installed OR _IsSetupTypeMin = "Custom"	2
+ReadyToInstall	Back	NewDialog	DestinationFolder	Installed AND _IsMaintenance = "Reinstall"	3
+ReadyToInstall	Back	NewDialog	DestinationFolder	NOT Installed	1
+ReadyToInstall	Cancel	SpawnDialog	CancelSetup	1	0
+ReadyToInstall	InstallNow	[ProgressType1]	Installing	1	0
+ReadyToInstall	InstallNow	[ProgressType2]	installed	1	0
+ReadyToInstall	InstallNow	[ProgressType3]	installs	1	0
+ReadyToInstall	InstallNow	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
+ReadyToInstall	InstallNow	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
+ReadyToRemove	Back	NewDialog	MaintenanceType	1	0
+ReadyToRemove	Cancel	SpawnDialog	CancelSetup	1	0
+ReadyToRemove	RemoveNow	[ProgressType1]	Uninstalling	1	0
+ReadyToRemove	RemoveNow	[ProgressType2]	uninstalled	1	0
+ReadyToRemove	RemoveNow	[ProgressType3]	uninstalls	1	0
+ReadyToRemove	RemoveNow	EndDialog	Return	OutOfNoRbDiskSpace <> 1	2
+ReadyToRemove	RemoveNow	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	2
+ReadyToRemove	RemoveNow	Remove	ALL	1	1
+SetupCompleteError	Back	[Suspend]	{}	1	1
+SetupCompleteError	Back	EndDialog	Return	1	2
+SetupCompleteError	Cancel	[Suspend]	1	1	1
+SetupCompleteError	Cancel	EndDialog	Return	1	2
+SetupCompleteError	Finish	EndDialog	Exit	1	2
+SetupCompleteSuccess	OK	DoAction	CheckForProductUpdates	ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And NOT ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL"	4
+SetupCompleteSuccess	OK	DoAction	CheckForProductUpdatesOnReboot	ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL"	5
+SetupCompleteSuccess	OK	EndDialog	Exit	1	2
+SetupError	A	EndDialog	ErrorAbort	1	0
+SetupError	C	EndDialog	ErrorCancel	1	0
+SetupError	I	EndDialog	ErrorIgnore	1	0
+SetupError	N	EndDialog	ErrorNo	1	0
+SetupError	O	EndDialog	ErrorOk	1	0
+SetupError	R	EndDialog	ErrorRetry	1	0
+SetupError	Y	EndDialog	ErrorYes	1	0
+SetupInitialization	Cancel	SpawnDialog	CancelSetup	1	0
+SetupInterrupted	Back	[Suspend]	{}	1	1
+SetupInterrupted	Back	EndDialog	Exit	1	2
+SetupInterrupted	Cancel	[Suspend]	1	1	1
+SetupInterrupted	Cancel	EndDialog	Exit	1	2
+SetupInterrupted	Finish	EndDialog	Exit	1	2
+SetupProgress	Cancel	SpawnDialog	CancelSetup	1	0
+SetupResume	Cancel	SpawnDialog	CancelSetup	1	0
+SetupResume	Next	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
+SetupResume	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
+SetupType	Back	NewDialog	CustomerInformation	1	0
+SetupType	Cancel	SpawnDialog	CancelSetup	1	0
+SetupType	Next	NewDialog	CustomSetup	_IsSetupTypeMin = "Custom"	0
+SetupType	Next	NewDialog	ReadyToInstall	_IsSetupTypeMin <> "Custom"	0
+SplashBitmap	Cancel	SpawnDialog	CancelSetup	1	0
+SplashBitmap	Next	NewDialog	InstallWelcome	1	0
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
new file mode 100644
index 000000000000..7af1c7b26429
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
@@ -0,0 +1,10 @@
+Action	Type	Source	Target
+s72	i2	S64	S255
+CustomAction	Action
+setAllUsersProfile2K	51	ALLUSERSPROFILE	[%ALLUSERSPROFILE]
+SetAllUsersProfileNT	51	ALLUSERSPROFILE	[%SystemRoot]\Profiles\All Users
+setUserProfileNT	51	USERPROFILE	[%USERPROFILE]
+SetARPInstallLocation	51	ARPINSTALLLOCATION	[INSTALLLOCATION]
+NewProductFound	19		OOO_CUSTOMACTION_1
+SameProductFound	19		OOO_CUSTOMACTION_2
+RunningOffice	19		OOO_CUSTOMACTION_4
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt
new file mode 100644
index 000000000000..100074c408bf
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt
@@ -0,0 +1,33 @@
+Dialog	HCentering	VCentering	Width	Height	Attributes	Title	Control_First	Control_Default	Control_Cancel
+s72	i2	i2	i2	i2	I4	L128	s50	S50	S50
+Dialog	Dialog
+AdminChangeFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	TailText	OK	Cancel
+AdminNetworkLocation	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	InstallNow	InstallNow	Cancel
+AdminWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
+CancelSetup	50	50	260	85	3	[ProductName] [Setup]	No	No	No
+CustomerInformation	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	NameLabel	Next	Cancel
+CustomSetup	50	50	374	266	35	[ProductName] - [STR_INSTALLATION_WIZARD]	Tree	Next	Cancel
+CustomSetupTips	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
+DatabaseFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
+DestinationFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
+DiskSpaceRequirements	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
+FilesInUse	50	50	374	266	19	[ProductName] - [STR_INSTALLATION_WIZARD]	Retry	Retry	Exit
+FileTypeDialog	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	CheckBox1	Next	Cancel
+InstallChangeFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	TailText	OK	Cancel
+InstallWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
+LicenseAgreement	50	50	374	266	2	[ProductName] - [STR_INSTALLATION_WIZARD]	Agree	Next	Cancel
+MaintenanceType	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	RadioGroup	Next	Cancel
+MaintenanceWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
+OutOfSpace	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Resume	Resume	Resume
+PatchWelcome	50	50	374	266	3	[ProductName] Patch - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
+ReadyToInstall	50	50	374	266	35	[ProductName] - [STR_INSTALLATION_WIZARD]	InstallNow	InstallNow	Cancel
+ReadyToRemove	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	RemoveNow	RemoveNow	Cancel
+SetupCompleteError	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Finish	Finish	Finish
+SetupCompleteSuccess	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
+SetupError	50	10	270	110	65543	[ProductName] [STR_INSTALLATION_WIZARD]	ErrorText	O	C
+SetupInitialization	50	50	374	266	5	[ProductName] - [STR_INSTALLATION_WIZARD]	Cancel	Cancel	Cancel
+SetupInterrupted	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Finish	Finish	Finish
+SetupProgress	50	50	374	266	5	[ProductName] - [STR_INSTALLATION_WIZARD]	Cancel	Cancel	Cancel
+SetupResume	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
+SetupType	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	RadioGroup	Next	Cancel
+SplashBitmap	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Error.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Error.idt
new file mode 100644
index 000000000000..9789d0cf56f3
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Error.idt
@@ -0,0 +1,133 @@
+Error	Message
+i2	L0
+WINDOWSENCODINGTEMPLATE	Error	Error
+0	OOO_ERROR_1
+1	OOO_ERROR_2
+2	OOO_ERROR_3 
+4	OOO_ERROR_4 
+5	OOO_ERROR_5
+7	OOO_ERROR_6
+8	OOO_ERROR_7
+9	OOO_ERROR_8
+10	OOO_ERROR_9
+11	OOO_ERROR_10
+12	OOO_ERROR_11
+13	OOO_ERROR_12
+14	OOO_ERROR_13
+15	OOO_ERROR_14
+16	OOO_ERROR_15
+17	OOO_ERROR_16
+18	OOO_ERROR_17
+19	OOO_ERROR_18
+20	OOO_ERROR_19
+21	OOO_ERROR_20
+22	OOO_ERROR_21
+23	OOO_ERROR_22
+32	OOO_ERROR_23
+33	OOO_ERROR_24
+1101	OOO_ERROR_25
+1301	OOO_ERROR_26
+1302	OOO_ERROR_27
+1303	OOO_ERROR_28
+1304	OOO_ERROR_29
+1305	OOO_ERROR_30
+1306	OOO_ERROR_31.
+1307	OOO_ERROR_32
+1308	OOO_ERROR_33
+1309	OOO_ERROR_34
+1310	OOO_ERROR_35
+1311	OOO_ERROR_36
+1312	OOO_ERROR_37
+1313	OOO_ERROR_38
+1314	OOO_ERROR_39
+1315	OOO_ERROR_40
+1316	OOO_ERROR_41.
+1317	OOO_ERROR_42
+1318	OOO_ERROR_43
+1319	OOO_ERROR_44
+1320	OOO_ERROR_45
+1321	OOO_ERROR_46
+1322	OOO_ERROR_47
+1323	OOO_ERROR_48
+1324	OOO_ERROR_49
+1325	OOO_ERROR_50
+1326	OOO_ERROR_51
+1327	OOO_ERROR_52
+1328	OOO_ERROR_53
+1401	OOO_ERROR_54 
+1402	OOO_ERROR_55 
+1403	OOO_ERROR_56 
+1404	OOO_ERROR_57 
+1405	OOO_ERROR_58 
+1406	OOO_ERROR_59
+1407	OOO_ERROR_60
+1408	OOO_ERROR_61 
+1409	OOO_ERROR_62
+1410	OOO_ERROR_63
+1500	OOO_ERROR_64
+1501	OOO_ERROR_65
+1502	OOO_ERROR_66
+1503	OOO_ERROR_67
+1601	OOO_ERROR_68
+1602	OOO_ERROR_69
+1603	OOO_ERROR_70
+1604	OOO_ERROR_71
+1605	OOO_ERROR_72
+1606	OOO_ERROR_73
+1607	OOO_ERROR_74
+1608	OOO_ERROR_75
+1701	OOO_ERROR_76
+1702	OOO_ERROR_77
+1703	OOO_ERROR_78
+1704	OOO_ERROR_79
+1705	OOO_ERROR_80
+1706	OOO_ERROR_81
+1707	OOO_ERROR_82
+1708	OOO_ERROR_83
+1709	OOO_ERROR_84
+1710	OOO_ERROR_85
+1711	OOO_ERROR_86
+1712	OOO_ERROR_87
+1713	OOO_ERROR_88
+1714	OOO_ERROR_89
+1801	OOO_ERROR_90
+1802	OOO_ERROR_91
+1803	OOO_ERROR_92
+1804	OOO_ERROR_93
+1805	OOO_ERROR_94
+1806	OOO_ERROR_95
+1807	OOO_ERROR_96
+1901	OOO_ERROR_97
+1902	OOO_ERROR_98
+1903	OOO_ERROR_99
+1904	OOO_ERROR_100.
+1905	OOO_ERROR_101
+1906	OOO_ERROR_102
+1907	OOO_ERROR_103
+1908	OOO_ERROR_104
+1909	OOO_ERROR_105
+1910	OOO_ERROR_106
+1911	OOO_ERROR_107
+1912	OOO_ERROR_108
+1913	OOO_ERROR_109
+1914	OOO_ERROR_110
+1915	OOO_ERROR_111
+1916	OOO_ERROR_112
+1917	OOO_ERROR_113
+1918	OOO_ERROR_114
+1919	OOO_ERROR_115
+1920	OOO_ERROR_116
+1921	OOO_ERROR_117
+1922	OOO_ERROR_118
+1923	OOO_ERROR_119
+1924	OOO_ERROR_120
+1925	OOO_ERROR_121
+1926	OOO_ERROR_122
+1927	OOO_ERROR_123
+1928	OOO_ERROR_124
+1929	OOO_ERROR_125
+1930	OOO_ERROR_126
+1931	OOO_ERROR_127
+1932	OOO_ERROR_128
+1933	OOO_ERROR_129
+1934	OOO_ERROR_130
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/EventMap.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/EventMap.idt
new file mode 100644
index 000000000000..ae76b6af0c21
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/EventMap.idt
@@ -0,0 +1,19 @@
+Dialog_	Control_	Event	Attribute
+s72	s50	s50	s50
+EventMapping	Dialog_	Control_	Event
+CustomSetup	ItemDescription	SelectionDescription	Text
+CustomSetup	Location	SelectionPath	Text
+CustomSetup	Next	SelectionPathOn	Enabled
+CustomSetup	Size	SelectionSize	Text
+SetupInitialization	ActionData	ActionData	Text
+SetupInitialization	ActionText	ActionText	Text
+SetupProgress	ActionProgress95	AdminInstallFinalize	Progress
+SetupProgress	ActionProgress95	InstallFiles	Progress
+SetupProgress	ActionProgress95	MoveFiles	Progress
+SetupProgress	ActionProgress95	RemoveFiles	Progress
+SetupProgress	ActionProgress95	RemoveRegistryValues	Progress
+SetupProgress	ActionProgress95	SetProgress	Progress
+SetupProgress	ActionProgress95	UnmoveFiles	Progress
+SetupProgress	ActionProgress95	WriteIniValues	Progress
+SetupProgress	ActionProgress95	WriteRegistryValues	Progress
+SetupProgress	ActionText	ActionText	Text
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
new file mode 100644
index 000000000000..90ba9c6a6005
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
@@ -0,0 +1,74 @@
+Action	Condition	Sequence
+s72	S255	I2
+InstallExecuteSequence	Action
+AllocateRegistrySpace	NOT Installed	750
+AppSearch		25
+BindImage		2100
+CCPSearch	CCP_TEST	200
+CostFinalize		500
+CostInitialize		350
+CreateFolders		1850
+CreateShortcuts		2150
+DeleteServices	VersionNT	1000
+DuplicateFiles		2050
+FileCost		400
+FindRelatedProducts	NOT ISSETUPDRIVEN	100
+InstallFiles		1950
+InstallFinalize		3150
+InstallInitialize		700
+InstallODBC		2600
+InstallServices	VersionNT	2750
+InstallValidate		650
+IsolateComponents		450
+LaunchConditions		50
+MigrateFeatureStates		600
+MoveFiles		1900
+MsiPublishAssemblies		3025
+MsiUnpublishAssemblies		875
+NewProductFound	NEWPRODUCTS	110
+PatchFiles		2000
+ProcessComponents		800
+PublishComponents		3000
+PublishFeatures		3050
+PublishProduct		3100
+RegisterClassInfo		2200
+RegisterComPlus		2700
+RegisterExtensionInfo		2250
+RegisterFonts		2550
+RegisterMIMEInfo		2350
+RegisterProduct		2950
+RegisterProgIdInfo		2300
+RegisterTypeLibraries		2650
+RegisterUser		2900
+RemoveDuplicateFiles		1700
+RemoveEnvironmentStrings		1650
+RemoveExistingProducts		675
+RemoveFiles		1750
+RemoveFolders		1800
+RemoveIniValues		1550
+RemoveODBC		1200
+RemoveRegistryValues		1300
+RemoveShortcuts		1600
+RunningOffice	OFFICERUNS="1"	135
+RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	250
+SameProductFound	SAMEPRODUCTS	120
+ScheduleReboot	ISSCHEDULEREBOOT	3125
+SelfRegModules		2850
+SelfUnregModules		1100
+SetARPInstallLocation		990
+SetODBCFolders		550
+StartServices	VersionNT	2800
+StopServices	VersionNT	950
+UnpublishComponents		850
+UnpublishFeatures		900
+UnregisterClassInfo		1350
+UnregisterComPlus		1050
+UnregisterExtensionInfo		1400
+UnregisterFonts		1250
+UnregisterMIMEInfo		1500
+UnregisterProgIdInfo		1450
+UnregisterTypeLibraries		1150
+ValidateProductID		300
+WriteEnvironmentStrings		2500
+WriteIniValues		2450
+WriteRegistryValues		2400
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallU.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallU.idt
new file mode 100644
index 000000000000..7b6bbd411406
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallU.idt
@@ -0,0 +1,30 @@
+Action	Condition	Sequence
+s72	S255	I2
+InstallUISequence	Action
+AppSearch		25
+CCPSearch	CCP_TEST	250
+CostFinalize		550
+CostInitialize		400
+ExecuteAction		850
+FileCost		450
+FindRelatedProducts		150
+InstallWelcome	Not Installed	650
+IsolateComponents		500
+LaunchConditions		50
+MaintenanceWelcome	Installed And Not RESUME And Not Preselected And Not PATCH	750
+MigrateFeatureStates		600
+NewProductFound	NEWPRODUCTS	160
+PatchWelcome	Installed And PATCH And Not IS_MAJOR_UPGRADE	625
+ResolveSource	Not Installed And Not PATCH	525
+RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	300
+SameProductFound	SAMEPRODUCTS	170
+setAllUsersProfile2K	VersionNT >= 500	512
+SetAllUsersProfileNT	VersionNT = 400	511
+SetupCompleteError		-3
+SetupCompleteSuccess		-1
+SetupInitialization		100
+SetupInterrupted		-2
+SetupProgress		800
+SetupResume	Installed And (RESUME Or Preselected) And Not PATCH	700
+setUserProfileNT	VersionNT	510
+ValidateProductID		350
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/LaunchCo.idt
new file mode 100644
index 000000000000..35d78694a664
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/LaunchCo.idt
@@ -0,0 +1,4 @@
+Condition	Description
+s255	l255
+WINDOWSENCODINGTEMPLATE	LaunchCondition	Condition
+Privileged	OOO_LAUNCH_1
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ListBox.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ListBox.idt
new file mode 100644
index 000000000000..e62653df98ac
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ListBox.idt
@@ -0,0 +1,3 @@
+Property	Order	Value	Text
+s72	i2	s64	L64
+ListBox	Property	Order
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
new file mode 100644
index 000000000000..0f3ed1e1bba3
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -0,0 +1,56 @@
+Property	Value
+s72	l0
+WINDOWSENCODINGTEMPLATE	Property	Property
+_IsMaintenance	Reinstall
+_IsSetupTypeMin	Typical
+AgreeToLicense	No
+ApplicationUsers	AllUsers
+ALLUSERS	1
+ARPCOMMENTS	ARPCOMMENTSTEMPLATE
+ARPCONTACT	OOO_ARPCONTACTTEMPLATE
+ARPHELPLINK	OOO_ARPHELPLINKTEMPLATE
+ARPHELPTELEPHONE	OOO_ARPHELPTELEPHONETEMPLATE
+ARPURLINFOABOUT	OOO_ARPURLINFOABOUTTEMPLATE
+ARPURLUPDATEINFO	OOO_ARPURLUPDATEINFOTEMPLATE
+DefaultUIFont	Tahoma8
+DialogCaption	Windows Installer
+DiskPrompt	[1]
+Display_IsBitmapDlg	1
+DisplayNameCustom	IDPROP_SETUPTYPE_CUSTOM
+DisplayNameMinimal	IDPROP_SETUPTYPE_COMPACT
+DisplayNameTypical	IDPROP_SETUPTYPE_TYPICAL
+DWUSINTERVAL	30
+ErrorDialog	SetupError
+InstallChoice	AR
+INSTALLLEVEL	INSTALLLEVELTEMPLATE
+ISCHECKFORPRODUCTUPDATES	ISCHECKFORPRODUCTUPDATESTEMPLATE
+ISSCRIPT_VERSION_MISSING	IDS_ISSCRIPT_VERSION_MISSING
+ISSCRIPT_VERSION_OLD	IDS_ISSCRIPT_VERSION_OLD
+ISVROOT_PORT_NO	0
+Manufacturer	MANUFACTURERTEMPLATE
+OFFICERUNS	0
+PIDTemplate	12345<###-%%%%%%%>@@@@@
+ProductCode	PRODUCTCODETEMPLATE
+ProductID	none
+ProductLanguage	PRODUCTLANGUAGETEMPLATE
+ProductName	PRODUCTNAMETEMPLATE
+ProductVersion	PRODUCTVERSIONTEMPLATE
+ProgressType0	install
+ProgressType1	Installing
+ProgressType2	installed
+ProgressType3	installs
+RebootYesNo	Yes
+ReinstallModeText	omus
+SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR
+SetupType	Typical
+STR_NEW_DISPLAY_NAME	OOO_STR_NEW_DISPLAY_NAME
+STR_EDIT	OOO_STR_EDIT
+STR_MS_WORD_DOCUMENT	OOO_STR_MS_WORD_DOCUMENT
+STR_MS_WORD_TEMPLATE	OOO_STR_MS_WORD_TEMPLATE
+STR_MS_EXCEL_WORKSHEET	OOO_STR_MS_EXCEL_WORKSHEET
+STR_MS_EXCEL_TEMPLATE	OOO_STR_MS_EXCEL_TEMPLATE
+STR_MS_POWERPOINT_PRESENTATION	OOO_STR_MS_POWERPOINT_PRESENTATION
+STR_MS_POWERPOINT_TEMPLATE	OOO_STR_MS_POWERPOINT_TEMPLATE
+STR_MS_POWERPOINT_SHOW	OOO_STR_MS_POWERPOINT_SHOW
+STR_INSTALLATION_WIZARD	OOO_STR_INSTALLATION_WIZARD
+UpgradeCode	UPGRADECODETEMPLATE
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/RadioBut.idt
new file mode 100644
index 000000000000..ddbf7e1ccb8c
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/RadioBut.idt
@@ -0,0 +1,11 @@
+Property	Order	Value	X	Y	Width	Height	Text	Help
+s72	i2	s64	i2	i2	i2	i2	L64	L50
+WINDOWSENCODINGTEMPLATE	RadioButton	Property	Order
+_IsMaintenance	1	Reinstall	0	0	290	14	OOO_RADIOBUTTON_2	
+_IsMaintenance	2	Remove	0	60	290	14	OOO_RADIOBUTTON_3	
+_IsSetupTypeMin	1	Typical	0	0	264	14	OOO_RADIOBUTTON_4	
+_IsSetupTypeMin	2	Custom	0	60	264	14	OOO_RADIOBUTTON_5	
+AgreeToLicense	1	No	0	15	295	15	OOO_RADIOBUTTON_6	
+AgreeToLicense	2	Yes	0	0	295	15	OOO_RADIOBUTTON_7	
+ApplicationUsers	1	AllUsers	1	7	290	14	OOO_RADIOBUTTON_8	
+ApplicationUsers	2	OnlyCurrentUser	1	23	290	14	OOO_RADIOBUTTON_9	
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/TextStyl.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/TextStyl.idt
new file mode 100644
index 000000000000..b4575c15dfc2
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/TextStyl.idt
@@ -0,0 +1,25 @@
+TextStyle	FaceName	Size	Color	StyleBits
+s72	s32	i2	I4	I2
+TextStyle	TextStyle
+Arial8	Arial	8		
+Arial9	Arial	9		
+ArialBlue10	Arial	10	16711680	
+ArialBlueStrike10	Arial	10	16711680	8
+CourierNew8	Courier New	8		
+CourierNew9	Courier New	9		
+MSGothic9	MS Gothic	9		
+MSSansBold8	Tahoma	8		1
+MSSansSerif8	MS Sans Serif	8		
+MSSansSerif9	MS Sans Serif	9		
+MSSGreySerif8	MS Sans Serif	8	8421504	
+MSSWhiteSerif8	Tahoma	8	16777215	
+Tahoma10	Tahoma	10		
+Tahoma8	Tahoma	8		
+Tahoma9	Tahoma	9		
+TahomaBold10	Tahoma	10		1
+TahomaBold8	Tahoma	8		1
+Times8	Times New Roman	8		
+Times9	Times New Roman	9		
+TimesItalic12	Times New Roman	12		2
+TimesItalicBlue10	Times New Roman	10	16711680	2
+TimesRed16	Times New Roman	16	255	
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/UIText.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/UIText.idt
new file mode 100644
index 000000000000..ea581bff4601
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/UIText.idt
@@ -0,0 +1,53 @@
+Key	Text
+s72	L255
+WINDOWSENCODINGTEMPLATE	UIText	Key
+AbsentPath	
+bytes	OOO_UITEXT_1
+GB	OOO_UITEXT_2
+KB	OOO_UITEXT_3
+MB	OOO_UITEXT_4
+MenuAbsent	OOO_UITEXT_5
+MenuAdvertise	OOO_UITEXT_6
+MenuAllCD	OOO_UITEXT_7
+MenuAllLocal	OOO_UITEXT_8
+MenuAllNetwork	OOO_UITEXT_9
+MenuCD	OOO_UITEXT_10
+MenuLocal	OOO_UITEXT_11
+MenuNetwork	OOO_UITEXT_12
+NewFolder	OOO_UITEXT_13
+SelAbsentAbsent	OOO_UITEXT_14
+SelAbsentAdvertise	OOO_UITEXT_15
+SelAbsentCD	OOO_UITEXT_16
+SelAbsentLocal	OOO_UITEXT_17
+SelAbsentNetwork	OOO_UITEXT_18
+SelAdvertiseAbsent	OOO_UITEXT_19
+SelAdvertiseAdvertise	OOO_UITEXT_20
+SelAdvertiseCD	OOO_UITEXT_21
+SelAdvertiseLocal	OOO_UITEXT_22
+SelAdvertiseNetwork	OOO_UITEXT_23
+SelCDAbsent	OOO_UITEXT_24
+SelCDAdvertise	OOO_UITEXT_25
+SelCDCD	OOO_UITEXT_26
+SelCDLocal	OOO_UITEXT_27
+SelChildCostNeg	OOO_UITEXT_28
+SelChildCostPos	OOO_UITEXT_29
+SelCostPending	OOO_UITEXT_30
+SelLocalAbsent	OOO_UITEXT_31
+SelLocalAdvertise	OOO_UITEXT_32
+SelLocalCD	OOO_UITEXT_33
+SelLocalLocal	OOO_UITEXT_34
+SelLocalNetwork	OOO_UITEXT_35
+SelNetworkAbsent	OOO_UITEXT_36
+SelNetworkAdvertise	OOO_UITEXT_37
+SelNetworkLocal	OOO_UITEXT_38
+SelNetworkNetwork	OOO_UITEXT_39
+SelParentCostNegNeg	OOO_UITEXT_40
+SelParentCostNegPos	OOO_UITEXT_41
+SelParentCostPosNeg	OOO_UITEXT_42
+SelParentCostPosPos	OOO_UITEXT_43
+TimeRemaining	OOO_UITEXT_44
+VolumeCostAvailable	OOO_UITEXT_45
+VolumeCostDifference	OOO_UITEXT_46
+VolumeCostRequired	OOO_UITEXT_47
+VolumeCostSize	OOO_UITEXT_48
+VolumeCostVolume	OOO_UITEXT_49
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
new file mode 100644
index 000000000000..4098f92c3578
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
@@ -0,0 +1,461 @@
+Table	Column	Nullable	MinValue	MaxValue	KeyTable	KeyColumn	Category	Set	Description
+s32	s32	s4	I4	I4	S255	I2	S32	S255	S255
+_Validation	Table	Column
+_Validation	Category	Y						Text;Formatted;Template;Condition;Guid;Path;Version;Language;Identifier;Binary;UpperCase;LowerCase;Filename;Paths;AnyPath;WildCardFilename;RegPath;KeyFormatted;CustomSource;Property;Cabinet;Shortcut;URL	String category
+_Validation	Column	N					Identifier		Name of column
+_Validation	Description	Y					Text		Description of column
+_Validation	KeyColumn	Y	1	32					Column to which foreign key connects
+_Validation	KeyTable	Y					Identifier		For foreign key, Name of table to which data must link
+_Validation	MaxValue	Y	-2147483647	2147483647					Maximum value allowed
+_Validation	MinValue	Y	-2147483647	2147483647					Minimum value allowed
+_Validation	Nullable	N						Y;N	Whether the column is nullable
+_Validation	Set	Y					Text		Set of values that are permitted
+_Validation	Table	N					Identifier		Name of table
+ActionText	Action	N					Identifier		Name of action to be described.
+ActionText	Description	Y					Text		Localized description displayed in progress dialog and log when action is executing.
+ActionText	Template	Y					Template		Optional localized format template used to format action data records for display during action execution.
+AdminExecuteSequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
+AdminExecuteSequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
+AdminExecuteSequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
+AdminUISequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
+AdminUISequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
+AdminUISequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
+AdvtExecuteSequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
+AdvtExecuteSequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
+AdvtExecuteSequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
+AdvtUISequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
+AdvtUISequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
+AdvtUISequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
+AppId	ActivateAtStorage	Y	0	1					
+AppId	AppId	N					Guid		
+AppId	DllSurrogate	Y					Text		
+AppId	LocalService	Y					Text		
+AppId	RemoteServerName	Y					Formatted		
+AppId	RunAsInteractiveUser	Y	0	1					
+AppId	ServiceParameters	Y					Text		
+AppSearch	Property	N					Identifier		The property associated with a Signature
+AppSearch	Signature_	N			Signature;RegLocator;IniLocator;DrLocator;CompLocator	1	Identifier		The Signature_ represents a unique file signature and is also the foreign key in the Signature,  RegLocator, IniLocator, CompLocator and the DrLocator tables.
+BBControl	Attributes	Y	0	2147483647					A 32-bit word that specifies the attribute flags to be applied to this control.
+BBControl	BBControl	N					Identifier		Name of the control. This name must be unique within a billboard, but can repeat on different billboard.
+BBControl	Billboard_	N			Billboard	1	Identifier		External key to the Billboard table, name of the billboard.
+BBControl	Height	N	0	32767					Height of the bounding rectangle of the control.
+BBControl	Text	Y					Text		A string used to set the initial text contained within a control (if appropriate).
+BBControl	Type	N					Identifier		The type of the control.
+BBControl	Width	N	0	32767					Width of the bounding rectangle of the control.
+BBControl	X	N	0	32767					Horizontal coordinate of the upper left corner of the bounding rectangle of the control.
+BBControl	Y	N	0	32767					Vertical coordinate of the upper left corner of the bounding rectangle of the control.
+Billboard	Action	Y					Identifier		The name of an action. The billboard is displayed during the progress messages received from this action.
+Billboard	Billboard	N					Identifier		Name of the billboard.
+Billboard	Feature_	N			Feature	1	Identifier		An external key to the Feature Table. The billboard is shown only if this feature is being installed.
+Billboard	Ordering	Y	0	32767					A positive integer. If there is more than one billboard corresponding to an action they will be shown in the order defined by this column.
+Binary	Data	N					Binary		The unformatted binary data.
+Binary	Name	N					Identifier		Unique key identifying the binary data.
+BindImage	File_	N			File	1	Identifier		The index into the File table. This must be an executable file.
+BindImage	Path	Y					Paths		A list of ;  delimited paths that represent the paths to be searched for the import DLLS. The list is usually a list of properties each enclosed within square brackets [] .
+CCPSearch	Signature_	N			Signature;RegLocator;IniLocator;DrLocator;CompLocator	1	Identifier		The Signature_ represents a unique file signature and is also the foreign key in the Signature,  RegLocator, IniLocator, CompLocator and the DrLocator tables.
+CheckBox	Property	N					Identifier		A named property to be tied to the item.
+CheckBox	Value	Y					Formatted		The value string associated with the item.
+Class	AppId_	Y			AppId	1	Guid		Optional AppID containing DCOM information for associated application (string GUID).
+Class	Argument	Y					Formatted		optional argument for LocalServers.
+Class	Attributes	Y		32767					Class registration attributes.
+Class	CLSID	N					Guid		The CLSID of an OLE factory.
+Class	Component_	N			Component	1	Identifier		Required foreign key into the Component Table, specifying the component for which to return a path when called through LocateComponent.
+Class	Context	N					Identifier		The numeric server context for this server. CLSCTX_xxxx
+Class	DefInprocHandler	Y					Filename	1;2;3	Optional default inproc handler.  Only optionally provided if Context=CLSCTX_LOCAL_SERVER.  Typically "ole32.dll" or "mapi32.dll"
+Class	Description	Y					Text		Localized description for the Class.
+Class	Feature_	N			Feature	1	Identifier		Required foreign key into the Feature Table, specifying the feature to validate or install in order for the CLSID factory to be operational.
+Class	FileTypeMask	Y					Text		Optional string containing information for the HKCRthis CLSID) key. If multiple patterns exist, they must be delimited by a semicolon, and numeric subkeys will be generated: 0,1,2...
+Class	Icon_	Y			Icon	1	Identifier		Optional foreign key into the Icon Table, specifying the icon file associated with this CLSID. Will be written under the DefaultIcon key.
+Class	IconIndex	Y	-32767	32767					Optional icon index.
+Class	ProgId_Default	Y			ProgId	1	Text		Optional ProgId associated with this CLSID.
+ComboBox	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list.The integers do not have to be consecutive.
+ComboBox	Property	N					Identifier		A named property to be tied to this item. All the items tied to the same property become part of the same combobox.
+ComboBox	Text	Y					Formatted		The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.
+ComboBox	Value	N					Formatted		The value string associated with this item. Selecting the line will set the associated property to this value.
+CompLocator	ComponentId	N					Guid		A string GUID unique to this component, version, and language.
+CompLocator	Signature_	N					Identifier		The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table.
+CompLocator	Type	Y	0	1					A boolean value that determines if the registry value is a filename or a directory location.
+Complus	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the ComPlus component.
+Complus	ExpType	Y	0	32767					ComPlus component attributes.
+Component	Attributes	N							Remote execution option, one of irsEnum
+Component	Component	N					Identifier		Primary key used to identify a particular component record.
+Component	ComponentId	Y					Guid		A string GUID unique to this component, version, and language.
+Component	Condition	Y					Condition		A conditional statement that will disable this component if the specified condition evaluates to the 'True' state. If a component is disabled, it will not be installed, regardless of the 'Action' state associated with the component.
+Component	Directory_	N			Directory	1	Identifier		Required key of a Directory table record. This is actually a property name whose value contains the actual path, set either by the AppSearch action or with the default setting obtained from the Directory table.
+Component	KeyPath	Y			File;Registry;ODBCDataSource	1	Identifier		Either the primary key into the File table, Registry table, or ODBCDataSource table. This extract path is stored when the component is installed, and is used to detect the presence of the component and to return the path to it.
+Condition	Condition	Y					Condition		Expression evaluated to determine if Level in the Feature table is to change.
+Condition	Feature_	N			Feature	1	Identifier		Reference to a Feature entry in Feature table.
+Condition	Level	N	0	32767					New selection Level to set in Feature table if Condition evaluates to TRUE.
+Control	Attributes	Y	0	2147483647					A 32-bit word that specifies the attribute flags to be applied to this control.
+Control	Control	N					Identifier		Name of the control. This name must be unique within a dialog, but can repeat on different dialogs. 
+Control	Control_Next	Y			Control	2	Identifier		The name of an other control on the same dialog. This link defines the tab order of the controls. The links have to form one or more cycles!
+Control	Dialog_	N			Dialog	1	Identifier		External key to the Dialog table, name of the dialog.
+Control	Height	N	0	32767					Height of the bounding rectangle of the control.
+Control	Help	Y					Text		The help strings used with the button. The text is optional. 
+Control	Property	Y					Identifier		The name of a defined property to be linked to this control. 
+Control	Text	Y					Formatted		A string used to set the initial text contained within a control (if appropriate).
+Control	Type	N					Identifier		The type of the control.
+Control	Width	N	0	32767					Width of the bounding rectangle of the control.
+Control	X	N	0	32767					Horizontal coordinate of the upper left corner of the bounding rectangle of the control.
+Control	Y	N	0	32767					Vertical coordinate of the upper left corner of the bounding rectangle of the control.
+ControlCondition	Action	N						Default;Disable;Enable;Hide;Show	The desired action to be taken on the specified control.
+ControlCondition	Condition	N					Condition		A standard conditional statement that specifies under which conditions the action should be triggered.
+ControlCondition	Control_	N			Control	2	Identifier		A foreign key to the Control table, name of the control.
+ControlCondition	Dialog_	N			Dialog	1	Identifier		A foreign key to the Dialog table, name of the dialog.
+ControlEvent	Argument	N					Formatted		A value to be used as a modifier when triggering a particular event.
+ControlEvent	Condition	Y					Condition		A standard conditional statement that specifies under which conditions an event should be triggered.
+ControlEvent	Control_	N			Control	2	Identifier		A foreign key to the Control table, name of the control
+ControlEvent	Dialog_	N			Dialog	1	Identifier		A foreign key to the Dialog table, name of the dialog.
+ControlEvent	Event	N					Formatted		An identifier that specifies the type of the event that should take place when the user interacts with control specified by the first two entries.
+ControlEvent	Ordering	Y	0	2147483647					An integer used to order several events tied to the same control. Can be left blank.
+CreateFolder	Component_	N			Component	1	Identifier		Foreign key into the Component table.
+CreateFolder	Directory_	N			Directory	1	Identifier		Primary key, could be foreign key into the Directory table.
+CustomAction	Action	N					Identifier		Primary key, name of action, normally appears in sequence table unless private use.
+CustomAction	Source	Y					CustomSource		The table reference of the source of the code.
+CustomAction	Target	Y					Formatted		Excecution parameter, depends on the type of custom action
+CustomAction	Type	N	1	32767					The numeric custom action type, consisting of source location, code type, entry, option flags.
+Dialog	Attributes	Y	0	2147483647					A 32-bit word that specifies the attribute flags to be applied to this dialog.
+Dialog	Control_Cancel	Y			Control	2	Identifier		Defines the cancel control. Hitting escape or clicking on the close icon on the dialog is equivalent to pushing this button.
+Dialog	Control_Default	Y			Control	2	Identifier		Defines the default control. Hitting return is equivalent to pushing this button.
+Dialog	Control_First	N			Control	2	Identifier		Defines the control that has the focus when the dialog is created.
+Dialog	Dialog	N					Identifier		Name of the dialog.
+Dialog	HCentering	N	0	100					Horizontal position of the dialog on a 0-100 scale. 0 means left end, 100 means right end of the screen, 50 center.
+Dialog	Height	N	0	32767					Height of the bounding rectangle of the dialog.
+Dialog	Title	Y					Formatted		A text string specifying the title to be displayed in the title bar of the dialog's window.
+Dialog	VCentering	N	0	100					Vertical position of the dialog on a 0-100 scale. 0 means top end, 100 means bottom end of the screen, 50 center.
+Dialog	Width	N	0	32767					Width of the bounding rectangle of the dialog.
+Directory	DefaultDir	N					DefaultDir		The default sub-path under parent's path.
+Directory	Directory	N					Identifier		Unique identifier for directory entry, primary key. If a property by this name is defined, it contains the full path to the directory.
+Directory	Directory_Parent	Y			Directory	1	Identifier		Reference to the entry in this table specifying the default parent directory. A record parented to itself or with a Null parent represents a root of the install tree.
+DrLocator	Depth	Y	0	32767					The depth below the path to which the Signature_ is recursively searched. If absent, the depth is assumed to be 0.
+DrLocator	Parent	Y					Identifier		The parent file signature. It is also a foreign key in the Signature table. If null and the Path column does not expand to a full path, then all the fixed drives of the user system are searched using the Path.
+DrLocator	Path	Y					AnyPath		The path on the user system. This is a either a subpath below the value of the Parent or a full path. The path may contain properties enclosed within [ ] that will be expanded.
+DrLocator	Signature_	N					Identifier		The Signature_ represents a unique file signature and is also the foreign key in the Signature table.
+DuplicateFile	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the duplicate file.
+DuplicateFile	DestFolder	Y					Identifier		Name of a property whose value is assumed to resolve to the full pathname to a destination folder.
+DuplicateFile	DestName	Y					Filename		Filename to be given to the duplicate file.
+DuplicateFile	File_	N			File	1	Identifier		Foreign key referencing the source file to be duplicated.
+DuplicateFile	FileKey	N					Identifier		Primary key used to identify a particular file entry
+Environment	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the environmental value.
+Environment	Environment	N					Identifier		Unique identifier for the environmental variable setting
+Environment	Name	N					Text		The name of the environmental value.
+Environment	Value	Y					Formatted		The value to set in the environmental settings.
+Error	Error	N	0	32767					Integer error number, obtained from header file IError(...) macros.
+Error	Message	Y					Template		Error formatting template, obtained from user ed. or localizers.
+EventMapping	Attribute	N					Identifier		The name of the control attribute, that is set when this event is received.
+EventMapping	Control_	N			Control	2	Identifier		A foreign key to the Control table, name of the control.
+EventMapping	Dialog_	N			Dialog	1	Identifier		A foreign key to the Dialog table, name of the Dialog.
+EventMapping	Event	N					Identifier		An identifier that specifies the type of the event that the control subscribes to.
+Extension	Component_	N			Component	1	Identifier		Required foreign key into the Component Table, specifying the component for which to return a path when called through LocateComponent.
+Extension	Extension	N					Text		The extension associated with the table row.
+Extension	Feature_	N			Feature	1	Identifier		Required foreign key into the Feature Table, specifying the feature to validate or install in order for the CLSID factory to be operational.
+Extension	MIME_	Y			MIME	1	Text		Optional Context identifier, typically "type/format" associated with the extension
+Extension	ProgId_	Y			ProgId	1	Text		Optional ProgId associated with this extension.
+Feature	Attributes	N						0;1;2;4;5;6;8;9;10;16;17;18;20;21;22;24;25;26;32;33;34;36;37;38;48;49;50;52;53;54	Feature attributes
+Feature	Description	Y					Text		Longer descriptive text describing a visible feature item.
+Feature	Directory_	Y			Directory	1	UpperCase		The name of the Directory that can be configured by the UI. A non-null value will enable the browse button.
+Feature	Display	Y	0	32767					Numeric sort order, used to force a specific display ordering.
+Feature	Feature	N					Identifier		Primary key used to identify a particular feature record.
+Feature	Feature_Parent	Y			Feature	1	Identifier		Optional key of a parent record in the same table. If the parent is not selected, then the record will not be installed. Null indicates a root item.
+Feature	Level	N	0	32767					The install level at which record will be initially selected. An install level of 0 will disable an item and prevent its display.
+Feature	Title	Y					Text		Short text identifying a visible feature item.
+FeatureComponents	Component_	N			Component	1	Identifier		Foreign key into Component table.
+FeatureComponents	Feature_	N			Feature	1	Identifier		Foreign key into Feature table.
+File	Attributes	Y	0	32767					Integer containing bit flags representing file attributes (with the decimal value of each bit position in parentheses)
+File	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the file.
+File	File	N					Identifier		Primary key, non-localized token, must match identifier in cabinet.  For uncompressed files, this field is ignored.
+File	FileName	N					Filename		File name used for installation, may be localized.  This may contain a "short name|long name" pair.
+File	FileSize	N	0	2147483647					Size of file in bytes (long integer).
+File	Language	Y					Language		List of decimal language Ids, comma-separated if more than one.
+File	Sequence	N	1	2147483647					Sequence with respect to the media images; order must track cabinet order.
+File	Version	Y			File	1	Version		Version string for versioned files;  Blank for unversioned files.
+FileSFPCatalog	File_	N			File	1	Identifier		File associated with the catalog
+FileSFPCatalog	SFPCatalog_	N			SFPCatalog	1	Filename		Catalog associated with the file
+Font	File_	N			File	1	Identifier		Primary key, foreign key into File table referencing font file.
+Font	FontTitle	Y					Text		Font name.
+Icon	Data	N					Binary		Binary stream. The binary icon data in PE (.DLL or .EXE) or icon (.ICO) format.
+Icon	Name	N					Identifier		Primary key. Name of the icon file.
+IniFile	Action	N						0;1;3	The type of modification to be made, one of iifEnum
+IniFile	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the .INI value.
+IniFile	DirProperty	Y					Identifier		Foreign key into the Directory table denoting the directory where the .INI file is.
+IniFile	FileName	N					Filename		The .INI file name in which to write the information
+IniFile	IniFile	N					Identifier		Primary key, non-localized token.
+IniFile	Key	N					Formatted		The .INI file key below Section.
+IniFile	Section	N					Formatted		The .INI file Section.
+IniFile	Value	N					Formatted		The value to be written.
+IniLocator	Field	Y	0	32767					The field in the .INI line. If Field is null or 0 the entire line is read.
+IniLocator	FileName	N					Filename		The .INI file name.
+IniLocator	Key	N					Text		Key value (followed by an equals sign in INI file).
+IniLocator	Section	N					Text		Section name within in file (within square brackets in INI file).
+IniLocator	Signature_	N					Identifier		The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table.
+IniLocator	Type	Y	0	2					An integer value that determines if the .INI value read is a filename or a directory location or to be used as is w/o interpretation.
+InstallExecuteSequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
+InstallExecuteSequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
+InstallExecuteSequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
+InstallUISequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
+InstallUISequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
+InstallUISequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
+IsolatedComponent	Component_Application	N			Component	1	Identifier		Key to Component table item for application
+IsolatedComponent	Component_Shared	N			Component	1	Identifier		Key to Component table item to be isolated
+LaunchCondition	Condition	N					Condition		Expression which must evaluate to TRUE in order for install to commence.
+LaunchCondition	Description	N					Formatted		Localizable text to display when condition fails and install must abort.
+ListBox	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list..The integers do not have to be consecutive.
+ListBox	Property	N					Identifier		A named property to be tied to this item. All the items tied to the same property become part of the same listbox.
+ListBox	Text	Y					Text		The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.
+ListBox	Value	N					Formatted		The value string associated with this item. Selecting the line will set the associated property to this value.
+ListView	Binary_	Y			Binary	1	Identifier		The name of the icon to be displayed with the icon. The binary information is looked up from the Binary Table.
+ListView	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list..The integers do not have to be consecutive.
+ListView	Property	N					Identifier		A named property to be tied to this item. All the items tied to the same property become part of the same listview.
+ListView	Text	Y					Text		The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.
+ListView	Value	N					Identifier		The value string associated with this item. Selecting the line will set the associated property to this value.
+LockPermissions	Domain	Y					Formatted		Domain name for user whose permissions are being set. (usually a property)
+LockPermissions	LockObject	N					Identifier		Foreign key into Registry or File table
+LockPermissions	Permission	Y	-2147483647	2147483647					Permission Access mask.  Full Control = 268435456 (GENERIC_ALL = 0x10000000)
+LockPermissions	Table	N					Identifier	Directory;File;Registry	Reference to another table name
+LockPermissions	User	N					Formatted		User for permissions to be set.  (usually a property)
+Media	Cabinet	Y					Cabinet		If some or all of the files stored on the media are compressed in a cabinet, the name of that cabinet.
+Media	DiskId	N	1	32767					Primary key, integer to determine sort order for table.
+Media	DiskPrompt	Y					Text		Disk name: the visible text actually printed on the disk.  This will be used to prompt the user when this disk needs to be inserted.
+Media	LastSequence	N	0	32767					File sequence number for the last file for this media.
+Media	Source	Y					Property		The property defining the location of the cabinet file.
+Media	VolumeLabel	Y					Text		The label attributed to the volume.
+MIME	CLSID	Y					Guid		Optional associated CLSID.
+MIME	ContentType	N					Text		Primary key. Context identifier, typically "type/format".
+MIME	Extension_	N			Extension	1	Text		Optional associated extension (without dot)
+ModuleAdminExecuteSequence	Action	N					Identifier		Action to insert
+ModuleAdminExecuteSequence	After	Y	0	1					Before (0) or After (1)
+ModuleAdminExecuteSequence	BaseAction	Y			ModuleAdminExecuteSequence	1	Identifier		Base action to determine insert location.
+ModuleAdminExecuteSequence	Condition	Y					Condition		
+ModuleAdminExecuteSequence	Sequence	Y	-4	32767					Standard Sequence number
+ModuleAdminUISequence	Action	N					Identifier		Action to insert
+ModuleAdminUISequence	After	Y	0	1					Before (0) or After (1)
+ModuleAdminUISequence	BaseAction	Y			ModuleAdminUISequence	1	Identifier		Base action to determine insert location.
+ModuleAdminUISequence	Condition	Y					Condition		
+ModuleAdminUISequence	Sequence	Y	-4	32767					Standard Sequence number
+ModuleAdvtExecuteSequence	Action	N					Identifier		Action to insert
+ModuleAdvtExecuteSequence	After	Y	0	1					Before (0) or After (1)
+ModuleAdvtExecuteSequence	BaseAction	Y			ModuleAdvtExecuteSequence	1	Identifier		Base action to determine insert location.
+ModuleAdvtExecuteSequence	Condition	Y					Condition		
+ModuleAdvtExecuteSequence	Sequence	Y	-4	32767					Standard Sequence number
+ModuleAdvtUISequence	Action	N					Identifier		Action to insert
+ModuleAdvtUISequence	After	Y	0	1					Before (0) or After (1)
+ModuleAdvtUISequence	BaseAction	Y			ModuleAdvtUISequence	1	Identifier		Base action to determine insert location.
+ModuleAdvtUISequence	Condition	Y					Condition		
+ModuleAdvtUISequence	Sequence	Y	-4	32767					Standard Sequence number
+ModuleComponents	Component	N			Component	1	Identifier		Component contained in the module.
+ModuleComponents	Language	N			ModuleSignature	2			Default language ID for module (may be changed by transform).
+ModuleComponents	ModuleID	N			ModuleSignature	1	Identifier		Module containing the component.
+ModuleDependency	ModuleID	N			ModuleSignature	1	Identifier		Module requiring the dependency.
+ModuleDependency	ModuleLanguage	N			ModuleSignature	2			Language of module requiring the dependency.
+ModuleDependency	RequiredID	N							String.GUID of required module.
+ModuleDependency	RequiredLanguage	N							LanguageID of the required module.
+ModuleDependency	RequiredVersion	Y					Version		Version of the required version.
+ModuleExclusion	ExcludedID	N							String.GUID of excluded module.
+ModuleExclusion	ExcludedLanguage	N							Language of excluded module.
+ModuleExclusion	ExcludedMaxVersion	Y					Version		Maximum version of excluded module.
+ModuleExclusion	ExcludedMinVersion	Y					Version		Minimum version of excluded module.
+ModuleExclusion	ModuleID	N			ModuleSignature	1	Identifier		String.GUID of module with exclusion requirement.
+ModuleExclusion	ModuleLanguage	N			ModuleSignature	2			LanguageID of module with exclusion requirement.
+ModuleIgnoreTable	Table	N					Identifier		Table name to ignore during merge operation.
+ModuleInstallExecuteSequence	Action	N					Identifier		Action to insert
+ModuleInstallExecuteSequence	After	Y	0	1					Before (0) or After (1)
+ModuleInstallExecuteSequence	BaseAction	Y			ModuleInstallExecuteSequence	1	Identifier		Base action to determine insert location.
+ModuleInstallExecuteSequence	Condition	Y					Condition		
+ModuleInstallExecuteSequence	Sequence	Y	-4	32767					Standard Sequence number
+ModuleInstallUISequence	Action	N					Identifier		Action to insert
+ModuleInstallUISequence	After	Y	0	1					Before (0) or After (1)
+ModuleInstallUISequence	BaseAction	Y			ModuleInstallUISequence	1	Identifier		Base action to determine insert location.
+ModuleInstallUISequence	Condition	Y					Condition		
+ModuleInstallUISequence	Sequence	Y	-4	32767					Standard Sequence number
+ModuleSignature	Language	N							Default decimal language of module.
+ModuleSignature	ModuleID	N					Identifier		Module identifier (String.GUID).
+ModuleSignature	Version	N					Version		Version of the module.
+MoveFile	Component_	N			Component	1	Identifier		If this component is not "selected" for installation or removal, no action will be taken on the associated MoveFile entry
+MoveFile	DestFolder	N					Identifier		Name of a property whose value is assumed to resolve to the full path to the destination directory
+MoveFile	DestName	Y					Filename		Name to be given to the original file after it is moved or copied.  If blank, the destination file will be given the same name as the source file
+MoveFile	FileKey	N					Identifier		Primary key that uniquely identifies a particular MoveFile record
+MoveFile	Options	N	0	1					Integer value specifying the MoveFile operating mode, one of imfoEnum
+MoveFile	SourceFolder	Y					Identifier		Name of a property whose value is assumed to resolve to the full path to the source directory
+MoveFile	SourceName	Y					Text		Name of the source file(s) to be moved or copied.  Can contain the '*' or '?' wildcards.
+MsiAssembly	Attributes	Y							Assembly attributes
+MsiAssembly	Component_	N			Component	1	Identifier		Foreign key into Component table.
+MsiAssembly	Feature_	N			Feature	1	Identifier		Foreign key into Feature table.
+MsiAssembly	File_Application	Y			File	1	Identifier		Foreign key into File table, denoting the application context for private assemblies. Null for global assemblies.
+MsiAssembly	File_Manifest	Y			File	1	Identifier		Foreign key into the File table denoting the manifest file for the assembly.
+MsiAssemblyName	Component_	N			Component	1	Identifier		Foreign key into Component table.
+MsiAssemblyName	Name	N					Text		The name part of the name-value pairs for the assembly name.
+MsiAssemblyName	Value	N					Text		The value part of the name-value pairs for the assembly name.
+MsiDigitalCertificate	CertData	N					Binary		A certificate context blob for a signer certificate
+MsiDigitalCertificate	DigitalCertificate	N					Identifier		A unique identifier for the row
+MsiDigitalSignature	DigitalCertificate_	N			MsiDigitalCertificate	1	Identifier		Foreign key to MsiDigitalCertificate table identifying the signer certificate
+MsiDigitalSignature	Hash	Y					Binary		The encoded hash blob from the digital signature
+MsiDigitalSignature	SignObject	N					Text		Foreign key to Media table
+MsiDigitalSignature	Table	N						Media	Reference to another table name (only Media table is supported)
+MsiFileHash	File_	N			File	1	Identifier		Primary key, foreign key into File table referencing file with this hash
+MsiFileHash	HashPart1	N							Size of file in bytes (long integer).
+MsiFileHash	HashPart2	N							Size of file in bytes (long integer).
+MsiFileHash	HashPart3	N							Size of file in bytes (long integer).
+MsiFileHash	HashPart4	N							Size of file in bytes (long integer).
+MsiFileHash	Options	N	0	32767					Various options and attributes for this hash.
+ODBCAttribute	Attribute	N					Text		Name of ODBC driver attribute
+ODBCAttribute	Driver_	N			ODBCDriver	1	Identifier		Reference to ODBC driver in ODBCDriver table
+ODBCAttribute	Value	Y					Text		Value for ODBC driver attribute
+ODBCDataSource	Component_	N			Component	1	Identifier		Reference to associated component
+ODBCDataSource	DataSource	N					Identifier		Primary key, non-localized.internal token for data source
+ODBCDataSource	Description	N					Text		Text used as registered name for data source
+ODBCDataSource	DriverDescription	N					Text		Reference to driver description, may be existing driver
+ODBCDataSource	Registration	N	0	1					Registration option: 0=machine, 1=user, others t.b.d.
+ODBCDriver	Component_	N			Component	1	Identifier		Reference to associated component
+ODBCDriver	Description	N					Text		Text used as registered name for driver, non-localized
+ODBCDriver	Driver	N					Identifier		Primary key, non-localized.internal token for driver
+ODBCDriver	File_	N			File	1	Identifier		Reference to key driver file
+ODBCDriver	File_Setup	Y			File	1	Identifier		Optional reference to key driver setup DLL
+ODBCSourceAttribute	Attribute	N					Text		Name of ODBC data source attribute
+ODBCSourceAttribute	DataSource_	N			ODBCDataSource	1	Identifier		Reference to ODBC data source in ODBCDataSource table
+ODBCSourceAttribute	Value	Y					Text		Value for ODBC data source attribute
+ODBCTranslator	Component_	N			Component	1	Identifier		Reference to associated component
+ODBCTranslator	Description	N					Text		Text used as registered name for translator
+ODBCTranslator	File_	N			File	1	Identifier		Reference to key translator file
+ODBCTranslator	File_Setup	Y			File	1	Identifier		Optional reference to key translator setup DLL
+ODBCTranslator	Translator	N					Identifier		Primary key, non-localized.internal token for translator
+Patch	Attributes	N	0	32767					Integer containing bit flags representing patch attributes
+Patch	File_	N					Identifier		Primary key, non-localized token, foreign key to File table, must match identifier in cabinet.
+Patch	Header	Y					Binary		Binary stream. The patch header, used for patch validation.
+Patch	PatchSize	N	0	2147483647					Size of patch in bytes (long integer).
+Patch	Sequence	N	0	32767					Primary key, sequence with respect to the media images; order must track cabinet order.
+PatchPackage	Media_	N	0	32767					Foreign key to DiskId column of Media table. Indicates the disk containing the patch package.
+PatchPackage	PatchId	N					Guid		A unique string GUID representing this patch.
+ProgId	Class_	Y			Class	1	Guid		The CLSID of an OLE factory corresponding to the ProgId.
+ProgId	Description	Y					Text		Localized description for the Program identifier.
+ProgId	Icon_	Y			Icon	1	Identifier		Optional foreign key into the Icon Table, specifying the icon file associated with this ProgId. Will be written under the DefaultIcon key.
+ProgId	IconIndex	Y	-32767	32767					Optional icon index.
+ProgId	ProgId	N					Text		The Program Identifier. Primary key.
+ProgId	ProgId_Parent	Y			ProgId	1	Text		The Parent Program Identifier. If specified, the ProgId column becomes a version independent prog id.
+Property	Property	N					Identifier		Name of property, uppercase if settable by launcher or loader.
+Property	Value	N					Text		String value for property.  Never null or empty.
+PublishComponent	AppData	Y					Text		This is localisable Application specific data that can be associated with a Qualified Component.
+PublishComponent	Component_	N			Component	1	Identifier		Foreign key into the Component table.
+PublishComponent	ComponentId	N					Guid		A string GUID that represents the component id that will be requested by the alien product.
+PublishComponent	Feature_	N			Feature	1	Identifier		Foreign key into the Feature table.
+PublishComponent	Qualifier	N					Text		This is defined only when the ComponentId column is an Qualified Component Id. This is the Qualifier for ProvideComponentIndirect.
+RadioButton	Height	N	0	32767					The height of the button.
+RadioButton	Help	Y					Text		The help strings used with the button. The text is optional.
+RadioButton	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list..The integers do not have to be consecutive.
+RadioButton	Property	N					Identifier		A named property to be tied to this radio button. All the buttons tied to the same property become part of the same group.
+RadioButton	Text	Y					Text		The visible title to be assigned to the radio button.
+RadioButton	Value	N					Formatted		The value string associated with this button. Selecting the button will set the associated property to this value.
+RadioButton	Width	N	0	32767					The width of the button.
+RadioButton	X	N	0	32767					The horizontal coordinate of the upper left corner of the bounding rectangle of the radio button.
+RadioButton	Y	N	0	32767					The vertical coordinate of the upper left corner of the bounding rectangle of the radio button.
+Reg64	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
+Reg64	Key	N					RegPath		The key for the registry value.
+Reg64	Name	Y					Formatted		The registry value name.
+Reg64	Registry	N					Identifier		Primary key, non-localized token.
+Reg64	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum.
+Reg64	Value	Y					Formatted		The registry value.
+Registry	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
+Registry	Key	N					RegPath		The key for the registry value.
+Registry	Name	Y					Formatted		The registry value name.
+Registry	Registry	N					Identifier		Primary key, non-localized token.
+Registry	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum.
+Registry	Value	Y					Formatted		The registry value.
+RegLocator	Key	N					RegPath		The key for the registry value.
+RegLocator	Name	Y					Formatted		The registry value name.
+RegLocator	Root	N	0	3					The predefined root key for the registry value, one of rrkEnum.
+RegLocator	Signature_	N					Identifier		The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table. If the type is 0, the registry values refers a directory, and _Signature is not a foreign key.
+RegLocator	Type	Y	0	18					An integer value that determines if the registry value is a filename or a directory location or to be used as is w/o interpretation.
+RemoveFile	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the file to be removed.
+RemoveFile	DirProperty	N					Identifier		Name of a property whose value is assumed to resolve to the full pathname to the folder of the file to be removed.
+RemoveFile	FileKey	N					Identifier		Primary key used to identify a particular file entry
+RemoveFile	FileName	Y					WildCardFilename		Name of the file to be removed.
+RemoveFile	InstallMode	N						1;2;3	Installation option, one of iimEnum.
+RemoveIniFile	Action	N						2;4	The type of modification to be made, one of iifEnum.
+RemoveIniFile	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the deletion of the .INI value.
+RemoveIniFile	DirProperty	Y					Identifier		Foreign key into the Directory table denoting the directory where the .INI file is.
+RemoveIniFile	FileName	N					Filename		The .INI file name in which to delete the information
+RemoveIniFile	Key	N					Formatted		The .INI file key below Section.
+RemoveIniFile	RemoveIniFile	N					Identifier		Primary key, non-localized token.
+RemoveIniFile	Section	N					Formatted		The .INI file Section.
+RemoveIniFile	Value	Y					Formatted		The value to be deleted. The value is required when Action is iifIniRemoveTag
+RemoveRegistry	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the deletion of the registry value.
+RemoveRegistry	Key	N					RegPath		The key for the registry value.
+RemoveRegistry	Name	Y					Formatted		The registry value name.
+RemoveRegistry	RemoveRegistry	N					Identifier		Primary key, non-localized token.
+RemoveRegistry	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum
+ReserveCost	Component_	N			Component	1	Identifier		Reserve a specified amount of space if this component is to be installed.
+ReserveCost	ReserveFolder	Y					Identifier		Name of a property whose value is assumed to resolve to the full path to the destination directory
+ReserveCost	ReserveKey	N					Identifier		Primary key that uniquely identifies a particular ReserveCost record
+ReserveCost	ReserveLocal	N	0	2147483647					Disk space to reserve if linked component is installed locally.
+ReserveCost	ReserveSource	N	0	2147483647					Disk space to reserve if linked component is installed to run from the source location.
+SelfReg	Cost	Y	0	32767					The cost of registering the module.
+SelfReg	File_	N			File	1	Identifier		Foreign key into the File table denoting the module that needs to be registered.
+ServiceControl	Arguments	Y					Formatted		Arguments for the service.  Separate by [~].
+ServiceControl	Component_	N			Component	1	Identifier		Required foreign key into the Component Table that controls the startup of the service
+ServiceControl	Event	N	0	187					Bit field:  Install:  0x1 = Start, 0x2 = Stop, 0x8 = Delete, Uninstall: 0x10 = Start, 0x20 = Stop, 0x80 = Delete
+ServiceControl	Name	N					Formatted		Name of a service. /, \, comma and space are invalid
+ServiceControl	ServiceControl	N					Identifier		Primary key, non-localized token.
+ServiceControl	Wait	Y	0	1					Boolean for whether to wait for the service to fully start
+ServiceInstall	Arguments	Y					Formatted		Arguments to include in every start of the service, passed to WinMain
+ServiceInstall	Component_	N			Component	1	Identifier		Required foreign key into the Component Table that controls the startup of the service
+ServiceInstall	Dependencies	Y					Formatted		Other services this depends on to start.  Separate by [~], and end with [~][~]
+ServiceInstall	Description	Y					Text		Description of service.
+ServiceInstall	DisplayName	Y					Formatted		External Name of the Service
+ServiceInstall	ErrorControl	N	-2147483647	2147483647					Severity of error if service fails to start
+ServiceInstall	LoadOrderGroup	Y					Formatted		LoadOrderGroup
+ServiceInstall	Name	N					Formatted		Internal Name of the Service
+ServiceInstall	Password	Y					Formatted		password to run service with.  (with StartName)
+ServiceInstall	ServiceInstall	N					Identifier		Primary key, non-localized token.
+ServiceInstall	ServiceType	N	-2147483647	2147483647					Type of the service
+ServiceInstall	StartName	Y					Formatted		User or object name to run service as
+ServiceInstall	StartType	N	0	4					Type of the service
+SFPCatalog	Catalog	N					Binary		SFP Catalog
+SFPCatalog	Dependency	Y					Formatted		Parent catalog - only used by SFP
+SFPCatalog	SFPCatalog	N					Filename		File name for the catalog.
+Shortcut	Arguments	Y					Formatted		The command-line arguments for the shortcut.
+Shortcut	Component_	N			Component	1	Identifier		Foreign key into the Component table denoting the component whose selection gates the the shortcut creation/deletion.
+Shortcut	Description	Y					Text		The description for the shortcut.
+Shortcut	Directory_	N			Directory	1	Identifier		Foreign key into the Directory table denoting the directory where the shortcut file is created.
+Shortcut	Hotkey	Y	0	32767					The hotkey for the shortcut. It has the virtual-key code for the key in the low-order byte, and the modifier flags in the high-order byte. 
+Shortcut	Icon_	Y			Icon	1	Identifier		Foreign key into the File table denoting the external icon file for the shortcut.
+Shortcut	IconIndex	Y	-32767	32767					The icon index for the shortcut.
+Shortcut	Name	N					Filename		The name of the shortcut to be created.
+Shortcut	Shortcut	N					Identifier		Primary key, non-localized token.
+Shortcut	ShowCmd	Y						1;3;7	The show command for the application window.The following values may be used.
+Shortcut	Target	N					Shortcut		The shortcut target. This is usually a property that is expanded to a file or a folder that the shortcut points to.
+Shortcut	WkDir	Y					Identifier		Name of property defining location of working directory.
+Signature	FileName	N					Filename		The name of the file. This may contain a "short name|long name" pair.
+Signature	Languages	Y					Language		The languages supported by the file.
+Signature	MaxDate	Y	0	2147483647					The maximum creation date of the file.
+Signature	MaxSize	Y	0	2147483647					The maximum size of the file. 
+Signature	MaxVersion	Y					Text		The maximum version of the file.
+Signature	MinDate	Y	0	2147483647					The minimum creation date of the file.
+Signature	MinSize	Y	0	2147483647					The minimum size of the file.
+Signature	MinVersion	Y					Text		The minimum version of the file.
+Signature	Signature	N					Identifier		The table key. The Signature represents a unique file signature.
+TextStyle	Color	Y	0	16777215					A long integer indicating the color of the string in the RGB format (Red, Green, Blue each 0-255, RGB = R + 256*G + 256^2*B).
+TextStyle	FaceName	N					Text		A string indicating the name of the font used. Required. The string must be at most 31 characters long.
+TextStyle	Size	N	0	32767					The size of the font used. This size is given in our units (1/12 of the system font height). Assuming that the system font is set to 12 point size, this is equivalent to the point size.
+TextStyle	StyleBits	Y	0	15					A combination of style bits.
+TextStyle	TextStyle	N					Identifier		Name of the style. The primary key of this table. This name is embedded in the texts to indicate a style change.
+TypeLib	Component_	N			Component	1	Identifier		Required foreign key into the Component Table, specifying the component for which to return a path when called through LocateComponent.
+TypeLib	Cost	Y	0	2147483647					The cost associated with the registration of the typelib. This column is currently optional.
+TypeLib	Description	Y					Text		
+TypeLib	Directory_	Y			Directory	1	Identifier		Optional. The foreign key into the Directory table denoting the path to the help file for the type library.
+TypeLib	Feature_	N			Feature	1	Identifier		Required foreign key into the Feature Table, specifying the feature to validate or install in order for the type library to be operational.
+TypeLib	Language	N	0	32767					The language of the library.
+TypeLib	LibID	N					Guid		The GUID that represents the library.
+TypeLib	Version	Y	0	16777215					The version of the library. The minor version is in the lower 8 bits of the integer. The major version is in the next 16 bits. 
+UIText	Key	N					Identifier		A unique key that identifies the particular string.
+UIText	Text	Y					Text		The localized version of the string.
+Upgrade	ActionProperty	N					UpperCase		The property to set when a product in this set is found.
+Upgrade	Attributes	N	0	2147483647					The attributes of this product set.
+Upgrade	Language	Y					Language		A comma-separated list of languages for either products in this set or products not in this set.
+Upgrade	Remove	Y					Formatted		The list of features to remove when uninstalling a product from this set.  The default is "ALL".
+Upgrade	UpgradeCode	N					Guid		The UpgradeCode GUID belonging to the products in this set.
+Upgrade	VersionMax	Y					Text		The maximum ProductVersion of the products in this set.  The set may or may not include products with this particular version.
+Upgrade	VersionMin	Y					Text		The minimum ProductVersion of the products in this set.  The set may or may not include products with this particular version.
+Verb	Argument	Y					Formatted		Optional value for the command arguments.
+Verb	Command	Y					Formatted		The command text.
+Verb	Extension_	N			Extension	1	Text		The extension associated with the table row.
+Verb	Sequence	Y	0	32767					Order within the verbs for a particular extension. Also used simply to specify the default verb.
+Verb	Verb	N					Text		The verb for the command.
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/bro_patchcodes.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/bro_patchcodes.txt
new file mode 100644
index 000000000000..cc1c3032930c
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/bro_patchcodes.txt
@@ -0,0 +1,3 @@
+# OpenOffice 2 UpgradeCodes
+
+{1552EC17-8CE9-4E58-A009-991468B8E806}	# OOo UpgradeCode
\ No newline at end of file
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/brodev_patchcodes.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/brodev_patchcodes.txt
new file mode 100644
index 000000000000..daf492715fd5
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/brodev_patchcodes.txt
@@ -0,0 +1,3 @@
+# OpenOffice 2 UpgradeCodes
+
+{D8B206B8-6822-48C2-A799-E35BFD585035}	# OOo UpgradeCode
\ No newline at end of file
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt
new file mode 100644
index 000000000000..b833e912a3b5
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt
@@ -0,0 +1,152 @@
+[PRODUCTCODE]
+en-US = "{0F961BE5-98E8-408E-9F74-23CBA0523922}"
+pt = "{2C127D50-B7E4-46C3-A845-CF6684481024}"
+ru = "{8B523028-4AAC-4607-9711-667AA6C37D45}"
+el = "{F980E77E-21FD-40B8-BE66-8BC60284D24B}"
+nl = "{7FE69A49-6825-47E0-8179-72336E7B4250}"
+fr = "{3BB61EBF-5BC1-4E4D-859F-3ED5D92DD25E}"
+es = "{12A4616B-D51B-4013-964B-0ACCCA5E9AF2}"
+fi = "{89623507-9F44-44CF-BD4C-042F9E26F903}"
+hu = "{2246FA05-4B7A-499B-A19E-AA6599EA28D0}"
+ca = "{9810C5F8-C061-4D02-AD98-049452A5DC76}"
+it = "{2F78D54B-CE1D-4607-AA5B-D52114BDEBDB}"
+cs = "{781C904C-8768-4271-AA69-1A2CFA248002}"
+sk = "{A1D39E12-FF85-4619-BC69-001C55AD5B35}"
+en-GB = "{DD0CE074-E875-4428-991B-A9B3734701F9}"
+da = "{92CA37C8-B2E6-403F-932C-1A33E48BCD7E}"
+sv = "{942C29ED-A013-436E-861C-28271FD60AAE}"
+no = "{0EF3EE40-3690-472E-A693-5C9AE4FA7D5A}"
+pl = "{2A7F7A26-EF8B-4990-8836-688508886215}"
+de = "{5014304D-99B3-4451-8EB3-97D34658E4E7}"
+pt-BR = "{55837A64-5B73-4CDC-8950-AF56E09A7961}"
+th = "{2EEACF3C-C38E-4043-8B4D-33A461083348}"
+et = "{956362F1-C89B-4008-B15F-968BD4023F3F}"
+ja = "{01C118C0-57AB-4745-8D4C-5A34E6677E8D}"
+ko = "{B0DEE1A7-88FC-423B-AA1F-F51D94D02996}"
+zh-CN = "{0C596167-BA94-4D5A-B63B-6566FE06259A}"
+zh-TW = "{C31C87A1-5918-4178-8696-DDD36EDAEE99}"
+tr = "{467D9E65-2614-4D19-B40F-0B12FE6E472F}"
+hi = "{61B2E7EA-DC12-4A51-B152-2B95A4FC2ABF}"
+ar = "{FF72555B-A96D-49F8-8998-9359E9F9F7E1}"
+he = "{F59C6731-12DA-4A46-BE6D-30934E7CD763}"
+multiwestern = "{FA30E08E-DD61-4E47-B3D6-51B2814CA881}"
+multiasia = "{222033CB-A588-4302-9942-311F160B63B1}"
+
+[UPGRADECODE]
+af = "{07F4C39E-72F9-495A-A8DE-8B3691607EA7}"
+ar = "{4B19ECA4-EB7B-420E-A2F3-0D456CA1CA3F}"
+as-IN = "{8B39DB32-6AF6-461F-8289-50655601C8FE}"
+be = "{0EE4C97D-D8C7-441E-866A-CF277858E4E4}"
+bo = "{C8D912D8-AA2E-47E2-9FEF-62C6580FB93C}"
+bg = "{961EFB5A-0CA0-41E8-8C9C-CB3BA52B73EC}"
+br = "{D5D79970-08FA-4CCC-B465-76948149E141}"
+brx = "{13A1CCE8-A020-4F7D-84DE-2FC89E4F0086}"
+bn = "{C552DC5D-BAEE-4707-B090-5BC08E01162F}"
+bn-BD = "{37A07926-2192-4701-908A-D414D26CB864}"
+bn-IN = "{F82875DF-7BFC-4CF1-A7E7-85E5AAD90F07}"
+bs = "{9F84BC57-8E00-4C27-81AA-5CCB6280A98B}"
+by = "{195CFF07-2848-4F7A-9770-98D1419A37F8}"
+ca = "{63DF72A2-1F4E-456E-A4E1-26342034BC19}"
+cs = "{A0B8FD56-2D0D-4487-B999-19D32FCF5F56}"
+cy = "{40487026-D109-40C8-AE09-A5E4147815DE}"
+da = "{6221C926-E7C7-4122-A3E4-66285ACD0B79}"
+de = "{56F769C8-29D9-4DA0-AAC5-6165D0180483}"
+dgo = "{43E5D518-02EA-4C82-AAB5-98954C12109A}"
+dz = "{0E79A6B5-D088-4670-ACDF-E0081C9ABFAE}"
+el = "{1E5DDBF3-B05A-4E78-A496-332C8193F4C8}"
+en-GB = "{3EBBFCD8-8009-4D31-AA5E-C1BED7B17A61}"
+en-US = "{40C2DB8E-E9D6-4451-BE31-DAD1343EC3DF}"
+en-ZA = "{764FA135-A8CE-4C79-A5D7-0B413CC9E911}"
+eo = "{1955D5A5-375E-410F-B84F-9FDB4E6A05E5}"
+es = "{4F776850-4235-4E93-847F-C657E04A35AB}"
+et = "{026CD9C5-6B53-421B-89A9-A5933C3E4BA6}"
+eu = "{B343946D-65A4-418E-B594-AC7035FDA5C2}"
+fa = "{D17D8C22-9161-42BF-A4A3-31248273EFB8}"
+fi = "{B26D2BEF-C380-46DD-8206-DD014E51AE7E}"
+fr = "{D7B9854C-4B88-4AE6-9FF6-7CDD7E8CEB90}"
+ga = "{ADDC53E1-2AFC-4234-A4A2-253C19932351}"
+gd = "{122EB716-EA92-4294-ADFB-4EDCC350E9D9}"
+gl = "{56F49C99-23C1-44C6-8EE3-2DCE72391BF8}"
+gu = "{1B1246FD-B318-49D1-8B5D-9475F55DF033}"
+gu-IN = "{982DC803-C9C1-4D8E-9B9E-A42335A2092E}"
+he = "{363942BE-A51D-43CE-8F09-2D94DFFDBB2E}"
+hi = "{4FFECDE8-8121-43DC-81F7-9FB7C82F24F4}"
+hi-IN = "{DE6A446A-BEC4-450D-94BD-B393B9898E76}"
+hr = "{8BC12666-3F41-43C7-9530-05A5A69A269D}"
+hu = "{63C087E6-5AC1-4C87-B663-6CEC4BD57935}"
+is = "{AD579FC7-4AFF-46A6-A756-110EC862FD17}"
+it = "{E9FFB21F-C41B-4A4C-87D1-885D97FE4D4A}"
+ja = "{D5E8AF54-134D-4370-BEF6-62BD3049C516}"
+kid = "{4A5C3C73-4392-4399-A57C-B0056289FD32}"
+ky = "{7854115C-C451-4BCB-86AC-F2257E60373C}"
+ka = "{5793EE6E-74B2-4965-A790-0C33ACEF75F0}"
+kk = "{BB0063B5-BFFE-4BD8-9FB8-A4778B79E2BC}"
+km = "{D906DD83-52C5-4B45-A887-DABEED8A6936}"
+kn = "{6785479C-863D-4533-9D28-46984FD067BE}"
+ko = "{918E7DC4-5641-4FB6-8A98-F3C0CCDFCC2D}"
+kok = "{4FF53BC0-C0E8-45B0-B7ED-3DE12B7865D2}"
+ks = "{55C379A7-D00F-4174-9073-F08CEF7FA40B}"
+ku = "{3FF9E717-28E4-49E5-96F7-B7EAC7C3890C}"
+lo = "{25F500C7-E3CA-413A-BB45-F298420533CB}"
+lt = "{7D5B38B0-3E15-4F96-AFFE-F8E455CE666B}"
+lv = "{DAC92857-35AC-44E2-BB10-F2F91173128C}"
+mai = "{0DCE1B05-2A48-4485-8C7E-6FBB1003F0F7}"
+mk = "{97BD11C0-13A0-416D-AB9A-9128DBEF707A}"
+mn = "{646294EB-E2E7-4110-B3CF-06D82F2BEE6F}"
+mni = "{2E614D32-5AA3-4525-B2F2-BE6F995F529D}"
+ms = "{7278D44D-9673-4157-AC6F-839520312A42}"
+ml-IN = "{250DC1C1-630E-4AD3-B25B-F57E9CC66572}"
+mr-IN = "{50031E0A-6AA2-43BB-89A7-2341F75B5C91}"
+my = "{C4B4A0EF-3B09-4198-825E-7381653FCF13}"
+ne = "{B4F43785-36D1-4716-AFCF-894B1AF36C1D}"
+nb = "{95CDD114-AB99-47E9-A6CA-C50C7460B1DA}"
+nl = "{E25D3CC2-AC90-4861-9E9C-DA41B5DF8A03}"
+nn = "{8D2FABA5-79CD-4109-A274-DEE14E279233}"
+no = "{226856FB-734F-40FB-BDF3-7DCCA74BCA5E}"
+nr = "{73FB2891-79DB-4F4E-A2B6-EB4A07D2903A}"
+nso = "{BA8033C9-6C42-4D4D-8160-46B6A19C08F9}"
+om = "{AC220121-97DE-4D37-9554-8877DAF713E6}"
+oc = "{E1D22BDB-C23D-4849-88AF-9B05F6B396E1}"
+or-IN = "{A3382AC1-D71B-4C13-BF1C-99C0C9C085A6}"
+pap = "{7E56C1DB-94E0-4C55-8D71-C27B1F971DB5}"
+pa-IN = "{8984AB31-BED3-49EB-92DD-E163B17132B1}"
+pl = "{EF16C1BF-539B-4EEE-91E5-0D44C4B72840}"
+ps = "{030AFC27-901D-4DA7-B651-E4F3F4AEE708}"
+pt = "{EFBDEE97-65AB-4575-B117-976D2EE639D0}"
+pt-BR = "{8EE0FF44-307B-4FDC-85F1-EA178C788FA8}"
+ru = "{2CCF1EF8-A263-4B77-8BDD-92D66B30531F}"
+rw = "{D27E719E-A9E7-4204-92E8-1FE882264F27}"
+sat = "{86E940A4-BE79-4D7C-818F-AE0B190F8AF6}"
+sa-IN = "{1F95BC4C-67F2-42DF-B4C7-A40EF727624A}"
+si = "{49438D51-91A0-4E2C-8415-E48CF3C82DB4}"
+sc = "{03889A8E-008C-438D-A4F8-F220470C182E}"
+sd = "{DDDD2117-DF91-4F9F-B403-9010E9B1A45E}"
+sk = "{31812C7E-CD25-455E-BEDD-F7A5F1E3AA57}"
+sl = "{F4B8D208-4566-4C4D-AFA0-3D2729084555}"
+sh = "{930AEAB7-E847-474A-84FE-FE5C2BCD9CE3}"
+sr = "{8C45020E-085A-44F7-8E13-7B4A94C6925A}"
+ss = "{9F41FCB5-A63D-49C1-A69C-9CBBCE73518D}"
+st = "{00B8BCE0-A647-4DC8-8E58-3D1B4CFF3F0F}"
+sv = "{234E7342-71BD-4B78-946D-06531FD46FA7}"
+sw = "{86433EBB-25D9-41E0-8F56-3DCB9534E027}"
+sw-TZ = "{397132BF-8878-4AD0-8943-1894B41692A1}"
+te-IN = "{A9688928-501B-4435-94A2-3A046C1EF29D}"
+ti-ER = "{293095EC-889D-4426-AE8A-C2E96DE8C78D}"
+ta-IN = "{5A98005B-D78A-41D4-9B2B-FFE739FF6D1A}"
+th = "{58BEC02C-44C7-43D8-BD07-35A866E20AE7}"
+tn = "{DD26B7C9-F027-4AB3-8F98-E8EB4FBA9C89}"
+tr = "{AA132C49-A480-4B5D-AAD3-811362B60A42}"
+ts = "{4BAF4D75-1E1E-4B15-A288-B4527E3C7CEE}"
+tg = "{4175B9EA-56CA-4311-9F96-937EABCEA1C8}"
+ug = "{1D09B009-8003-44FB-B2E1-49387F1112B9}"
+ur-IN = "{A7F4EC06-A6DC-4847-A510-41D435614014}"
+uk = "{52E53AB3-FAE4-4025-9B6F-FA401C9B10AE}"
+uz = "{D551A1C1-AF36-4FE4-BEF4-9CA72267D70A}"
+ve = "{20CA0658-5768-4B9E-8E3B-D9DF58332739}"
+vi = "{67A6C9E2-C285-48E4-A620-40D905E8D3F8}"
+xh = "{BF5684DA-C18A-43CE-B21D-97A7A0FAA486}"
+zh-CN = "{47574572-9963-441B-8A42-0B1A61880608}"
+zh-TW = "{6800BE26-76E9-4280-A174-5A952A18E643}"
+zu = "{65BA1A0C-9D3F-49A2-8ABB-7437C50A0AC7}"
+multiwestern = "{5050975D-CA7F-4F15-A3F5-F0A80B37AC35}"
+multiasia = "{07E6F67B-2A5B-45D7-984D-773F76612B9C}"
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_broo.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_broo.txt
new file mode 100644
index 000000000000..204c6082bad6
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_broo.txt
@@ -0,0 +1,67 @@
+[PRODUCTCODE]
+en-US = "{7FFF1607-39C1-45D7-8D6A-DE97A3FE26A1}"
+pt = "{4BF466E8-7FF4-4422-9FCE-1F0AE3DA00EE}"
+ru = "{34A3166C-BF5E-4751-A52E-CA68C139F688}"
+el = "{614C96E4-DBB0-4EFF-A9BB-2744E75919EB}"
+nl = "{76ABABE4-11C3-4783-BA87-6E76EC58F4DB}"
+fr = "{A8D2F106-57BF-437A-85F2-6FDE96D5E923}"
+es = "{74E55CA0-5F61-4B3F-AFE9-C450C352177F}"
+fi = "{7B47880A-4C73-4052-B41E-9CFDDC09D9B2}"
+hu = "{797671B4-BC60-4171-9084-D97F87B15B99}"
+ca = "{EB478242-B1CC-402C-AAB0-B038446E1BC3}"
+it = "{ED45979C-7EE4-4D04-89C5-489DCEAD1009}"
+cs = "{8DDBA77B-86FB-4AFC-A9CE-7960585108E3}"
+sk = "{7664A926-AA39-4DB6-AE12-98B7305B708B}"
+en-GB = "{4B514E15-F8EB-457D-924E-0C4EA6C29FE5}"
+da = "{6321486D-351A-451F-9C23-FF334A4E41FA}"
+sv = "{76B88102-58E7-4F89-90B9-B21185AA45E5}"
+no = "{1E36FA46-AC57-47FB-94FE-EF7B32B9056C}"
+pl = "{A316E11D-7907-460E-8E64-DEEFCD0F929A}"
+de = "{A3BE065F-8E3B-46CA-946A-101A8E077D2B}"
+pt-BR = "{45B77400-62B3-4469-8B12-A0813B0FE13F}"
+th = "{C37B84EC-EB6B-4909-9866-D582A0E4B27D}"
+et = "{A4107B22-C84B-4783-B1AA-454A884144B7}"
+ja = "{F68C3D57-AB20-4106-B3F2-4A51E8F12D27}"
+ko = "{D6C21010-B224-4121-83BE-BCFD41E2780F}"
+zh-CN = "{D27CE6D1-50E5-4895-8CC0-5D1D25D882F9}"
+zh-TW = "{1203F697-9652-44B2-A806-3F13A53101AC}"
+tr = "{DB6EBF02-F0A5-44ED-AF5C-BF97E2C6570A}"
+hi = "{9BA2E02E-ACFA-4D4A-8F34-12E3F2BA29E5}"
+ar = "{5B8ADBF2-5377-44C7-8ADA-3A3AF516E401}"
+he = "{F893A538-DA46-4667-B580-84DFB3CD5336}"
+multiwestern = "{E954C6C0-1C6E-4BB6-B8F2-F655429E6D73}"
+multiasia = "{881B24EF-5676-481C-B1C4-49964E203329}"
+
+[UPGRADECODE]
+en-US = "{DB4A0242-FD72-41DA-87A2-5466AE05BE03}"
+pt = "{AA393994-0DBE-45A1-8393-BCA1927527F6}"
+ru = "{626BAA92-954C-4A6C-9AF3-F9C146FAEEAB}"
+el = "{B884FE02-C0B1-40A5-9A05-3D92923B10E8}"
+nl = "{83D4730E-7069-4ED8-8D2C-50E2878A84CF}"
+fr = "{2F7D3F37-6191-44BB-8C14-5A0F3D1CDC06}"
+es = "{FCBF48CD-EBE3-4B65-9A9F-C73399CE2BF4}"
+fi = "{CA1322F8-8213-401D-8501-2B70F8F944E0}"
+hu = "{A5FD8B52-2E09-45C5-A84B-67DA1DA8BD93}"
+ca = "{80DD06D1-ABEE-4E85-8C23-E1031FC024B0}"
+it = "{7CA64ED6-373D-4C92-8224-360F1451E828}"
+cs = "{C16BE41C-1534-47E2-9D6F-EE3F45EFB075}"
+sk = "{82ACA684-1BD8-4A22-AC70-5E9754047357}"
+en-GB = "{B2583886-6021-42B5-BB84-71D2C7D9B91E}"
+da = "{953E09D5-4C1E-483A-A792-DD6C9A51D4E9}"
+sv = "{B6DF5C8D-177F-47DE-A9F6-0C6E4FCDF668}"
+no = "{52CFD54B-A5AE-4296-A02C-806083B90FFF}"
+pl = "{9EB27D9C-891F-4B40-A1FA-176D72088860}"
+de = "{73531239-44BD-4EE8-81B1-7EA9A63E2BE1}"
+pt-BR = "{EB286FF5-8182-4F12-8B58-320DABC7472F}"
+th = "{3B67E9E0-7177-420E-AF69-B58A0B9D22D2}"
+et = "{6718E3FB-C936-4699-82C0-E59F45E30D99}"
+ja = "{EDD352F1-431A-4275-A658-C9A516290616}"
+ko = "{69BB5E59-48BC-4906-B700-7E76EAEB076C}"
+zh-CN = "{9D3F52D5-2464-4F4D-9F2A-281B85911F7B}"
+zh-TW = "{8D0A9A70-F424-4FE2-AC27-50F8A409C602}"
+tr = "{CF7A11FA-FE24-427F-979C-016A7E1B2E8E}"
+hi = "{0D1A91F3-4B2D-4893-A720-8795F1DA848B}"
+ar = "{20A9E4BF-6D89-4183-BE25-24C5F693B141}"
+he = "{CC37C202-D6B7-4821-9015-0A25EB4E6CD8}"
+multiwestern = "{B2269A43-2FC5-44AF-A0EE-D85CD2C6135C}"
+multiasia = "{3B4B8C3C-AC32-4644-B7C5-79836EBD6784}"
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt
new file mode 100644
index 000000000000..0564ebc4c0e7
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt
@@ -0,0 +1,152 @@
+[PRODUCTCODE]
+en-US = "{0FA6115B-EB2C-4878-AE77-A6BB9BD95DE3}"
+pt = "{5908E447-DD83-466C-989A-4DD73EEB9E1C}"
+ru = "{A2FA035D-6AD1-4A42-8C94-514862DDF9F1}"
+el = "{ED03F985-453B-4C05-9D4F-5A5DABC5E383}"
+nl = "{3F832B47-935F-45D2-870F-59CBC55EBAF5}"
+fr = "{C96C5113-0A94-4D78-8B56-63335845A6DB}"
+es = "{00393DC6-C022-4013-85D6-7421431A1BBC}"
+fi = "{B2414CEC-4AF1-4943-88F8-C5011A860483}"
+hu = "{F09E48BA-14EE-44B2-9B28-2603A18CE1D6}"
+ca = "{A398A8FC-7E6B-45D0-9869-63D67B38AEEE}"
+it = "{38490E45-A1A0-47CC-971A-F0E4CD27E055}"
+cs = "{2288EAF3-AC96-4EE5-BEFB-1384DC1C4703}"
+sk = "{79B7F92B-168B-4E9D-8944-4AF49DEB0632}"
+en-GB = "{4840BF58-E8E1-4625-9F65-D7A6B26438C7}"
+da = "{DBF68601-B962-4B0F-8791-E91225E6AF4E}"
+sv = "{D9B02C11-188E-4471-8CD7-FB457264A752}"
+no = "{E5694849-306C-4771-8101-521F445918AD}"
+pl = "{C640D2B5-97E7-45C9-9FC6-7866BB6C8F5E}"
+de = "{5A5DE00E-D6F0-426E-A510-AFCD45564AFB}"
+pt-BR = "{A3FFB78D-681B-4EEE-B279-EA638040F82A}"
+th = "{4BFE4253-A149-49D1-ACFB-45B780DBE45B}"
+et = "{5A742EFB-07B8-42AB-A451-60BBE2461102}"
+ja = "{77A4C487-FD10-461F-9F0D-C4DF9FA79C86}"
+ko = "{59F981B5-1F49-4B5C-AC14-E7EA635C17F9}"
+zh-CN = "{7A31AF55-3974-46E2-B11D-FA6FDFE9576B}"
+zh-TW = "{9B4ABC89-CB93-4083-A529-7647D74EBB7D}"
+tr = "{B2D2C818-F752-428B-9F42-5093E525AD19}"
+hi = "{20765149-8D90-4BF2-9878-54C01A52AA2C}"
+ar = "{11EDE09B-CE84-4042-B40D-09F3A9CF7484}"
+he = "{CEDA775B-2A1E-45EE-8163-5A7223022389}"
+multiwestern = "{7964A534-4526-46AD-8A1B-71BAF6AFE746}"
+multiasia = "{180F666D-555D-4F90-A53E-DD861CD9D6F0}"
+
+[UPGRADECODE]
+af = "{E5ABA9DC-0B05-49C7-AE79-42621CF9273F}"
+ar = "{D6770BC4-9500-4BF9-8137-72AFD7F9366E}"
+as-IN = "{539E1B86-87BD-4E73-9B4D-5F3FC1ADA817}"
+be = "{375F00E6-C1ED-4131-A5C9-D21E34718781}"
+bo = "{0BADD0FD-13B3-4CAB-9ECD-860FBEB09E6C}"
+bg = "{6561C433-322A-4EED-B31C-D9CE0F70F182}"
+br = "{45188701-42C2-4217-BCC2-5FC4DE740FA1}"
+brx = "{B0123EF4-1590-4436-B8C7-45778BCC53C9}"
+bn = "{B7A54DFF-DDAE-4BB6-A355-FAF0D4E11952}"
+bn-BD = "{300DE45C-94AA-4DA2-9E83-A450DA8FB9AA}"
+bn-IN = "{22BA4E19-764F-4D37-8FF0-254DFE566E7E}"
+bs = "{944202C0-A80D-413E-A673-3E3CB5078FAB}"
+by = "{968FB518-842E-4807-8331-7E20E88A2C89}"
+ca = "{89196DBD-4B4D-45EA-89D5-5C57C69E5B16}"
+cs = "{A62880EF-F164-4037-BB2A-76FBE37D3BEB}"
+cy = "{07219764-70AF-4461-BF24-B89C8F48717F}"
+da = "{FFEE4E5F-196A-46A9-A99C-11966D5ECC35}"
+de = "{7D03B08A-2F82-4F22-8F2A-C045DFC13566}"
+dgo = "{71C0B453-FF1A-4C57-A52D-1322088D3D3F}"
+dz = "{5DF8F595-6890-45CD-BD85-234DD7FB5435}"
+el = "{5CF9A133-6C59-486F-BB16-BB7AB12826DA}"
+en-GB = "{965C704A-7328-4039-A865-914E6091BD38}"
+en-US = "{97F3F678-0371-457E-893C-EFD7447A7985}"
+en-ZA = "{4ACCB25D-FF84-473F-8AE5-472777DE15AD}"
+eo = "{785BAF17-30F1-482D-8419-C3186963A37B}"
+es = "{EAE42234-4244-443D-93D8-D99235A80E2D}"
+et = "{15FAC7D1-931C-462C-98ED-9151E5BA4E87}"
+eu = "{2F192244-3116-42E7-A382-656026BC47F4}"
+fa = "{F313287C-222D-4917-8266-FA9E2EE4F204}"
+fi = "{22635154-DAF3-4E3C-8280-07F208C1132A}"
+fr = "{DBE8EF0B-1BDE-4AFA-B6D1-EB6D39934388}"
+ga = "{4AAAD846-9721-496E-A2BF-2E761A00A163}"
+gd = "{4E63B45A-AE8A-4189-B74D-DEF23F8DB2D8}"
+gl = "{9D6DB52A-986C-4CE9-8494-3156AC40405E}"
+gu = "{601D42F5-C928-477A-8FF9-C13116BAF889}"
+gu-IN = "{ECF408BB-8554-4566-9230-083B3A61D5ED}"
+he = "{9EC0DEF1-601C-4775-9884-B22C347824E1}"
+hi = "{518E46AB-6372-4303-A0FD-40AE042D6898}"
+hi-IN = "{2E784EF5-2240-4940-ACAC-240860D5B0FF}"
+hr = "{7D881D43-F1AA-49CE-83E2-420990672098}"
+hu = "{1F70AB81-E96B-414C-AEE1-BD69BAF954CC}"
+is = "{27125E19-DCFE-402F-AB8C-82CD9F584D77}"
+it = "{6AFA47B1-9285-40CF-A98C-80F9F339A9EE}"
+ja = "{B7573A6E-083B-4E1D-8AFF-7003B5401971}"
+kid = "{E16377E5-4C78-4016-A355-8CE512DA85B4}"
+ky = "{18590BB8-8598-4781-BEDE-4BA660D7DCA3}"
+ka = "{6FBAFC4D-EBE8-4880-8644-E87698F5D169}"
+kk = "{CDDF1704-0468-4F47-B191-C5D44FF301DA}"
+km = "{4F24C267-C4D8-4A60-BEFB-415A4FC12C8B}"
+kn = "{3699C099-D492-4206-B4D8-EBAB427432D8}"
+ko = "{2501A052-8F1D-4A7F-B4DE-4CB851B1840A}"
+kok = "{FB347C9D-7A6E-494B-8FB0-DC6041A927EA}"
+ks = "{08E36D6D-6FED-45F0-A87E-D742F9161250}"
+ku = "{7A2CA172-09EB-4B2D-96D8-A370084757E1}"
+lo = "{31CE78E7-B3BB-48DF-9543-B2DF21F420A7}"
+lt = "{E6953E1E-674F-4890-A99B-CBCE09445C13}"
+lv = "{27B24D10-F706-4ABD-B1DA-08C569637759}"
+mai = "{826EEF83-3FC8-4245-9A8E-0F7CC9F47497}"
+mk = "{D2654ED2-5D65-4281-A118-09A3F25914B0}"
+mn = "{3355D11E-5906-4226-81FE-1413EA06E88B}"
+mni = "{DE13CC7E-1C6E-4CB9-864E-EA87162EFCB2}"
+ms = "{6C5A78EF-563A-4B86-A3FA-C6431AA92E98}"
+ml-IN = "{8047890F-2CD5-48D2-A73B-50DD2D06A9C8}"
+mr-IN = "{95BC02E6-5498-4879-AE16-FFCB9CABE1AE}"
+my = "{7002CA01-C610-411C-BD18-FE1E670C1F52}"
+ne = "{C89923C9-9061-42D4-B531-60498D929C06}"
+nb = "{1BED5361-E88F-4833-B707-B39901731676}"
+nl = "{49D204A8-21E6-48C6-9B29-B25AB3D6A137}"
+nn = "{23276245-2A01-444F-B878-4BB1B54638C3}"
+no = "{05134802-8C30-412A-89DD-CC662D1AB84F}"
+nr = "{B156D653-2AB4-4C57-A1A7-F8E50309356A}"
+nso = "{8226A004-F62B-45A0-85B0-042687103114}"
+om = "{B1A720C2-8B81-492F-8F78-7BC92147AD45}"
+oc = "{96392323-8828-42E5-86F4-3CBD2036A609}"
+or-IN = "{CF291629-172B-496B-8E86-017EB7392CFC}"
+pap = "{4ACBFC0D-A5B6-41FF-AAD1-9856CBDCF057}"
+pa-IN = "{DE14FDEF-E87A-4335-94B7-09D8FC30FE56}"
+pl = "{C3CFF998-06D1-48B0-925F-8B2CE21105F2}"
+ps = "{0C9FF6FF-3539-4C64-8068-E15FA08BA03D}"
+pt = "{7A5DEAF9-2687-447F-803D-594E0966A2E1}"
+pt-BR = "{4C644036-3E74-44A6-AE94-55D9E7F2C541}"
+ru = "{C1E77DC8-0C1C-4C2D-B67D-581E91C5BEDF}"
+rw = "{CF0171A7-E3C2-4120-AF79-90D426D61204}"
+sat = "{53951156-6BF5-416F-8CD2-E37A724A3779}"
+sa-IN = "{91B68ACD-6E12-4D96-822F-4715B87535CE}"
+si = "{43B0FA53-3B78-4920-B264-8D2DDF566B7C}"
+sc = "{D163A41F-FB45-4CC4-9644-4818953792EA}"
+sd = "{A6C60A32-84E3-4AB9-93DC-CBFFF437DD9B}"
+sk = "{E44612CD-1AC0-4D8B-9DBE-EFEAF5A2BC31}"
+sl = "{32DDC93C-0B62-42D9-9627-417CC947851A}"
+sh = "{5C7E8CBE-6D6D-4DAD-B8DC-D10F85A2B36B}"
+sr = "{65233590-D233-4A02-91C3-DF83D00AEDA7}"
+ss = "{E4C66A70-4597-4BD2-BDA3-25912A6FD81E}"
+st = "{E683C485-4034-4B51-8E4F-D389D1C87B5E}"
+sv = "{40FE345C-D3C7-48C4-8CC6-3B21845B9E2C}"
+sw = "{15829530-145E-4628-88EB-C2D1EF872A3E}"
+sw-TZ = "{BC988E86-1498-411C-978B-9EEA114602A2}"
+te-IN = "{3EA81EA3-0AD1-4833-8E27-C42455BA82DD}"
+ti-ER = "{1264E7B9-2286-4E43-8F95-E56DF0992E60}"
+ta-IN = "{A9DA9C7E-5DAE-419F-A213-A9BE4EFCE9B6}"
+th = "{148ACBA8-D6DA-4127-AB23-1787B0178278}"
+tn = "{2F8628DE-8765-475F-8265-3E535FBCE8B2}"
+tr = "{961A44B0-E927-4823-9BC6-C1E1B665DCC9}"
+ts = "{6D364115-17E5-4128-A46A-C48FFCDA7CAB}"
+tg = "{BF2D424E-87FE-4E79-B6BD-69ABB39925FF}"
+ug = "{AA212944-F6D4-4892-9FCF-F5AB00F48637}"
+ur-IN = "{DF853049-BFE4-4021-B072-4DA7128BC80B}"
+uk = "{AB349EA3-BBFD-444D-BB7F-E34B51D3C83F}"
+uz = "{E50DBC97-9AE2-4D8A-A8A5-9D3FAEE63D9A}"
+ve = "{CC948F7B-2223-4CF4-B6DA-589D091E2897}"
+vi = "{96E6D257-71C9-4E36-8BCF-01F3E60F42F1}"
+xh = "{0B4F6199-8EEE-45B0-B9B9-A80ECBEC5B8D}"
+zh-CN = "{85F565F6-4853-4AFD-8CF3-7A57201489C7}"
+zh-TW = "{115A4904-16B0-487F-846E-A27588FC28A2}"
+zu = "{D83DA940-56D9-4D11-AA20-8E70FD1C549A}"
+multiwestern = "{11F95BB5-D403-49A6-B704-C48C26783253}"
+multiiasia = "{6874DCF5-E0AC-464A-8002-BD48A76ADDF9}"
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/components.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/components.txt
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/components.txt
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooo_patchcodes.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooo_patchcodes.txt
new file mode 100644
index 000000000000..4831c3b2105e
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooo_patchcodes.txt
@@ -0,0 +1,3 @@
+# OpenOffice 2 UpgradeCodes
+
+{7C35B9AB-2CE3-4C18-BE7C-5B97EA089EB3}	# OOo UpgradeCode
\ No newline at end of file
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooodev_patchcodes.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooodev_patchcodes.txt
new file mode 100644
index 000000000000..cbc09ea89684
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooodev_patchcodes.txt
@@ -0,0 +1,3 @@
+# OpenOffice Dev UpgradeCode
+
+{E54FAE36-AEA4-4964-B4BB-CE9D4CEB4B3E}	# OOo Dev UpgradeCode
\ No newline at end of file
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp
index d7f7f635917e..a453f1fcdd05 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
index 515f8faecc7a..25b5b11bed20 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
index 50fcb25b92d2..b833e912a3b5 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
@@ -1,152 +1,152 @@
 [PRODUCTCODE]
-en-US = "{302DAE3A-2CD6-46DF-A25B-ED0B59FBA771}"
-pt = "{FC10CE94-41C6-43AE-AC97-4F4AE45B1BCC}"
-ru = "{C0C43007-C203-4722-916E-7A4E915E4F8D}"
-el = "{FC4188CE-C087-4109-A904-0687A76ACEDA}"
-nl = "{1C7DD608-C8AC-4B5B-81BE-E4ED3753541D}"
-fr = "{D334E645-4240-467E-9049-8EDA0DF62DD8}"
-es = "{28F03675-F28C-460D-8C2E-800EA7A551A0}"
-fi = "{5FE3A584-4297-4199-BF98-2BD36628B6C7}"
-hu = "{91F443E7-DE34-46FC-B02E-F5628399603C}"
-ca = "{3FB32B22-14E8-4736-8AC5-04EB336EAD10}"
-it = "{02CE50BA-CAC8-4013-B555-0DFC0D6F1C08}"
-cs = "{7C4C496A-2087-4AE3-8620-84FFD736F2BF}"
-sk = "{73D7DA04-45CD-494E-9B78-1EFDFDBF5600}"
-en-GB = "{80F13A63-A0C3-4C6D-A0B3-28F106730674}"
-da = "{387DC3B5-4CF9-48A2-8292-3BB725BF654A}"
-sv = "{72B0A3D4-B9E4-454C-9A45-52D2DC433A58}"
-no = "{8FDD7F7B-104C-4CB6-B7BD-F67FCF42F3CD}"
-pl = "{7CA9656A-7DB4-48EB-8E18-456256C05E92}"
-de = "{300FFDA6-0C64-406D-B09B-CB5C91ABEBBA}"
-pt-BR = "{E49BD84D-625C-4BEB-AE0E-349D0DD6FFB7}"
-th = "{B0E54B09-14B1-4440-BCB8-E036CCD332DF}"
-et = "{0A773C83-9633-4EAD-BE4F-C015568870BD}"
-ja = "{DAF0244B-3B71-4EC8-8246-C58401AE5E01}"
-ko = "{AAFFA871-4921-4D14-9767-E302020DD8BE}"
-zh-CN = "{5B52E76A-647C-4F18-BC52-6293FDE98C5D}"
-zh-TW = "{03293AD0-38E2-4399-BE6E-EC696138E39A}"
-tr = "{5F926003-A07A-4812-A6AD-6C466C053F53}"
-hi = "{264BD610-28F9-42C0-AFBF-60870763B038}"
-ar = "{76854B27-9B89-4C7D-AB32-69E1F60CDA6F}"
-he = "{10C228EF-576B-466C-B863-955EC6A9340C}"
-multiwestern = "{D53F8583-419E-440E-AC00-40E9AB31EEBF}"
-multiasia = "{C0D08A10-A266-46DC-8EF4-BE0E5928129D}"
+en-US = "{0F961BE5-98E8-408E-9F74-23CBA0523922}"
+pt = "{2C127D50-B7E4-46C3-A845-CF6684481024}"
+ru = "{8B523028-4AAC-4607-9711-667AA6C37D45}"
+el = "{F980E77E-21FD-40B8-BE66-8BC60284D24B}"
+nl = "{7FE69A49-6825-47E0-8179-72336E7B4250}"
+fr = "{3BB61EBF-5BC1-4E4D-859F-3ED5D92DD25E}"
+es = "{12A4616B-D51B-4013-964B-0ACCCA5E9AF2}"
+fi = "{89623507-9F44-44CF-BD4C-042F9E26F903}"
+hu = "{2246FA05-4B7A-499B-A19E-AA6599EA28D0}"
+ca = "{9810C5F8-C061-4D02-AD98-049452A5DC76}"
+it = "{2F78D54B-CE1D-4607-AA5B-D52114BDEBDB}"
+cs = "{781C904C-8768-4271-AA69-1A2CFA248002}"
+sk = "{A1D39E12-FF85-4619-BC69-001C55AD5B35}"
+en-GB = "{DD0CE074-E875-4428-991B-A9B3734701F9}"
+da = "{92CA37C8-B2E6-403F-932C-1A33E48BCD7E}"
+sv = "{942C29ED-A013-436E-861C-28271FD60AAE}"
+no = "{0EF3EE40-3690-472E-A693-5C9AE4FA7D5A}"
+pl = "{2A7F7A26-EF8B-4990-8836-688508886215}"
+de = "{5014304D-99B3-4451-8EB3-97D34658E4E7}"
+pt-BR = "{55837A64-5B73-4CDC-8950-AF56E09A7961}"
+th = "{2EEACF3C-C38E-4043-8B4D-33A461083348}"
+et = "{956362F1-C89B-4008-B15F-968BD4023F3F}"
+ja = "{01C118C0-57AB-4745-8D4C-5A34E6677E8D}"
+ko = "{B0DEE1A7-88FC-423B-AA1F-F51D94D02996}"
+zh-CN = "{0C596167-BA94-4D5A-B63B-6566FE06259A}"
+zh-TW = "{C31C87A1-5918-4178-8696-DDD36EDAEE99}"
+tr = "{467D9E65-2614-4D19-B40F-0B12FE6E472F}"
+hi = "{61B2E7EA-DC12-4A51-B152-2B95A4FC2ABF}"
+ar = "{FF72555B-A96D-49F8-8998-9359E9F9F7E1}"
+he = "{F59C6731-12DA-4A46-BE6D-30934E7CD763}"
+multiwestern = "{FA30E08E-DD61-4E47-B3D6-51B2814CA881}"
+multiasia = "{222033CB-A588-4302-9942-311F160B63B1}"
 
 [UPGRADECODE]
-af = "{3E85B9F2-0AC3-4E57-8072-260A6FE05D02}"
-ar = "{DF297699-3040-48E0-B0E6-B54385D76018}"
-as-IN = "{62E2F6A6-4521-4E36-A751-46E91A58CFB5}"
-be-BY = "{E6DC8D4C-F68E-4BE1-8F00-F0C84ED0F974}"
-bo = "{5F9461CD-2937-4EE0-AF03-24E72987244E}"
-bg = "{29FF0FAA-B831-4398-BE3F-FC13949D1CAE}"
-br = "{6E4658DD-79B0-4707-93C2-B022D66157A1}"
-brx = "{6DD492EA-45CD-483E-8563-23355FD37E28}"
-bn = "{4D1449E7-D10B-44D8-AAB0-257D6930B0C2}"
-bn-BD = "{3195C77E-8462-45DA-BEFC-37F1299D889E}"
-bn-IN = "{763F5343-47FC-4909-8C18-D9E0CEED533A}"
-bs = "{DCC737A4-531E-4DCD-A3C4-376DA4C76D00}"
-by = "{F190162C-DCD0-4266-B9AB-1B1FD7C24C2E}"
-ca = "{8EEC9A45-3BD3-431F-81D0-394F41185BD9}"
-cs = "{DBA607B3-0805-4A18-A45D-769C70D90AB7}"
-cy = "{3CE6CA2E-6ECF-45BC-B26A-348FA03A25D3}"
-da = "{4E7025EF-909F-4609-97BA-304684C4833D}"
-de = "{481E648E-D8AD-478A-A3F6-68FC563FFD8F}"
-dgo = "{205ADC32-F775-476A-B68E-949F85D0B0E3}"
-dz = "{3D391D0A-66D3-4141-8554-65DECA138208}"
-el = "{39772F91-1D37-4866-BBA4-900AB53590B0}"
-en-GB = "{E60BC5AC-2513-40AF-A41B-64118A287662}"
-en-US = "{8B909084-2220-49AC-A421-142180519088}"
-en-ZA = "{047EB419-DF2F-4D02-A3B5-E1B2FAFEDC93}"
-eo = "{A256340D-4065-4B6F-AC1D-EB0D5127EBCE}"
-es = "{01588DD5-C6C5-4C9D-A1BD-1A63E779DA1A}"
-et = "{34FBD5D3-3F88-4C91-8B9B-A10AE833250F}"
-eu = "{A73CB85E-760B-4E5D-AB26-7DF091C25F16}"
-fa = "{12D1FE4A-95E1-4BED-B377-2E8EA93B2461}"
-fi = "{481B0FE0-8313-442E-8A53-7C5139ADA3DC}"
-fr = "{B0FDE9B8-D066-4FB2-885D-615A6D58E02F}"
-ga = "{39B343FE-EC1F-451E-930A-47D85E96DE67}"
-gd = "{DE408221-68E9-418D-9B20-10BE458268F2}"
-gl = "{38616841-D0DB-4768-B9B8-27D61A91FB47}"
-gu = "{382A0F08-CF86-45C4-8119-67C87E275EFE}"
-gu-IN = "{25FF47C5-9FBB-4FBA-89FC-D0FB73336E2B}"
-he = "{13484272-CE60-4867-B494-D56F9049B95A}"
-hi = "{2C70F320-6771-42D6-B3F5-97678C822B20}"
-hi-IN = "{DDAB0849-CC63-475C-AC87-388B93579A28}"
-hr = "{0750A25E-7492-4681-8DFD-E04E89E45C0A}"
-hu = "{5981EE94-6763-40AD-A8A0-EEB01CCA153C}"
-is = "{ED6D0C4C-2746-40A9-A672-4D9950C421C0}"
-it = "{50087605-A504-441B-B514-67F13A284C10}"
-ja = "{74F683CC-8356-4BF7-9098-B85AAB7C1A0C}"
-kid = "{1A4DA798-78EB-46B8-A5CE-4E32F883314C}"
-ky = "{3110031F-1B5D-4457-BB5C-F6A330F15419}"
-ka = "{08E10841-B5EF-4BF9-9688-AE25573E6DA7}"
-kk = "{1527983C-2953-45B4-87A5-C7D67A1F6C60}"
-km = "{B4E6E1AC-C45E-48BB-A038-073C32693B65}"
-kn = "{28FDEA4F-1DAB-4EAC-986E-604B7BB6EF11}"
-ko = "{1D068BF9-FBCF-4A3B-B9A4-4B2DD3DE8CFB}"
-kok = "{CC3129BA-331A-42CC-8569-93F9E05B6400}"
-ks = "{BADB1F2A-B03A-4521-9A4A-61C3EDD365EC}"
-ku = "{2C5FB742-9A33-410D-AC5C-A376D4967D69}"
-lo = "{3968BFB2-35F7-4BBC-9E3E-C640BF09587D}"
-lt = "{3526DA6A-7EA6-471C-973E-C0461DE85909}"
-lv = "{BC085A1A-38A6-462A-889F-6E7CA442D9D8}"
-mai = "{BE522738-E05A-431A-B535-29349EBF86AE}"
-mk = "{9B8D68D5-6903-4C22-AC8F-CA0D2D124FD8}"
-mn = "{A9E2C897-8193-4DBD-9FDE-F9BE9AB7F92E}"
-mni = "{3CBD068D-E6AE-4C02-8091-DD4F2866336A}"
-ms = "{F300CABB-ED67-468E-A336-87DEC6E22CFC}"
-ml-IN = "{F2F04B66-9996-425D-A026-0AE99F5DB878}"
-mr-IN = "{4B87A651-94B3-48DF-800C-9458C3A93179}"
-my = "{E1C174A0-8126-43A8-B696-9F9DE676E1ED}"
-ne = "{FF4DA93A-205F-40A2-9F01-2A5EB6663E6C}"
-nb = "{6E732530-FCDD-484C-A575-1289731020FD}"
-nl = "{7D14314D-DAF7-4A97-A6EE-97C475080A73}"
-nn = "{2F1F8A99-B3C4-4F22-BB08-5F0D217C0BE5}"
-no = "{00C1656C-6386-42ED-BE8C-5D6C553EF125}"
-nr = "{0E64C806-9EB2-4651-BB94-B8D9814FD9E5}"
-ns = "{5142883F-6084-4723-907B-EFD4A5097817}"
-om = "{8D6EE539-9E74-41C0-8DED-807F91D68467}"
-oc = "{73B96B61-E98E-4BB1-8E16-BABEBF6D58FB}"
-or-IN = "{11771BE2-44D3-4ACD-882B-26C4947237C5}"
-pap = "{C4AC769D-F356-4D1A-A3A4-62E6729CF403}"
-pa-IN = "{1869854A-30BE-40EF-B72C-AF0CCA1A5A91}"
-pl = "{9C92258E-9A41-4A03-AA5C-FD8EF15189BA}"
-ps = "{277B630B-64D9-4105-A542-6F279A31A72C}"
-pt = "{CBFA6A61-D310-4A90-8F49-C7BE2735D58D}"
-pt-BR = "{7364F154-089D-400B-B275-751AAB9A6122}"
-ru = "{DF67ADAA-4755-4184-9E32-1020F40DDA81}"
-rw = "{D1D013B7-9570-4165-8421-BBDC97842260}"
-sat = "{233A2442-D417-458E-A67F-4C3E58B54387}"
-sa-IN = "{180CEB68-8F15-4533-B2C2-43D47DED7ABB}"
-si = "{6CFE884D-10C2-42F7-A60F-52A8284E8D45}"
-sc = "{AC0B0CE3-DF64-4CCF-88EC-CBF594D63183}"
-sd = "{638AEB7C-B611-4DBE-AD2C-A91BB7D13B75}"
-sk = "{19B49960-B58C-48A7-9761-F0B325E00C31}"
-sl = "{0FBEEB90-0C80-4C77-8CEE-E6347CC465FD}"
-sh = "{8DA3BE37-E70B-41BD-BBBC-C2169FBE01F4}"
-sr = "{49A004A2-3B8B-4029-B403-89919CB52355}"
-ss = "{5B0E4353-AB4E-497E-B38F-2E784C7B1F35}"
-st = "{FC92FF2C-0E4B-4EB1-A962-682861EE4C33}"
-sv = "{5E751B0D-FE96-4D0E-BAC1-5E7501294940}"
-sw = "{90672FAA-14CA-4F63-8FE9-40E572A3969A}"
-sw-TZ = "{905F971E-91FC-4F85-90D6-F6217A4FF01A}"
-te-IN = "{79ADE5C5-96C5-4CAB-B8A3-1024E6A639E7}"
-ti-ER = "{1FEF45BC-1315-46F4-B89B-6660226758DE}"
-ta-IN = "{76D5C227-D097-4B4E-B4C7-B2370B4F7932}"
-th = "{1F9BC074-55AA-496A-9EC5-05E65CF64AE6}"
-tn = "{685C3085-DCD2-40F6-85C9-5084402D7E0F}"
-tr = "{46AB3EE6-FD98-460D-AE0B-6AE68ED6204D}"
-ts = "{AC285965-9D0F-4D55-8885-0F0A9B9888B1}"
-tg = "{6C238E70-72FA-45FA-BC58-C508CD3AF6FC}"
-ug = "{57836D3D-879A-4288-8C47-691ECC4EECBE}"
-ur-IN = "{CE89FED1-6E4E-41B0-95B2-C39295B6A6BD}"
-uk = "{CB7AB32F-5218-4B5A-982E-F1AA5F00CFC0}"
-uz = "{CD74D285-6FAB-4737-B8C3-2FAA2B0B047D}"
-ve = "{95AD70B2-CE4A-4362-975E-6C48DC70179C}"
-vi = "{9B664C3A-CD48-4717-A40D-3B02475D7E20}"
-xh = "{1BCF7835-9CD6-454E-9530-64222CCF29E7}"
-zh-CN = "{5B45DC72-0755-4EC2-BB12-65A1FEADDDE7}"
-zh-TW = "{08B2CED3-CFB5-491F-ADC4-FD0CD2366C60}"
-zu = "{924D7527-25C6-4B95-95C7-7B68DABEC93E}"
-multiwestern = "{385A1970-0257-4C57-9383-DD2D668B23CE}"
-multiasia = "{74543111-6ABF-4A12-AC11-D315E2939D2A}"
+af = "{07F4C39E-72F9-495A-A8DE-8B3691607EA7}"
+ar = "{4B19ECA4-EB7B-420E-A2F3-0D456CA1CA3F}"
+as-IN = "{8B39DB32-6AF6-461F-8289-50655601C8FE}"
+be = "{0EE4C97D-D8C7-441E-866A-CF277858E4E4}"
+bo = "{C8D912D8-AA2E-47E2-9FEF-62C6580FB93C}"
+bg = "{961EFB5A-0CA0-41E8-8C9C-CB3BA52B73EC}"
+br = "{D5D79970-08FA-4CCC-B465-76948149E141}"
+brx = "{13A1CCE8-A020-4F7D-84DE-2FC89E4F0086}"
+bn = "{C552DC5D-BAEE-4707-B090-5BC08E01162F}"
+bn-BD = "{37A07926-2192-4701-908A-D414D26CB864}"
+bn-IN = "{F82875DF-7BFC-4CF1-A7E7-85E5AAD90F07}"
+bs = "{9F84BC57-8E00-4C27-81AA-5CCB6280A98B}"
+by = "{195CFF07-2848-4F7A-9770-98D1419A37F8}"
+ca = "{63DF72A2-1F4E-456E-A4E1-26342034BC19}"
+cs = "{A0B8FD56-2D0D-4487-B999-19D32FCF5F56}"
+cy = "{40487026-D109-40C8-AE09-A5E4147815DE}"
+da = "{6221C926-E7C7-4122-A3E4-66285ACD0B79}"
+de = "{56F769C8-29D9-4DA0-AAC5-6165D0180483}"
+dgo = "{43E5D518-02EA-4C82-AAB5-98954C12109A}"
+dz = "{0E79A6B5-D088-4670-ACDF-E0081C9ABFAE}"
+el = "{1E5DDBF3-B05A-4E78-A496-332C8193F4C8}"
+en-GB = "{3EBBFCD8-8009-4D31-AA5E-C1BED7B17A61}"
+en-US = "{40C2DB8E-E9D6-4451-BE31-DAD1343EC3DF}"
+en-ZA = "{764FA135-A8CE-4C79-A5D7-0B413CC9E911}"
+eo = "{1955D5A5-375E-410F-B84F-9FDB4E6A05E5}"
+es = "{4F776850-4235-4E93-847F-C657E04A35AB}"
+et = "{026CD9C5-6B53-421B-89A9-A5933C3E4BA6}"
+eu = "{B343946D-65A4-418E-B594-AC7035FDA5C2}"
+fa = "{D17D8C22-9161-42BF-A4A3-31248273EFB8}"
+fi = "{B26D2BEF-C380-46DD-8206-DD014E51AE7E}"
+fr = "{D7B9854C-4B88-4AE6-9FF6-7CDD7E8CEB90}"
+ga = "{ADDC53E1-2AFC-4234-A4A2-253C19932351}"
+gd = "{122EB716-EA92-4294-ADFB-4EDCC350E9D9}"
+gl = "{56F49C99-23C1-44C6-8EE3-2DCE72391BF8}"
+gu = "{1B1246FD-B318-49D1-8B5D-9475F55DF033}"
+gu-IN = "{982DC803-C9C1-4D8E-9B9E-A42335A2092E}"
+he = "{363942BE-A51D-43CE-8F09-2D94DFFDBB2E}"
+hi = "{4FFECDE8-8121-43DC-81F7-9FB7C82F24F4}"
+hi-IN = "{DE6A446A-BEC4-450D-94BD-B393B9898E76}"
+hr = "{8BC12666-3F41-43C7-9530-05A5A69A269D}"
+hu = "{63C087E6-5AC1-4C87-B663-6CEC4BD57935}"
+is = "{AD579FC7-4AFF-46A6-A756-110EC862FD17}"
+it = "{E9FFB21F-C41B-4A4C-87D1-885D97FE4D4A}"
+ja = "{D5E8AF54-134D-4370-BEF6-62BD3049C516}"
+kid = "{4A5C3C73-4392-4399-A57C-B0056289FD32}"
+ky = "{7854115C-C451-4BCB-86AC-F2257E60373C}"
+ka = "{5793EE6E-74B2-4965-A790-0C33ACEF75F0}"
+kk = "{BB0063B5-BFFE-4BD8-9FB8-A4778B79E2BC}"
+km = "{D906DD83-52C5-4B45-A887-DABEED8A6936}"
+kn = "{6785479C-863D-4533-9D28-46984FD067BE}"
+ko = "{918E7DC4-5641-4FB6-8A98-F3C0CCDFCC2D}"
+kok = "{4FF53BC0-C0E8-45B0-B7ED-3DE12B7865D2}"
+ks = "{55C379A7-D00F-4174-9073-F08CEF7FA40B}"
+ku = "{3FF9E717-28E4-49E5-96F7-B7EAC7C3890C}"
+lo = "{25F500C7-E3CA-413A-BB45-F298420533CB}"
+lt = "{7D5B38B0-3E15-4F96-AFFE-F8E455CE666B}"
+lv = "{DAC92857-35AC-44E2-BB10-F2F91173128C}"
+mai = "{0DCE1B05-2A48-4485-8C7E-6FBB1003F0F7}"
+mk = "{97BD11C0-13A0-416D-AB9A-9128DBEF707A}"
+mn = "{646294EB-E2E7-4110-B3CF-06D82F2BEE6F}"
+mni = "{2E614D32-5AA3-4525-B2F2-BE6F995F529D}"
+ms = "{7278D44D-9673-4157-AC6F-839520312A42}"
+ml-IN = "{250DC1C1-630E-4AD3-B25B-F57E9CC66572}"
+mr-IN = "{50031E0A-6AA2-43BB-89A7-2341F75B5C91}"
+my = "{C4B4A0EF-3B09-4198-825E-7381653FCF13}"
+ne = "{B4F43785-36D1-4716-AFCF-894B1AF36C1D}"
+nb = "{95CDD114-AB99-47E9-A6CA-C50C7460B1DA}"
+nl = "{E25D3CC2-AC90-4861-9E9C-DA41B5DF8A03}"
+nn = "{8D2FABA5-79CD-4109-A274-DEE14E279233}"
+no = "{226856FB-734F-40FB-BDF3-7DCCA74BCA5E}"
+nr = "{73FB2891-79DB-4F4E-A2B6-EB4A07D2903A}"
+nso = "{BA8033C9-6C42-4D4D-8160-46B6A19C08F9}"
+om = "{AC220121-97DE-4D37-9554-8877DAF713E6}"
+oc = "{E1D22BDB-C23D-4849-88AF-9B05F6B396E1}"
+or-IN = "{A3382AC1-D71B-4C13-BF1C-99C0C9C085A6}"
+pap = "{7E56C1DB-94E0-4C55-8D71-C27B1F971DB5}"
+pa-IN = "{8984AB31-BED3-49EB-92DD-E163B17132B1}"
+pl = "{EF16C1BF-539B-4EEE-91E5-0D44C4B72840}"
+ps = "{030AFC27-901D-4DA7-B651-E4F3F4AEE708}"
+pt = "{EFBDEE97-65AB-4575-B117-976D2EE639D0}"
+pt-BR = "{8EE0FF44-307B-4FDC-85F1-EA178C788FA8}"
+ru = "{2CCF1EF8-A263-4B77-8BDD-92D66B30531F}"
+rw = "{D27E719E-A9E7-4204-92E8-1FE882264F27}"
+sat = "{86E940A4-BE79-4D7C-818F-AE0B190F8AF6}"
+sa-IN = "{1F95BC4C-67F2-42DF-B4C7-A40EF727624A}"
+si = "{49438D51-91A0-4E2C-8415-E48CF3C82DB4}"
+sc = "{03889A8E-008C-438D-A4F8-F220470C182E}"
+sd = "{DDDD2117-DF91-4F9F-B403-9010E9B1A45E}"
+sk = "{31812C7E-CD25-455E-BEDD-F7A5F1E3AA57}"
+sl = "{F4B8D208-4566-4C4D-AFA0-3D2729084555}"
+sh = "{930AEAB7-E847-474A-84FE-FE5C2BCD9CE3}"
+sr = "{8C45020E-085A-44F7-8E13-7B4A94C6925A}"
+ss = "{9F41FCB5-A63D-49C1-A69C-9CBBCE73518D}"
+st = "{00B8BCE0-A647-4DC8-8E58-3D1B4CFF3F0F}"
+sv = "{234E7342-71BD-4B78-946D-06531FD46FA7}"
+sw = "{86433EBB-25D9-41E0-8F56-3DCB9534E027}"
+sw-TZ = "{397132BF-8878-4AD0-8943-1894B41692A1}"
+te-IN = "{A9688928-501B-4435-94A2-3A046C1EF29D}"
+ti-ER = "{293095EC-889D-4426-AE8A-C2E96DE8C78D}"
+ta-IN = "{5A98005B-D78A-41D4-9B2B-FFE739FF6D1A}"
+th = "{58BEC02C-44C7-43D8-BD07-35A866E20AE7}"
+tn = "{DD26B7C9-F027-4AB3-8F98-E8EB4FBA9C89}"
+tr = "{AA132C49-A480-4B5D-AAD3-811362B60A42}"
+ts = "{4BAF4D75-1E1E-4B15-A288-B4527E3C7CEE}"
+tg = "{4175B9EA-56CA-4311-9F96-937EABCEA1C8}"
+ug = "{1D09B009-8003-44FB-B2E1-49387F1112B9}"
+ur-IN = "{A7F4EC06-A6DC-4847-A510-41D435614014}"
+uk = "{52E53AB3-FAE4-4025-9B6F-FA401C9B10AE}"
+uz = "{D551A1C1-AF36-4FE4-BEF4-9CA72267D70A}"
+ve = "{20CA0658-5768-4B9E-8E3B-D9DF58332739}"
+vi = "{67A6C9E2-C285-48E4-A620-40D905E8D3F8}"
+xh = "{BF5684DA-C18A-43CE-B21D-97A7A0FAA486}"
+zh-CN = "{47574572-9963-441B-8A42-0B1A61880608}"
+zh-TW = "{6800BE26-76E9-4280-A174-5A952A18E643}"
+zu = "{65BA1A0C-9D3F-49A2-8ABB-7437C50A0AC7}"
+multiwestern = "{5050975D-CA7F-4F15-A3F5-F0A80B37AC35}"
+multiasia = "{07E6F67B-2A5B-45D7-984D-773F76612B9C}"
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt
index f4bd9e6fbbec..0564ebc4c0e7 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt
@@ -1,152 +1,152 @@
 [PRODUCTCODE]
-en-US = "{FEA2D5C2-22C1-42BC-B77F-7C0FC32A281E}"
-pt = "{F3208E02-D4DA-4315-8151-E7063637A69B}"
-ru = "{73BF81AD-7414-4BF4-B12B-D16FDD7DF854}"
-el = "{0B4B3945-2CA8-467C-B635-53B3FCC9A30E}"
-nl = "{AFEDEDDA-02B1-465B-A8E4-1917482835EE}"
-fr = "{AAE94778-30AA-4F8B-97B0-6E62978BD0F8}"
-es = "{9A9E806A-6A62-46D0-AF45-949611A37BEC}"
-fi = "{E3F13778-87EE-478B-B8F1-F18B37F4C0A4}"
-hu = "{9A8FA426-4DCC-458A-86CB-504CEB63204E}"
-ca = "{40802F67-E670-434D-BB05-5AAEB0F445FC}"
-it = "{19CF8231-7F96-4758-B6B1-DD28EDE08DCE}"
-cs = "{5D1302FC-B4AE-4BEC-8E4F-EFAC1C8C0D57}"
-sk = "{302002A3-1D25-41EA-8095-487B3E422695}"
-en-GB = "{23E1EF25-1A53-4246-842E-20E97103D4FB}"
-da = "{85451AD1-A9A5-4F38-A14F-EF1C85B23C48}"
-sv = "{615E2162-18AB-4070-A82F-E5B3E8AB81C0}"
-no = "{67C8D525-33FF-4464-BC47-B55E5724B9B2}"
-pl = "{4CD3F4B6-2B96-436F-883A-5BAF96E48AD8}"
-de = "{AD768463-3019-4F37-8AE5-BAC2471C7AE8}"
-pt-BR = "{DE15DF68-AD3F-465A-89F5-9FAA0EE001E5}"
-th = "{75BCC928-CCCE-483C-9B76-C4B30E4B7397}"
-et = "{A593FBBD-D539-476F-ADAB-7F54059D129F}"
-ja = "{0F0EA6CC-22CF-4C8D-AFD0-43BD96789A20}"
-ko = "{B111F2DE-21C7-4E36-BC20-5E059AAB4F1D}"
-zh-CN = "{2656B21A-734A-48FD-A0EA-33F23E8DB27A}"
-zh-TW = "{A9003EE6-88FF-4545-ADE2-D6EECA5DD61B}"
-tr = "{D5A3EAE8-6FE2-46B6-BD99-3570E9D6E9E1}"
-hi = "{AC7FA608-4E43-474F-9B48-B29D52F00700}"
-ar = "{23E3948A-5C9C-4247-800F-2483627D3DAD}"
-he = "{293249BF-8AA5-4436-B496-594A52A4BD50}"
-multiwestern = "{E404F8D3-5FC2-44BF-97F9-901A24DF6A3E}"
-multiasia = "{714181AC-7DE5-49D3-AF09-292EB90DB750}"
+en-US = "{0FA6115B-EB2C-4878-AE77-A6BB9BD95DE3}"
+pt = "{5908E447-DD83-466C-989A-4DD73EEB9E1C}"
+ru = "{A2FA035D-6AD1-4A42-8C94-514862DDF9F1}"
+el = "{ED03F985-453B-4C05-9D4F-5A5DABC5E383}"
+nl = "{3F832B47-935F-45D2-870F-59CBC55EBAF5}"
+fr = "{C96C5113-0A94-4D78-8B56-63335845A6DB}"
+es = "{00393DC6-C022-4013-85D6-7421431A1BBC}"
+fi = "{B2414CEC-4AF1-4943-88F8-C5011A860483}"
+hu = "{F09E48BA-14EE-44B2-9B28-2603A18CE1D6}"
+ca = "{A398A8FC-7E6B-45D0-9869-63D67B38AEEE}"
+it = "{38490E45-A1A0-47CC-971A-F0E4CD27E055}"
+cs = "{2288EAF3-AC96-4EE5-BEFB-1384DC1C4703}"
+sk = "{79B7F92B-168B-4E9D-8944-4AF49DEB0632}"
+en-GB = "{4840BF58-E8E1-4625-9F65-D7A6B26438C7}"
+da = "{DBF68601-B962-4B0F-8791-E91225E6AF4E}"
+sv = "{D9B02C11-188E-4471-8CD7-FB457264A752}"
+no = "{E5694849-306C-4771-8101-521F445918AD}"
+pl = "{C640D2B5-97E7-45C9-9FC6-7866BB6C8F5E}"
+de = "{5A5DE00E-D6F0-426E-A510-AFCD45564AFB}"
+pt-BR = "{A3FFB78D-681B-4EEE-B279-EA638040F82A}"
+th = "{4BFE4253-A149-49D1-ACFB-45B780DBE45B}"
+et = "{5A742EFB-07B8-42AB-A451-60BBE2461102}"
+ja = "{77A4C487-FD10-461F-9F0D-C4DF9FA79C86}"
+ko = "{59F981B5-1F49-4B5C-AC14-E7EA635C17F9}"
+zh-CN = "{7A31AF55-3974-46E2-B11D-FA6FDFE9576B}"
+zh-TW = "{9B4ABC89-CB93-4083-A529-7647D74EBB7D}"
+tr = "{B2D2C818-F752-428B-9F42-5093E525AD19}"
+hi = "{20765149-8D90-4BF2-9878-54C01A52AA2C}"
+ar = "{11EDE09B-CE84-4042-B40D-09F3A9CF7484}"
+he = "{CEDA775B-2A1E-45EE-8163-5A7223022389}"
+multiwestern = "{7964A534-4526-46AD-8A1B-71BAF6AFE746}"
+multiasia = "{180F666D-555D-4F90-A53E-DD861CD9D6F0}"
 
 [UPGRADECODE]
-af = "{0FB73E2F-AB13-46C2-BA45-245A3F3A4750}"
-ar = "{2E0EFF99-3023-4734-9D56-4E7400898182}"
-as-IN = "{3A400267-1BAE-4912-9800-8C26FDD547DE}"
-be-BY = "{01CD6DF5-A3D9-4D76-B39D-02FEC0C439E5}"
-bo = "{18DE4A08-BD3A-433A-91B1-85998EA033F5}"
-bg = "{2DFA49FA-A3B6-44CA-A2BB-01DF463186D7}"
-br = "{77851653-0428-4A45-AE05-076D7D58E9B0}"
-brx = "{F2BC3BEC-6634-4F9E-B878-5008EC622E5C}"
-bn = "{C85CC50B-AD2E-4462-8517-36E499DF7CED}"
-bn-BD = "{3D4B1DA5-3846-49B0-8BEC-05869EF3F587}"
-bn-IN = "{2F8A7B29-EDC9-4681-B5B5-0DED9EA7E563}"
-bs = "{2AB403D8-19E9-46FD-A514-40FE49FFDD7C}"
-by = "{BFB3DBFA-B114-41D0-9C78-6BB85161A555}"
-ca = "{5032D03F-55BB-4CF5-ABDA-6AAB4002D12C}"
-cs = "{842F16E3-E4FA-4B23-AFA0-4DF9DE8CA4F8}"
-cy = "{EC0B288E-7A19-4CC3-9B5F-FA63413226B1}"
-da = "{3E8FFADF-A50E-4412-8613-5CFD55864FA3}"
-de = "{63512266-4861-42F3-9269-3FBCFB9F60B2}"
-dgo = "{69F5D053-0E5D-4260-A787-DBB78397D51D}"
-dz = "{EC70E449-B165-43DD-A4ED-34F07C8C1E12}"
-el = "{8404A6EF-7E40-4B4C-86BC-450C51CFC8DA}"
-en-GB = "{DD5DD115-63B5-4C5A-984A-423C4A22F9AB}"
-en-US = "{5A5BF785-994C-44D0-A2D2-7C757C1E87B2}"
-en-ZA = "{83C0A05D-611C-4EEC-A80B-030F9F93C693}"
-eo = "{B891DEBE-300A-4CD5-8828-BE68529DE62E}"
-es = "{D30FCA19-CD1F-4052-9D84-BB45C1C7C0DD}"
-et = "{60E1242E-CF22-4ABF-8ED4-F15BFAE31C72}"
-eu = "{A1662F7D-BF01-4F7C-83FB-BAB1B9B5D081}"
-fa = "{09F1B354-A2C1-434A-93ED-A8C0E480BE23}"
-fi = "{071D642E-D898-4224-9EB5-353FC79EB6B5}"
-fr = "{8374FA3E-5454-4060-AD5C-4D9978850194}"
-ga = "{4AE98AD0-7D79-48E6-A819-75F7323261D5}"
-gd = "{2D44F336-E62D-41A1-A88B-0A8023217B19}"
-gl = "{97F43DDB-E046-4AC5-81BB-F64707098EE3}"
-gu = "{1FABFA47-C362-4AB1-9E26-C65B4511CF5A}"
-gu-IN = "{DB97DBBB-CC40-405A-A774-CC3F40C935A9}"
-he = "{A657505A-2A57-453B-8B47-F8D605A8AFE0}"
-hi = "{C0B220D1-2548-4E2C-BD7B-B7A14FE1C977}"
-hi-IN = "{EA2CB52A-E5AA-45E7-80C6-DE7EB76A1E5D}"
-hr = "{764043CA-CF26-4862-80BF-29E3AAD9E144}"
-hu = "{03CBE5BA-E9C4-4CF3-8B36-7BEDB31F256A}"
-is = "{DF95762B-5307-4B85-B4C5-B144BB02C5FB}"
-it = "{3F22750A-31C1-4C86-BD57-4A928A7F657E}"
-ja = "{52E22B79-3C25-4BFF-BC5B-FC37EE5020DC}"
-kid = "{704FAB24-F8F9-4245-8BA7-1931B3176951}"
-ky = "{568D4A30-A1EC-4060-A8EE-41277EF3985C}"
-ka = "{C196B961-1F5F-438E-B764-73F91C6CAEA5}"
-kk = "{B63AD05D-90E5-45B5-B3FA-B69C47380E86}"
-km = "{3A469632-5FB9-4F99-AC5D-744B5D17C6D8}"
-kn = "{D62D8785-CAF0-4650-8EA1-D713D61CC299}"
-ko = "{02FDC794-9AE9-4D64-9312-FF2DE0EF3104}"
-kok = "{6D72F5E0-D1D1-4BF4-8357-E5DC50CC1067}"
-ks = "{4ED85F09-A3C9-4C63-A34B-A2AF16098825}"
-ku = "{D89A3F76-2161-44AA-8FD7-755E3033AC02}"
-lo = "{28FD3AC9-0676-46E6-97E7-5E06B0A3CF0C}"
-lt = "{4E8F4857-EB42-4D96-94AD-0058C817B5F2}"
-lv = "{6BF5ADF5-F75C-4E0A-8E16-9829D3B194FD}"
-mai = "{4D9B6646-80B7-48D1-BB19-684152EB3DA3}"
-mk = "{99F82176-F642-42A7-B0DF-052E7096A4F8}"
-mn = "{7ED4CD40-F9C3-4787-AFBD-FB42F1F9223D}"
-mni = "{031C2836-62D6-481F-B9D9-C0B3340280EC}"
-ms = "{FC4C1B4A-6571-4674-B5B2-6D42860D4DF6}"
-ml-IN = "{D3936188-9845-4AFD-A484-D6D634103917}"
-mr-IN = "{E5ADEAB5-42A1-41D6-AD58-92C17CAE411D}"
-my = "{5EB48BA3-4CFF-48CC-9301-DF5A99E901C8}"
-ne = "{384BCFE4-EDD0-4897-9924-82CB51E80381}"
-nb = "{DF312B1B-93E3-4903-8467-6DF2786F0009}"
-nl = "{6D3E7570-BA59-492D-A83D-9C3D7B457EE6}"
-nn = "{CB24EBA2-28FA-4EFF-9DD6-890D376F036A}"
-no = "{A890155F-9333-4869-8816-D32720841A01}"
-nr = "{D6FACDDF-EF17-4773-A9A8-9B84A2E7E62C}"
-ns = "{16FE7611-2139-4D83-81DF-F6ED5A322F06}"
-om = "{CE5F3BEC-D59B-45CD-A451-A08E9F7018EA}"
-oc = "{A485C6CB-34A7-4969-A0AC-78241D417C95}"
-or-IN = "{2B3F3A48-231B-4AB6-B1CB-7FA173F704DB}"
-pap = "{DA0E5FD9-1C4D-4AB6-BA11-B34DFBB3FA17}"
-pa-IN = "{4FF51E79-A1C5-4D60-AE8D-A880483F4182}"
-pl = "{F5019C24-CC86-4E86-84A5-53FF98539D04}"
-ps = "{7AA8672E-9811-4ECD-828D-EB694373C72C}"
-pt = "{C62DBDBB-F1B6-4ACA-A0C6-D0B164A945CD}"
-pt-BR = "{F7F75CB1-2123-4B5B-BC00-11440725B71B}"
-ru = "{E1475570-6060-4EF8-834A-A241969A2061}"
-rw = "{35BAFF73-3654-4E74-8E44-0F74842785DF}"
-sat = "{E34A52B2-ADAA-4C58-AC3B-9FD91C135BC2}"
-sa-IN = "{6732C0EC-1DC7-428C-BC7B-E1B752AD23E5}"
-si = "{E3F62111-0A68-4268-8850-C49B830A1E57}"
-sc = "{F585A19E-3AB9-496C-B06A-0CE6690148C8}"
-sd = "{43252725-3200-45AF-A99B-913F532BD9DF}"
-sk = "{9AB7EEDB-11F5-4088-B581-FE711EDE6DCB}"
-sl = "{E3363531-F96D-4756-88E8-240E9BFBD3B7}"
-sh = "{8E722E7F-6100-41F6-BCF2-0E8AF1405BF0}"
-sr = "{CB0957AD-996F-4B67-90C7-36E6288EEAB8}"
-ss = "{BF227916-E342-4307-91DB-97D72DE31233}"
-st = "{7B38DA39-FE10-43EC-A9B4-34470BD44252}"
-sv = "{FD2E4280-BCFC-4109-A431-EC720C44A392}"
-sw = "{D3689B53-4B06-443F-8A2B-7937E7514BC4}"
-sw-TZ = "{462A874C-20D9-45B5-970A-B93C922CFCD5}"
-te-IN = "{8916B89F-7763-4112-9820-B58BFF350D9B}"
-ti-ER = "{47D18328-E629-4E6E-9E64-BE6C37C89098}"
-ta-IN = "{DF4D12DF-EB5D-44C8-8E41-60DFEFF1E623}"
-th = "{8A51A028-CFBE-4B1F-8C20-94E4A6D53675}"
-tn = "{BF0EB46F-05D8-4349-BEE8-57A0BFFE809E}"
-tr = "{6D6315EA-4B6F-4A62-AE4B-7197F6C00106}"
-ts = "{6824A943-F895-4F67-812C-0062BEF03E38}"
-tg = "{8AFD7661-482B-48DC-A103-5542A0D54B94}"
-ug = "{7C8A4BC9-0288-4CD2-B721-C43A283F5E52}"
-ur-IN = "{2E261973-B842-4C33-8FEE-1C2EC8D45451}"
-uk = "{AE29A49E-45F0-4BB4-82C9-77FFCA6394E3}"
-uz = "{CF6C8A15-A742-437F-9669-F8BE198873DF}"
-ve = "{C633A368-E04A-44EA-AFAF-15ADEDD8BF91}"
-vi = "{71643076-66F2-47E8-9826-0D378956568E}"
-xh = "{56F23458-B7E6-4D97-89F2-A5A56E605A6C}"
-zh-CN = "{14D843EF-5A1D-4EE4-9BAB-EC0A7A6F96D0}"
-zh-TW = "{98E66873-0C3E-4399-8676-A9D720071672}"
-zu = "{E317CFA7-4C92-4B3E-8528-8D44B2081C00}"
-multiwestern = "{157A7FB6-A116-455C-AF18-3A46D8273B8D}"
-multiiasia = "{E4C656E5-8F10-4A3A-B3A6-35C894DE637C}"
+af = "{E5ABA9DC-0B05-49C7-AE79-42621CF9273F}"
+ar = "{D6770BC4-9500-4BF9-8137-72AFD7F9366E}"
+as-IN = "{539E1B86-87BD-4E73-9B4D-5F3FC1ADA817}"
+be = "{375F00E6-C1ED-4131-A5C9-D21E34718781}"
+bo = "{0BADD0FD-13B3-4CAB-9ECD-860FBEB09E6C}"
+bg = "{6561C433-322A-4EED-B31C-D9CE0F70F182}"
+br = "{45188701-42C2-4217-BCC2-5FC4DE740FA1}"
+brx = "{B0123EF4-1590-4436-B8C7-45778BCC53C9}"
+bn = "{B7A54DFF-DDAE-4BB6-A355-FAF0D4E11952}"
+bn-BD = "{300DE45C-94AA-4DA2-9E83-A450DA8FB9AA}"
+bn-IN = "{22BA4E19-764F-4D37-8FF0-254DFE566E7E}"
+bs = "{944202C0-A80D-413E-A673-3E3CB5078FAB}"
+by = "{968FB518-842E-4807-8331-7E20E88A2C89}"
+ca = "{89196DBD-4B4D-45EA-89D5-5C57C69E5B16}"
+cs = "{A62880EF-F164-4037-BB2A-76FBE37D3BEB}"
+cy = "{07219764-70AF-4461-BF24-B89C8F48717F}"
+da = "{FFEE4E5F-196A-46A9-A99C-11966D5ECC35}"
+de = "{7D03B08A-2F82-4F22-8F2A-C045DFC13566}"
+dgo = "{71C0B453-FF1A-4C57-A52D-1322088D3D3F}"
+dz = "{5DF8F595-6890-45CD-BD85-234DD7FB5435}"
+el = "{5CF9A133-6C59-486F-BB16-BB7AB12826DA}"
+en-GB = "{965C704A-7328-4039-A865-914E6091BD38}"
+en-US = "{97F3F678-0371-457E-893C-EFD7447A7985}"
+en-ZA = "{4ACCB25D-FF84-473F-8AE5-472777DE15AD}"
+eo = "{785BAF17-30F1-482D-8419-C3186963A37B}"
+es = "{EAE42234-4244-443D-93D8-D99235A80E2D}"
+et = "{15FAC7D1-931C-462C-98ED-9151E5BA4E87}"
+eu = "{2F192244-3116-42E7-A382-656026BC47F4}"
+fa = "{F313287C-222D-4917-8266-FA9E2EE4F204}"
+fi = "{22635154-DAF3-4E3C-8280-07F208C1132A}"
+fr = "{DBE8EF0B-1BDE-4AFA-B6D1-EB6D39934388}"
+ga = "{4AAAD846-9721-496E-A2BF-2E761A00A163}"
+gd = "{4E63B45A-AE8A-4189-B74D-DEF23F8DB2D8}"
+gl = "{9D6DB52A-986C-4CE9-8494-3156AC40405E}"
+gu = "{601D42F5-C928-477A-8FF9-C13116BAF889}"
+gu-IN = "{ECF408BB-8554-4566-9230-083B3A61D5ED}"
+he = "{9EC0DEF1-601C-4775-9884-B22C347824E1}"
+hi = "{518E46AB-6372-4303-A0FD-40AE042D6898}"
+hi-IN = "{2E784EF5-2240-4940-ACAC-240860D5B0FF}"
+hr = "{7D881D43-F1AA-49CE-83E2-420990672098}"
+hu = "{1F70AB81-E96B-414C-AEE1-BD69BAF954CC}"
+is = "{27125E19-DCFE-402F-AB8C-82CD9F584D77}"
+it = "{6AFA47B1-9285-40CF-A98C-80F9F339A9EE}"
+ja = "{B7573A6E-083B-4E1D-8AFF-7003B5401971}"
+kid = "{E16377E5-4C78-4016-A355-8CE512DA85B4}"
+ky = "{18590BB8-8598-4781-BEDE-4BA660D7DCA3}"
+ka = "{6FBAFC4D-EBE8-4880-8644-E87698F5D169}"
+kk = "{CDDF1704-0468-4F47-B191-C5D44FF301DA}"
+km = "{4F24C267-C4D8-4A60-BEFB-415A4FC12C8B}"
+kn = "{3699C099-D492-4206-B4D8-EBAB427432D8}"
+ko = "{2501A052-8F1D-4A7F-B4DE-4CB851B1840A}"
+kok = "{FB347C9D-7A6E-494B-8FB0-DC6041A927EA}"
+ks = "{08E36D6D-6FED-45F0-A87E-D742F9161250}"
+ku = "{7A2CA172-09EB-4B2D-96D8-A370084757E1}"
+lo = "{31CE78E7-B3BB-48DF-9543-B2DF21F420A7}"
+lt = "{E6953E1E-674F-4890-A99B-CBCE09445C13}"
+lv = "{27B24D10-F706-4ABD-B1DA-08C569637759}"
+mai = "{826EEF83-3FC8-4245-9A8E-0F7CC9F47497}"
+mk = "{D2654ED2-5D65-4281-A118-09A3F25914B0}"
+mn = "{3355D11E-5906-4226-81FE-1413EA06E88B}"
+mni = "{DE13CC7E-1C6E-4CB9-864E-EA87162EFCB2}"
+ms = "{6C5A78EF-563A-4B86-A3FA-C6431AA92E98}"
+ml-IN = "{8047890F-2CD5-48D2-A73B-50DD2D06A9C8}"
+mr-IN = "{95BC02E6-5498-4879-AE16-FFCB9CABE1AE}"
+my = "{7002CA01-C610-411C-BD18-FE1E670C1F52}"
+ne = "{C89923C9-9061-42D4-B531-60498D929C06}"
+nb = "{1BED5361-E88F-4833-B707-B39901731676}"
+nl = "{49D204A8-21E6-48C6-9B29-B25AB3D6A137}"
+nn = "{23276245-2A01-444F-B878-4BB1B54638C3}"
+no = "{05134802-8C30-412A-89DD-CC662D1AB84F}"
+nr = "{B156D653-2AB4-4C57-A1A7-F8E50309356A}"
+nso = "{8226A004-F62B-45A0-85B0-042687103114}"
+om = "{B1A720C2-8B81-492F-8F78-7BC92147AD45}"
+oc = "{96392323-8828-42E5-86F4-3CBD2036A609}"
+or-IN = "{CF291629-172B-496B-8E86-017EB7392CFC}"
+pap = "{4ACBFC0D-A5B6-41FF-AAD1-9856CBDCF057}"
+pa-IN = "{DE14FDEF-E87A-4335-94B7-09D8FC30FE56}"
+pl = "{C3CFF998-06D1-48B0-925F-8B2CE21105F2}"
+ps = "{0C9FF6FF-3539-4C64-8068-E15FA08BA03D}"
+pt = "{7A5DEAF9-2687-447F-803D-594E0966A2E1}"
+pt-BR = "{4C644036-3E74-44A6-AE94-55D9E7F2C541}"
+ru = "{C1E77DC8-0C1C-4C2D-B67D-581E91C5BEDF}"
+rw = "{CF0171A7-E3C2-4120-AF79-90D426D61204}"
+sat = "{53951156-6BF5-416F-8CD2-E37A724A3779}"
+sa-IN = "{91B68ACD-6E12-4D96-822F-4715B87535CE}"
+si = "{43B0FA53-3B78-4920-B264-8D2DDF566B7C}"
+sc = "{D163A41F-FB45-4CC4-9644-4818953792EA}"
+sd = "{A6C60A32-84E3-4AB9-93DC-CBFFF437DD9B}"
+sk = "{E44612CD-1AC0-4D8B-9DBE-EFEAF5A2BC31}"
+sl = "{32DDC93C-0B62-42D9-9627-417CC947851A}"
+sh = "{5C7E8CBE-6D6D-4DAD-B8DC-D10F85A2B36B}"
+sr = "{65233590-D233-4A02-91C3-DF83D00AEDA7}"
+ss = "{E4C66A70-4597-4BD2-BDA3-25912A6FD81E}"
+st = "{E683C485-4034-4B51-8E4F-D389D1C87B5E}"
+sv = "{40FE345C-D3C7-48C4-8CC6-3B21845B9E2C}"
+sw = "{15829530-145E-4628-88EB-C2D1EF872A3E}"
+sw-TZ = "{BC988E86-1498-411C-978B-9EEA114602A2}"
+te-IN = "{3EA81EA3-0AD1-4833-8E27-C42455BA82DD}"
+ti-ER = "{1264E7B9-2286-4E43-8F95-E56DF0992E60}"
+ta-IN = "{A9DA9C7E-5DAE-419F-A213-A9BE4EFCE9B6}"
+th = "{148ACBA8-D6DA-4127-AB23-1787B0178278}"
+tn = "{2F8628DE-8765-475F-8265-3E535FBCE8B2}"
+tr = "{961A44B0-E927-4823-9BC6-C1E1B665DCC9}"
+ts = "{6D364115-17E5-4128-A46A-C48FFCDA7CAB}"
+tg = "{BF2D424E-87FE-4E79-B6BD-69ABB39925FF}"
+ug = "{AA212944-F6D4-4892-9FCF-F5AB00F48637}"
+ur-IN = "{DF853049-BFE4-4021-B072-4DA7128BC80B}"
+uk = "{AB349EA3-BBFD-444D-BB7F-E34B51D3C83F}"
+uz = "{E50DBC97-9AE2-4D8A-A8A5-9D3FAEE63D9A}"
+ve = "{CC948F7B-2223-4CF4-B6DA-589D091E2897}"
+vi = "{96E6D257-71C9-4E36-8BCF-01F3E60F42F1}"
+xh = "{0B4F6199-8EEE-45B0-B9B9-A80ECBEC5B8D}"
+zh-CN = "{85F565F6-4853-4AFD-8CF3-7A57201489C7}"
+zh-TW = "{115A4904-16B0-487F-846E-A27588FC28A2}"
+zu = "{D83DA940-56D9-4D11-AA20-8E70FD1C549A}"
+multiwestern = "{11F95BB5-D403-49A6-B704-C48C26783253}"
+multiiasia = "{6874DCF5-E0AC-464A-8002-BD48A76ADDF9}"
diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh b/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
index fefea6460151..fbd0a6982bde 100644
--- a/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
+++ b/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
@@ -2,6 +2,10 @@
 
 cat > /dev/null
 [[ "${OUTPATH}" == unxlngx* ]] && mark64="()(64bit)"
-echo "libgnomevfs-2.so.0${mark64}"
-echo "libgconf-2.so.4${mark64}"
-
+if [[ "${OUTPATH}" == unxaig* ]]; then
+  echo "libgnomevfs-2.a(libgnomevfs-2.so.0${mark64})"
+  echo "libgconf-2.a(libgconf-2.so.4${mark64})"
+else
+  echo "libgnomevfs-2.so.0${mark64}"
+  echo "libgconf-2.so.4${mark64}"
+fi
diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
index b0565246fd3e..eab975ae4250 100644
--- a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
+++ b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
@@ -2,5 +2,8 @@
 
 cat > /dev/null
 [[ "${OUTPATH}" == unxlngx* ]] && mark64="()(64bit)"
-echo "libfreetype.so.6${mark64}"
-
+if [[ "${OUTPATH}" == unxaig* ]]; then
+  echo "libfreetype.a(libfreetype.so.6${mark64})"
+else
+  echo "libfreetype.so.6${mark64}"
+fi
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index ec904cd5e904..aad2b7ee3db0 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -284,7 +284,7 @@ en-US = "< &Back"
 en-US = "Cancel"
 
 [OOO_CONTROL_124]
-en-US = "Build contributed in collaboration with the community by Oracle. For credits, see: http://www.openoffice.org/welcome/credits.html"
+en-US = "Build contributed in collaboration with the community by The Document Foundation. For credits, see: http://www.documentfoundation.org"
 
 [OOO_CONTROL_125]
 en-US = "&Next >"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Nsis.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Nsis.ulf
index 349200a9d37a..ee210a4ff478 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Nsis.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Nsis.ulf
@@ -5,7 +5,7 @@ en-US = "%PRODUCTNAME %PRODUCTVERSION Installation Preparation"
 en-US = "Thank you for downloading %PRODUCTNAME %PRODUCTVERSION."
 
 [MUI_TEXT_WELCOME_INFO_TEXT]
-en-US = "The installation files must be unpacked and copied to your hard disk in preparation for the installation. After that, the %PRODUCTNAME installation will start automatically.\r\n\r\nClick \'Next\' to continue."
+en-US = "The installation files must be unpacked and copied to your hard disk in preparation for the installation. After that, the %PRODUCTNAME installation will start automatically.\n\nClick \'Next\' to continue."
 
 [MUI_TEXT_DIRECTORY_TITLE]
 en-US = "Select Folder"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
index 61b63eb757f0..28a1219d08c1 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
@@ -5,16 +5,16 @@ en-US = "Comment in the Add-Remove-Programs Applet"
 en-US = "Department for technical support"
 
 [OOO_ARPHELPLINKTEMPLATE]
-en-US = "http://www.openoffice.org"
+en-US = "http://www.documentfoundation.org"
 
 [OOO_ARPHELPTELEPHONETEMPLATE]
 en-US = "x-xxx-xxx-xxx"
 
 [OOO_ARPURLINFOABOUTTEMPLATE]
-en-US = "http://www.openoffice.org"
+en-US = "http://www.documentfoundation.org"
 
 [OOO_ARPURLUPDATEINFOTEMPLATE]
-en-US = "http://www.openoffice.org"
+en-US = "http://www.documentfoundation.org"
 
 [OOO_STR_NEW_DISPLAY_NAME]
 en-US = "~New"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp
index d7f7f635917e..a453f1fcdd05 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
index 515f8faecc7a..25b5b11bed20 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 1142348f65b8..bd48e9ad66d3 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -69,19 +69,19 @@ CustomSetup	BannerLine	Line	0	44	374	0	1
 CustomSetup	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 CustomSetup	Branding2	Text	3	228	88	13	65537		[ProductName]		
 CustomSetup	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_49	Tree	
-CustomSetup	ChangeFolder	PushButton	301	203	66	17	3		OOO_CONTROL_50	Help	
+CustomSetup	ChangeFolder	PushButton	164	203	66	17	3		OOO_CONTROL_50	Help	
 CustomSetup	Details	PushButton	93	243	66	17	3		OOO_CONTROL_51	Back	
 CustomSetup	DlgDesc	Text	17	23	276	25	65539		OOO_CONTROL_52		
 CustomSetup	DlgLine	Line	90	234	284	0	1				
-CustomSetup	DlgText	Text	9	51	360	10	3		OOO_CONTROL_53		
+CustomSetup	DlgText	Text	9	47	360	20	3		OOO_CONTROL_53		
 CustomSetup	DlgTitle	Text	9	6	284	25	65539		OOO_CONTROL_54		
-CustomSetup	FeatureGroup	GroupBox	235	67	131	120	1		OOO_CONTROL_55		
+CustomSetup	FeatureGroup	GroupBox	235	67	131	152	1		OOO_CONTROL_55		
 CustomSetup	Help	PushButton	22	243	66	17	3		OOO_CONTROL_56	Details	
-CustomSetup	InstallLabel	Text	8	190	360	10	3		OOO_CONTROL_57		
-CustomSetup	ItemDescription	Text	241	80	120	50	3		OOO_CONTROL_58		
-CustomSetup	Location	Text	8	203	291	20	3		OOO_CONTROL_59		
+CustomSetup	InstallLabel	Text	8	190	220	10	3		OOO_CONTROL_57		
+CustomSetup	ItemDescription	Text	241	80	120	65	3		OOO_CONTROL_58		
+CustomSetup	Location	Text	8	203	154	20	3		OOO_CONTROL_59		
 CustomSetup	Next	PushButton	230	243	66	17	3		OOO_CONTROL_60	Cancel	
-CustomSetup	Size	Text	241	133	120	50	3		OOO_CONTROL_61		
+CustomSetup	Size	Text	241	148	120	65	3		OOO_CONTROL_61		
 CustomSetup	Tree	SelectionTree	8	70	220	118	7	_BrowseProperty		ChangeFolder	
 CustomSetupTips	Banner	Bitmap	297	0	77	44	1		BannerBmp		
 CustomSetupTips	BannerLine	Line	0	44	374	0	1				
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
index 3fe0c2062177..7c8ee157fb32 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
@@ -2,4 +2,4 @@ Condition	Description
 s255	l255
 WINDOWSENCODINGTEMPLATE	LaunchCondition	Condition
 Privileged	OOO_LAUNCH_1
-(VersionNT < 600) or (SETUP_USED=1) or Installed	OOO_LAUNCH_2 
\ No newline at end of file
+(VersionNT < 900) or (SETUP_USED=1) or Installed	OOO_LAUNCH_2
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
index 661b9a4be210..c082322086ad 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
@@ -1,7 +1,7 @@
 Signature_	Root	Key	Name	Type
 s72	i2	s255	S255	I2
 RegLocator	Signature_
-installuser	1	Software\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
-installuser_	1	Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
-installmachine	2	Software\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
-installmachine_	2	Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installuser	1	Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installuser_	1	Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installmachine	2	Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installmachine_	2	Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/codes.txt b/instsetoo_native/inc_openoffice/windows/msi_templates/codes.txt
index ed60bf7a4936..c893b6a9efcf 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/codes.txt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/codes.txt
@@ -1,37 +1,37 @@
 [PRODUCTCODE]
-en-US = "{DC95D28A-018C-4602-BD92-B0B168016BDF}"
-pt = "{BEA03710-78D8-419C-B07A-ED5DAB941507}"
-ru = "{310E5373-A7CD-44F4-9CE4-F155914C38B7}"
-el = "{AB1EC7B8-C503-43A8-83AB-A22166C0738A}"
-nl = "{0BD01BC3-C83E-48BD-A73B-7616CB86F1DD}"
-fr = "{8BD7F7E2-38C7-45ED-B1F9-DB6547B485A8}"
-es = "{A9EB795E-87EF-4558-89B0-6D6DBEBFB88E}"
-fi = "{4693F2F3-E8E9-427E-A340-0931E4FC85AA}"
-hu = "{3E77E957-4F8B-4E7F-A5A6-79DEDF424931}"
-ca = "{AEF1601C-0E4E-42D9-BD24-CD8CD5F9C5FB}"
-it = "{CB3F8A64-90F1-4B08-BCE7-CD1641313821}"
-cs = "{8D676E42-E6CE-42F5-80CF-345A0D35614E}"
-sk = "{85E15A19-22E3-4C64-828C-6E31B3F3FE56}"
-en-GB = "{DB9544DF-CDE1-4647-8B7C-683B3C423BE0}"
-da = "{EA7365A3-7DDC-4934-BFFC-E328EC784390}"
-sv = "{EF673EE1-CD71-45F2-9233-4D2C3A9D9341}"
-no = "{77AC885A-8A45-439A-9D10-523A5A53A43B}"
-pl = "{630A8423-A99F-45E6-9439-668EC12743C6}"
-de = "{4A4912C9-16C1-487A-B0DC-2343E02EBEC0}"
-pt-BR = "{B98782D1-9927-4A11-A689-AD9CDFB2F068}"
-th = "{268B04B5-5B6B-4F06-94AF-F8DE80519B1B}"
-et = "{4A5DB1AD-D163-4E6E-BE42-6F2660B6F42D}"
-km = "{4F4B8EE7-390E-429C-A13A-BC2403BD9529}"
-ja = "{1DA15F35-FA2E-4480-932A-381BFD326A15}"
-ko = "{0B524C60-9D82-464A-9772-90427D6E3FAA}"
-zh-CN = "{A833B97F-8FA7-497A-879D-28F09A4496B2}"
-zh-TW = "{5DD514A5-CDD1-4F40-BED3-7D9653C1053B}"
-tr = "{5DBCCED3-48F9-4105-B5EF-1B3F46896762}"
-hi = "{FD1FCF83-35F1-463E-89DF-0AEDA0444DEC}"
-ar = "{99F72778-F5E3-47D4-B867-68145F8052A3}"
-he = "{CC763310-A178-4D8E-B840-DDB141C79BDC}"
-multiwestern = "{6D8FE0C8-000D-4486-9814-135AE44A44BD}"
-multiasia = "{0AA645C9-1281-4C48-B8B8-BB424A8AF709}"
+en-US = "{B53C819A-A084-42F1-A18E-D7C6DD1CCB59}"
+pt = "{C3E6BC6A-034D-490D-866E-AFCAE0F4595F}"
+ru = "{2AE6A570-1393-4D9D-B044-D3067FC28769}"
+el = "{C61808D3-AE08-4EAA-9427-8B1E71B66973}"
+nl = "{7A20B473-85A8-4A57-AAFA-F74362FCDE2E}"
+fr = "{DBB9D6BC-F016-4771-A089-24CF853C8C78}"
+es = "{48A6F206-C8E5-4E40-8A2B-EED45A576821}"
+fi = "{BD481859-9803-4606-91D5-10ABEF4C4ADC}"
+hu = "{6DA595F9-4F00-4288-858B-A281C90D87D5}"
+ca = "{4CE05198-6F3F-46AF-866D-7865B41BA4C2}"
+it = "{2C1B2B2A-303B-499E-AE35-929EB2B8FDE7}"
+cs = "{214393CC-3F6C-4E37-91A2-B5D9C22A9067}"
+sk = "{D1C2E067-824A-4425-92EC-7242B4E28DE4}"
+en-GB = "{D6502F20-0CE2-4644-A7A2-C44337A84E54}"
+da = "{16F54808-4A44-4C87-9A9B-AE038D4E1003}"
+sv = "{2D4C8A15-DDBC-48D7-A37E-F095D331EDD1}"
+no = "{08B1A917-7FA7-474A-952A-AC0CE00ABDDB}"
+pl = "{A069E3EB-E23C-43A7-8D95-80C92971C981}"
+de = "{C54B62B7-32CA-4A12-90AD-425F68965DF2}"
+pt-BR = "{54D3D90D-A34A-47F8-873E-6FEC914F9CDC}"
+th = "{B27DED2F-51D7-4C0E-A011-F243E53814A1}"
+et = "{C6C1A6A0-0112-4A6C-9EF1-25672676D909}"
+km = "{062A1AD1-05AD-4D46-872B-B0ADA08DC3FC}"
+ja = "{1FBD7128-5220-4F02-B94D-40AA38A63A16}"
+ko = "{B5B62297-3658-4C79-A3E3-CD714250DE0C}"
+zh-CN = "{DEE49DC3-8651-4336-BFAF-EDB82F1F8096}"
+zh-TW = "{2C5F5940-CAA5-4637-B07E-7CBDD812E04F}"
+tr = "{F8FB0DCF-96C0-4C03-B748-951C679FD7C6}"
+hi = "{CA5E7AB5-DA2A-4F3B-8728-E97164034DD6}"
+ar = "{19F11268-068A-488F-B139-848ACA080B94}"
+he = "{CDF16F28-D75D-4BE8-AF81-EB85825DA252}"
+multiwestern = "{0DECDE88-DD1C-4E9F-8348-19C5BC6FDF26}"
+multiasia = "{122A65B5-E37E-453A-924B-E52B808EDA31}"
 
 [UPGRADECODE]
-en-US = "{7C35B9AB-2CE3-4C18-BE7C-5B97EA089EB3}"
+en-US = "{4B17E523-5D91-4E69-BD96-7FD81CFA81BB}"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_ooodev.txt b/instsetoo_native/inc_openoffice/windows/msi_templates/codes_ooodev.txt
index d23d7cd0c15b..3b34c42e92bc 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_ooodev.txt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/codes_ooodev.txt
@@ -1,37 +1,37 @@
 [PRODUCTCODE]
-en-US = "{DC95D28A-018C-4602-BD92-B0B168016BDF}"
-pt = "{BEA03710-78D8-419C-B07A-ED5DAB941507}"
-ru = "{310E5373-A7CD-44F4-9CE4-F155914C38B7}"
-el = "{AB1EC7B8-C503-43A8-83AB-A22166C0738A}"
-nl = "{0BD01BC3-C83E-48BD-A73B-7616CB86F1DD}"
-fr = "{8BD7F7E2-38C7-45ED-B1F9-DB6547B485A8}"
-es = "{A9EB795E-87EF-4558-89B0-6D6DBEBFB88E}"
-fi = "{4693F2F3-E8E9-427E-A340-0931E4FC85AA}"
-hu = "{3E77E957-4F8B-4E7F-A5A6-79DEDF424931}"
-ca = "{AEF1601C-0E4E-42D9-BD24-CD8CD5F9C5FB}"
-it = "{CB3F8A64-90F1-4B08-BCE7-CD1641313821}"
-cs = "{8D676E42-E6CE-42F5-80CF-345A0D35614E}"
-sk = "{85E15A19-22E3-4C64-828C-6E31B3F3FE56}"
-en-GB = "{DB9544DF-CDE1-4647-8B7C-683B3C423BE0}"
-da = "{EA7365A3-7DDC-4934-BFFC-E328EC784390}"
-sv = "{EF673EE1-CD71-45F2-9233-4D2C3A9D9341}"
-no = "{77AC885A-8A45-439A-9D10-523A5A53A43B}"
-pl = "{630A8423-A99F-45E6-9439-668EC12743C6}"
-de = "{4A4912C9-16C1-487A-B0DC-2343E02EBEC0}"
-pt-BR = "{B98782D1-9927-4A11-A689-AD9CDFB2F068}"
-th = "{268B04B5-5B6B-4F06-94AF-F8DE80519B1B}"
-et = "{4A5DB1AD-D163-4E6E-BE42-6F2660B6F42D}"
-km = "{4F4B8EE7-390E-429C-A13A-BC2403BD9529}"
-ja = "{1DA15F35-FA2E-4480-932A-381BFD326A15}"
-ko = "{0B524C60-9D82-464A-9772-90427D6E3FAA}"
-zh-CN = "{A833B97F-8FA7-497A-879D-28F09A4496B2}"
-zh-TW = "{5DD514A5-CDD1-4F40-BED3-7D9653C1053B}"
-tr = "{5DBCCED3-48F9-4105-B5EF-1B3F46896762}"
-hi = "{FD1FCF83-35F1-463E-89DF-0AEDA0444DEC}"
-ar = "{99F72778-F5E3-47D4-B867-68145F8052A3}"
-he = "{CC763310-A178-4D8E-B840-DDB141C79BDC}"
-multiwestern = "{6D8FE0C8-000D-4486-9814-135AE44A44BD}"
-multiasia = "{0AA645C9-1281-4C48-B8B8-BB424A8AF709}"
+en-US = "{B53C819A-A084-42F1-A18E-D7C6DD1CCB59}"
+pt = "{C3E6BC6A-034D-490D-866E-AFCAE0F4595F}"
+ru = "{2AE6A570-1393-4D9D-B044-D3067FC28769}"
+el = "{C61808D3-AE08-4EAA-9427-8B1E71B66973}"
+nl = "{7A20B473-85A8-4A57-AAFA-F74362FCDE2E}"
+fr = "{DBB9D6BC-F016-4771-A089-24CF853C8C78}"
+es = "{48A6F206-C8E5-4E40-8A2B-EED45A576821}"
+fi = "{BD481859-9803-4606-91D5-10ABEF4C4ADC}"
+hu = "{6DA595F9-4F00-4288-858B-A281C90D87D5}"
+ca = "{4CE05198-6F3F-46AF-866D-7865B41BA4C2}"
+it = "{2C1B2B2A-303B-499E-AE35-929EB2B8FDE7}"
+cs = "{214393CC-3F6C-4E37-91A2-B5D9C22A9067}"
+sk = "{D1C2E067-824A-4425-92EC-7242B4E28DE4}"
+en-GB = "{D6502F20-0CE2-4644-A7A2-C44337A84E54}"
+da = "{16F54808-4A44-4C87-9A9B-AE038D4E1003}"
+sv = "{2D4C8A15-DDBC-48D7-A37E-F095D331EDD1}"
+no = "{08B1A917-7FA7-474A-952A-AC0CE00ABDDB}"
+pl = "{A069E3EB-E23C-43A7-8D95-80C92971C981}"
+de = "{C54B62B7-32CA-4A12-90AD-425F68965DF2}"
+pt-BR = "{54D3D90D-A34A-47F8-873E-6FEC914F9CDC}"
+th = "{B27DED2F-51D7-4C0E-A011-F243E53814A1}"
+et = "{C6C1A6A0-0112-4A6C-9EF1-25672676D909}"
+km = "{062A1AD1-05AD-4D46-872B-B0ADA08DC3FC}"
+ja = "{1FBD7128-5220-4F02-B94D-40AA38A63A16}"
+ko = "{B5B62297-3658-4C79-A3E3-CD714250DE0C}"
+zh-CN = "{DEE49DC3-8651-4336-BFAF-EDB82F1F8096}"
+zh-TW = "{2C5F5940-CAA5-4637-B07E-7CBDD812E04F}"
+tr = "{F8FB0DCF-96C0-4C03-B748-951C679FD7C6}"
+hi = "{CA5E7AB5-DA2A-4F3B-8728-E97164034DD6}"
+ar = "{19F11268-068A-488F-B139-848ACA080B94}"
+he = "{CDF16F28-D75D-4BE8-AF81-EB85825DA252}"
+multiwestern = "{0DECDE88-DD1C-4E9F-8348-19C5BC6FDF26}"
+multiasia = "{122A65B5-E37E-453A-924B-E52B808EDA31}"
 
 [UPGRADECODE]
-en-US = "{E54FAE36-AEA4-4964-B4BB-CE9D4CEB4B3E}"
+en-US = "{910006D2-BDF1-440C-89D3-8F1DD93790FE}"
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
index 072fdcf6c291..995f919993eb 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
@@ -1,7 +1,7 @@
 Signature_	Root	Key	Name	Type
 s72	i2	s255	S255	I2
 RegLocator	Signature_
-basisinstalluser	1	Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
-basisinstalluser_	1	Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
-basisinstallmachine	2	Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
-basisinstallmachine_	2	Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
+basisinstalluser	1	Software\LibreOffice\Layers\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
+basisinstalluser_	1	Software\LibreOffice\Layers_\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
+basisinstallmachine	2	Software\LibreOffice\Layers\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
+basisinstallmachine_	2	Software\LibreOffice\Layers_\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/codes.txt b/instsetoo_native/inc_sdkoo/windows/msi_templates/codes.txt
index bf99a69d2b88..0a3af9a8897d 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/codes.txt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/codes.txt
@@ -1,36 +1,36 @@
 [PRODUCTCODE]
-en-US = "{989EA225-A7B8-4627-AEC6-854002636D1F}"
-pt = "{EF92EEBE-4B84-49CE-BED6-BF74DCD9395B}"
-ru = "{ECD85481-7606-4F45-A391-4DA9DCB15D1E}"
-el = "{2E6901B1-A29C-48D3-A1D4-531BA141DE90}"
-nl = "{23BB9DD6-10F0-4B81-A967-824C482F86B9}"
-fr = "{2CA6C9C8-68AC-4CEE-A335-715EEEA5C95A}"
-es = "{AC8FC24A-2B06-4791-86D5-13747A54CFD9}"
-fi = "{E50DC1E3-0EC1-43E1-A6E3-8B9A70F8B3EF}"
-hu = "{0654471C-6784-4F57-8F39-655E680CFB28}"
-ca = "{203C86EB-4A21-4AE1-A555-E3FD5DF863B2}"
-it = "{FB1BAD3A-D0B7-4F05-A698-258C5ADFA17B}"
-cs = "{5D76E7D2-4C3F-4BF7-9574-1E01F9E68023}"
-sk = "{F2B735D6-7210-49CD-B3DC-E5EEE07D1EB3}"
-en-GB = "{96D7CBE6-DCD5-4647-A0CE-ABB1ECAD1840}"
-da = "{78D519F9-4EBF-40E5-895D-BCE019F448BE}"
-sv = "{B59EAD82-B261-48FF-807E-3050A5D9F234}"
-no = "{5889B8C4-0870-4319-B920-56F1D8AF5EBA}"
-pl = "{4932E078-0B9C-492F-A83B-BE0EA8988D52}"
-de = "{92496D40-FD43-4710-AFB0-80E481F9E0C4}"
-pt-BR = "{238EB622-30E1-40AE-8824-AF300293A335}"
-th = "{D935B9CC-0E26-46BC-8CA5-7DBB43500098}"
-et = "{88BFF9E7-993E-4FB1-8C1F-8D7BB4DF9AB3}"
-ja = "{01ACB7DA-DB98-43CE-B1E2-66869F2F5F8F}"
-ko = "{4DA39F5E-CA6B-4CD4-8D37-01929510527A}"
-zh-CN = "{1B6D81BA-F565-4309-80EC-0E221A48E045}"
-zh-TW = "{3F0ABBBF-ADA1-479F-B01A-E76FB8C0E46D}"
-tr = "{625F01BA-DEB1-4AE8-AF7B-CB0E11456EA2}"
-hi = "{B098DABC-F38B-41FE-A5F0-8F671019A203}"
-ar = "{81563C9F-5D94-473D-9C81-93B9EAF652A6}"
-he = "{4E1C4936-9C8A-4B5E-93EC-408FBEFFE00A}"
-multiwestern = "{261CBB5C-E2E3-47B5-A116-AB404BD7ACFE}"
-multiasia = "{1EFCF35F-6267-4AC7-A2DF-9F3C40462869}"
+en-US = "{04D01DA9-024B-4C37-A69C-F7BA76A95702}"
+pt = "{F859617C-7885-49B3-827A-8C9617C622F6}"
+ru = "{1D812984-FD08-415C-9967-CF228C28767C}"
+el = "{71057736-397D-44E4-AE0E-39A15F4E3CDE}"
+nl = "{3BEDD097-FF77-4E6A-A8DA-888A0911C0EB}"
+fr = "{38ED5703-6901-4CED-BD61-0C09DD972C9A}"
+es = "{CFFFB160-317A-4A75-A279-6D2691BE949D}"
+fi = "{9DFB7BF7-CD4C-4F85-B3D0-FAEE6470CFB4}"
+hu = "{C6A8BDB3-48E5-4302-85EA-DFA4E4E9C2BA}"
+ca = "{0B9E04F3-A1FA-4A82-B710-E7B4221AF77D}"
+it = "{ED565020-41A2-4990-B0C2-B7043D4CFA9D}"
+cs = "{9504A85C-5E31-420E-88BD-12C50B9528C7}"
+sk = "{B7EA5EEF-5834-4B3E-B774-115ED16A8797}"
+en-GB = "{985D8E18-263F-42C8-A913-FD2556EC7161}"
+da = "{64F8DC46-2087-41B4-B82D-39D55BBC8A48}"
+sv = "{9A8E6339-779C-4B0B-A3E5-B4CBBD2E271D}"
+no = "{C99FCCE7-9478-4EE0-9B5E-AC46BA2874D7}"
+pl = "{B5AD6AF9-16C3-4F57-8F63-DF341762CC5B}"
+de = "{9695B172-6236-4057-BE81-3B2002B2EABA}"
+pt-BR = "{740FB449-BE5F-42C5-8982-24FE4A165992}"
+th = "{3D0D7BAC-56EC-4BAB-98BC-DD3D1F276390}"
+et = "{F44C6B10-CBEB-402B-A634-A809AE4E4DED}"
+ja = "{27F0C5E9-4DDC-4D8E-9477-D25C99B98FE4}"
+ko = "{71256996-7D5B-4460-AD23-66F68A99155B}"
+zh-CN = "{11173006-B5BD-41EF-B071-87DD6D7D639B}"
+zh-TW = "{66401593-6930-4B87-8283-2AAA4B1FA978}"
+tr = "{3E02284B-AD3B-4716-8908-0D008D795378}"
+hi = "{2455F7CF-1D9C-4FCE-A90A-A059C037A758}"
+ar = "{6DBB85B9-99A1-45A4-99F2-E174D4825F14}"
+he = "{3EC2568D-8AEE-4968-8B3D-075E360D3A53}"
+multiwestern = "{0050B5A3-CD83-4155-A72D-740BBF0D9E34}"
+multiasia = "{1C121AF5-5B2C-4A87-AB4B-2AA85A6DCAE7}"
 
 [UPGRADECODE]
-en-US = "{827077D9-7903-4732-9F11-3EEC4A4D21BE}"
+en-US = "{EFD2F52B-6C0E-4F84-9E95-79C5F69DF479}"
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/codes.txt b/instsetoo_native/inc_ure/windows/msi_templates/codes.txt
index c91aaf890ec0..934c95109fef 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/codes.txt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/codes.txt
@@ -1,36 +1,36 @@
 [PRODUCTCODE]
-en-US = "{5349E7C9-2B55-46FB-AB26-25E019E9A86C}"
-pt = "{B74A8B8E-968C-4531-8B6C-409E51D0A914}"
-ru = "{9001BF0C-2EFA-4682-9F4B-0AA2795FB18A}"
-el = "{7035464F-45B4-41E3-A923-AC2EF4604C3A}"
-nl = "{5D961D6C-B058-44FE-9CEA-49BF7B6C1587}"
-fr = "{484F1EEA-7DFB-4A4F-9555-9A28488A9007}"
-es = "{F30569F1-C491-49B0-BDC3-220B8DDEB3AB}"
-fi = "{C6C913B4-6F59-4F45-B37E-89494B94BBBC}"
-hu = "{739D1838-3118-4941-9BDF-68E02251C957}"
-ca = "{2D244112-AEFF-439B-B891-1933B0652688}"
-it = "{DCEAB7D4-F591-4D91-B810-8E1516A4FB74}"
-cs = "{3EF31743-BD4C-4CFF-ADF4-DC997358B6DD}"
-sk = "{18F19719-BDA2-4D6C-82C6-E5CE6A11933B}"
-en-GB = "{38B81FA6-8BF3-4B2C-B4E5-9F52E6BFB437}"
-da = "{52DC7E0E-C7AF-4EAA-A0EE-E5CD30190A2D}"
-sv = "{2A1ED9F2-5C50-458A-A8EC-E1A8853FCDEE}"
-no = "{E3B0AB69-1492-4595-AB55-D9ACE585A35D}"
-pl = "{6FA34430-ACE2-4352-A4F6-B196673EE865}"
-de = "{7469E5D7-5F44-47A2-BCCA-C7B0AB88A333}"
-pt-BR = "{780E6282-6AA2-4CB3-A741-929B89B4DBE0}"
-th = "{3581A940-F712-4E3C-8441-CEAACB8820EC}"
-et = "{A2BDCED1-8469-4570-A86A-68ED4F2E27A3}"
-ja = "{829FD4BC-81FA-40F0-8F7D-DB6F1308E824}"
-ko = "{D3086F70-784A-4926-AFAE-5EDCB2856E5D}"
-zh-CN = "{1AA6B4E8-D53F-4E3D-A21E-F7AD2BC2FE71}"
-zh-TW = "{EC7A7CA1-9A52-4C5C-B83F-BB98F87EED6C}"
-tr = "{4B87AD52-61B3-4065-9D09-E01F3F56E1A1}"
-hi = "{C8911584-ECCA-47D9-8229-763B53AB616D}"
-ar = "{71A9C878-FEDC-4ACE-8E69-C5644A204558}"
-he = "{066FFDBA-F99A-47E4-9C25-33E61461C878}"
-multiwestern = "{878755C3-6293-47EB-AACB-0E00B861FB37}"
-multiasia = "{40ADD5AE-CF08-4686-B531-F66160DB6869}"
+en-US = "{BD608D70-94EE-4793-A942-D4978B56B735}"
+pt = "{395C0DE6-BFAB-4100-836D-6633D9FAF84D}"
+ru = "{B020E61C-4577-4092-AED9-7E29A3CBA2CA}"
+el = "{83A626D6-E9EC-4F93-8D8C-0C0FF909924F}"
+nl = "{97D63D2B-878E-4A1F-907B-E5A71B225FB5}"
+fr = "{BAD1536A-5351-4D37-A4A4-DD486537474F}"
+es = "{A4A5F141-B49A-4058-9DEB-FCA6DBBA1821}"
+fi = "{E094BD07-9E0A-4235-B202-CF254F0EA4A7}"
+hu = "{BCAB02B1-D876-4307-A2D6-6A730F423B45}"
+ca = "{6AA0063F-CA6C-48D2-9B17-61C1B6EF169F}"
+it = "{CECEB3CB-386A-4F16-8A88-C80850E09BDA}"
+cs = "{DA8AF4CC-BF82-4076-9B3A-AA93B49BAC6B}"
+sk = "{F7AD5F59-4824-466F-BF27-C3F2658DA7F6}"
+en-GB = "{D008C4D9-64C7-4ABF-82B7-DF8D4917FFB4}"
+da = "{BAF99FD3-A5C8-4628-B836-69F0056BC6D6}"
+sv = "{1E2C32F9-FB99-4861-90D2-805C44CDE2E8}"
+no = "{FBF48667-A68E-4F53-BD54-F85179B1CE1C}"
+pl = "{F8496E9B-FA31-48A1-BBF6-549BAEB34815}"
+de = "{5E960786-F4F3-4744-B402-FF7C01432987}"
+pt-BR = "{CA076406-011C-4B94-9667-BEA2020ABFC8}"
+th = "{847CFC65-88E2-4F23-ABB8-2AAA468090EB}"
+et = "{E6D97841-28E4-4BA8-A52F-A3BAFE3E250E}"
+ja = "{53B387F3-FC9F-4143-B309-B18E4498AC14}"
+ko = "{9A0B32AC-9D4D-4035-974D-66052C7F06AC}"
+zh-CN = "{56339959-E94E-4697-8C22-357855F3DA2C}"
+zh-TW = "{540D1E5D-B770-44EB-A1B1-5E1B1E88E6C0}"
+tr = "{AFA20894-DAFA-4733-B0E4-16019BFE7D9D}"
+hi = "{E8569C57-B57A-41A6-90A5-7D2A4C1B8D5C}"
+ar = "{F3843E12-0254-43D1-B8A1-3BB00F939BE6}"
+he = "{733B8C44-7982-4676-A7C5-950A3280C056}"
+multiwestern = "{3954C0B9-5E4A-48AC-BA53-5DBD14A478CE}"
+multiasia = "{67D6E6A3-26F3-403C-AEB0-CB9F7E415C7F}"
 
 [UPGRADECODE]
-en-US = "{D8DFFC6A-35C6-4AFD-88DE-E5B4528D8740}"
+en-US = "{D1543E64-64B6-40F9-A5FC-696E95E2DE87}"
diff --git a/instsetoo_native/prj/build.lst b/instsetoo_native/prj/build.lst
index 490d2e4a5c9b..5f3912d6b2f8 100644
--- a/instsetoo_native/prj/build.lst
+++ b/instsetoo_native/prj/build.lst
@@ -1,4 +1,4 @@
-oon	instsetoo_native	::	L10N:l10n postprocess packimages testautomation ooo_custom_images NULL
+oon	instsetoo_native	::	TRANSLATIONS:translations postprocess packimages testautomation NULL
 oon	instsetoo_native						usr1	-	all	oon_mkout NULL
 oon	instsetoo_native\inc_openoffice\unix	nmake	-	u	oon_unix NULL
 oon	instsetoo_native\inc_openoffice\windows\msi_languages	nmake	-	all	oon_msilang NULL
diff --git a/instsetoo_native/prj/d.lst b/instsetoo_native/prj/d.lst
index 4a1f33b51071..c4156b75bc43 100644
--- a/instsetoo_native/prj/d.lst
+++ b/instsetoo_native/prj/d.lst
@@ -1,3 +1,3 @@
-mkdir: %_DEST%\pus%_EXT%
-..\%COMMON_OUTDIR%\bin\hid\userfeedback_VCL_names.csv %COMMON_DEST%\bin%_EXT%\userfeedback_VCL_names.csv
-..\%__SRC%\misc\*.update.xml %_DEST%\pus%_EXT%\*.update.xml
+mkdir: %_DEST%\pus
+..\%COMMON_OUTDIR%\bin\hid\userfeedback_VCL_names.csv %COMMON_DEST%\bin\userfeedback_VCL_names.csv
+..\%__SRC%\misc\*.update.xml %_DEST%\pus\*.update.xml
diff --git a/instsetoo_native/res/nologobanner.bmp b/instsetoo_native/res/nologobanner.bmp
new file mode 100644
index 000000000000..3bd088711545
--- /dev/null
+++ b/instsetoo_native/res/nologobanner.bmp
diff --git a/instsetoo_native/res/nologoinstall.bmp b/instsetoo_native/res/nologoinstall.bmp
index 5f3a3cd7129e..8af9fc41f709 100644
--- a/instsetoo_native/res/nologoinstall.bmp
+++ b/instsetoo_native/res/nologoinstall.bmp
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 2972d04111bd..3c93c3fdf387 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -67,27 +67,41 @@ INSTALLDIR=$(OUT)
 
 .INCLUDE: target.mk
 
+.IF "$(DISABLE_PYTHON)" != "TRUE"
 LOCALPYFILES= \
     $(BIN)$/uno.py \
     $(BIN)$/unohelper.py \
     $(BIN)$/pythonloader.py \
-    $(BIN)$/pythonscript.py \
     $(BIN)$/officehelper.py \
-    $(BIN)$/mailmerge.py
+    $(BIN)$/mailmerge.py \
+    $(BIN)$/msgbox.py
+.ENDIF
+
+help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US
+
+allhelplangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(help_exist) $(eq,$i,$j  $i $(NULL))))
 
 xxxx:
-    echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml
+    echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml
 
 .IF "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
 ALLTAR  : $(LOCALPYFILES)
     @echo "No EPM: do no packaging at this stage"
 .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
 .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+.IF "$(ENABLE_RELEASE_BUILD)"=="TRUE"
+.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack)
+.ELSE
+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) sdkoo_en-US ure_en-US
+.ENDIF
+.ELSE
 .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
-ALLTAR : openoffice
+ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack)
 .ELSE
-ALLTAR : openoffice sdkoo_en-US ure_en-US
+ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack) sdkoodev_en-US ure_en-US
 .ENDIF
+.ENDIF # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
 .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
 ALLTAR : updatepack
 .ENDIF			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
@@ -128,44 +142,46 @@ ooolanguagepack : $(foreach,i,$(alllangiso) ooolanguagepack_$i)
 
 ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i)
 
+ooohelppack : $(foreach,i,$(allhelplangiso) ooohelppack_$i)
+
+ooodevhelppack: $(foreach,i,$(allhelplangiso) ooodevhelppack_$i)
+
 sdkoo: $(foreach,i,$(alllangiso) sdkoo_$i)
 
 sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
 
 ure: $(foreach,i,$(alllangiso) ure_$i)
 
-broffice: $(foreach,i,$(alllangiso) broffice_$i)
+oxygenoffice: $(foreach,i,$(alllangiso) oxygenoffice_$i)
 
-brofficedev: $(foreach,i,$(alllangiso) brofficedev_$i)
+oxygenofficewithjre: $(foreach,i,$(alllangiso) oxygenofficewithjre_$i)
 
-brofficewithjre: $(foreach,i,$(alllangiso) brofficewithjre_$i)
+oxygenofficelanguagepack : $(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i)
 
-broolanguagepack : $(foreach,i,$(alllangiso) broolanguagepack_$i)
+oxygenofficehelppack : $(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i)
 
 MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates
 MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
+MSIHELPPACKTEMPLATESOURCE=$(PRJ)$/inc_ooohelppack$/windows$/msi_templates
 MSIURETEMPLATESOURCE=$(PRJ)$/inc_ure$/windows$/msi_templates
 MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates
 
 .IF "$(BUILD_SPECIAL)"!=""
 MSIOFFICETEMPLATEDIR=$(MSIOFFICETEMPLATESOURCE)
 MSILANGPACKTEMPLATEDIR=$(MSILANGPACKTEMPLATESOURCE)
+MSIHELPPACKTEMPLATEDIR=$(MSIHELPPACKTEMPLATESOURCE)
 MSIURETEMPLATEDIR=$(MSIURETEMPLATESOURCE)
 MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE)
 .ELSE			# "$(BUILD_SPECIAL)"!=""
 NOLOGOSPLASH:=$(BIN)$/intro.zip
 DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip
-BROFFICENOLOGOSPLASH:=$(BIN)$/broffice$/intro.zip
-BROFFICENOLOGOBRAND:=$(BIN)$/broffice$/images_brand.zip
-BROFFICEDEVNOLOGOSPLASH:=$(BIN)$/broffice_dev$/intro.zip
-BROFFICENDEVOLOGOBRAND:=$(BIN)$/broffice_dev$/images_brand.zip
 MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates
 MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates
+MSIHELPPACKTEMPLATEDIR=$(MISC)$/ooohelppack$/msi_templates
 MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates
 MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates
 
-ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH) $(BROFFICENOLOGOSPLASH) $(BROFFICEDEVNOLOGOSPLASH) \
-    $(BROFFICENOLOGOBRAND) $(BROFFICEDEVNOLOGOBRAND)
+ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH)
 .IF "$(OS)" == "WNT"
 ADDDEPS+=hack_msitemplates
 .ENDIF
@@ -181,19 +197,23 @@ $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $(ADDDEPS)
 
 $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $(ADDDEPS)
 
+$(foreach,i,$(allhelplangiso) ooohelppack_$i) : $(ADDDEPS)
+
+$(foreach,i,$(allhelplangiso) ooodevhelppack_$i) : $(ADDDEPS)
+
 $(foreach,i,$(alllangiso) sdkoo_$i) : $(ADDDEPS)
 
 $(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
-             
+
 $(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
 
-$(foreach,i,$(alllangiso) broffice_$i) : $(ADDDEPS)
+$(foreach,i,$(alllangiso) oxygenoffice_$i) : $(ADDDEPS)
 
-$(foreach,i,$(alllangiso) brofficedev_$i) : $(ADDDEPS)
+$(foreach,i,$(alllangiso) oxygenofficewithjre_$i) : $(ADDDEPS)
 
-$(foreach,i,$(alllangiso) brofficewithjre_$i) : $(ADDDEPS)
+$(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $(ADDDEPS)
 
-$(foreach,i,$(alllangiso) broolanguagepack_$i) : $(ADDDEPS)
+$(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i) : $(ADDDEPS)
 
 .IF "$(MAKETARGETS)"!=""
 $(MAKETARGETS) : $(ADDDEPS)
@@ -209,33 +229,41 @@ $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
 .ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
 .ENDIF			# "$(MAKETARGETS)"!=""
 openoffice_%{$(PKGFORMAT:^".") .archive} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
 $(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
 openofficewithjre_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
 
 $(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
 openofficedev_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
 $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
 ooolanguagepack_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
 
 $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
 ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
+
+$(foreach,i,$(allhelplangiso) ooohelppack_$i) : $$@{$(PKGFORMAT:^".")}
+ooohelppack_%{$(PKGFORMAT:^".")} :
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
+
+$(foreach,i,$(allhelplangiso) ooodevhelppack_$i) : $$@{$(PKGFORMAT:^".")}
+ooodevhelppack_%{$(PKGFORMAT:^".")} :
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
 
 $(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
 sdkoo_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
 
 $(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
 sdkoodev_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
 
 $(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
 ure_%{$(PKGFORMAT:^".")} :
@@ -245,89 +273,107 @@ ure_%{$(PKGFORMAT:^".")} :
     $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst \
         -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p URE -u $(OUT) -buildid $(BUILD) -format $(@:e:s/.//) $(VERBOSESWITCH) \
         -msitemplate $(MSIURETEMPLATEDIR) \
-        -msilanguage $(MISC)$/win_ulffiles
+        -msilanguage $(COMMONMISC)$/win_ulffiles
 .ENDIF
 
-$(foreach,i,$(alllangiso) broffice_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(alllangiso) oxygenoffice_$i) : $$@{$(PKGFORMAT:^".")}
 .IF "$(MAKETARGETS)"!=""
 .IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
 $(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
 $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
 .ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
 .ENDIF			# "$(MAKETARGETS)"!=""
-broffice_%{$(PKGFORMAT:^".")} :
-    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product BrOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+oxygenoffice_%{$(PKGFORMAT:^".") .archive} :
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OxygenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
-$(foreach,i,$(alllangiso) brofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
-brofficewithjre_%{$(PKGFORMAT:^".")} :
-    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+$(foreach,i,$(alllangiso) oxygenofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
+oxygenofficewithjre_%{$(PKGFORMAT:^".")} :
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
 
-$(foreach,i,$(alllangiso) brofficedev_$i) : $$@{$(PKGFORMAT:^".")}
-brofficedev_%{$(PKGFORMAT:^".")} :
-    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product BrOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+$(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
+oxygenofficelanguagepack_%{$(PKGFORMAT:^".")} :
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
 
-$(foreach,i,$(alllangiso) broolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
-broolanguagepack_%{$(PKGFORMAT:^".")} :
-    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
+$(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i) : $$@{$(PKGFORMAT:^".")}
+oxygenofficehelppack_%{$(PKGFORMAT:^".")} :
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
 
 .ELSE			# "$(alllangiso)"!=""
 openoffice:
-    @echo cannot pack nothing...
+    @echo cannot pack anything...
 
 .ENDIF			# "$(alllangiso)"!=""
 
+.IF "$(DISABLE_PYTHON)" != "TRUE"
 .IF "$(LOCALPYFILES)"!=""
-$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
+$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
 .ENDIF			# "$(LOCALPYFILES)"!=""
 
 $(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
     @$(COPY) $< $@
+.ENDIF			# "$(DISABLE_PYTHON)" != "TRUE"
 
-$(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_nologo$/intro.zip
-    $(COPY) $< $@
-
-$(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_dev_nologo$/intro.zip
-    @-$(MKDIR) $(@:d)
-    $(COPY) $< $@
-
-$(BIN)$/broffice_dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/broffice_dev_nologo$/intro.zip
-    @-$(MKDIR) $(@:d)
-    $(COPY) $< $@
-
-$(BIN)$/broffice$/intro.zip : $(SOLARCOMMONPCKDIR)$/broffice_nologo$/intro.zip
-    @-$(MKDIR) $(@:d)
+$(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/intro.zip
     $(COPY) $< $@
 
-$(BIN)$/broffice$/images_brand.zip : $(SOLARCOMMONBINDIR)$/broffice_nologo$/images_brand.zip
+$(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/brand_dev$/intro.zip
     @-$(MKDIR) $(@:d)
     $(COPY) $< $@
 
 hack_msitemplates .PHONY:
     -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)
     -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)
+    -$(MKDIRHIER) $(MSIHELPPACKTEMPLATEDIR)
     -$(MKDIRHIER) $(MSIURETEMPLATEDIR)
     -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
     -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)$/Binary
     -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary
+    -$(MKDIRHIER) $(MSIHELPPACKTEMPLATEDIR)$/Binary
     -$(MKDIRHIER) $(MSIURETEMPLATEDIR)$/Binary
     -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary
     $(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
     $(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
+    $(GNUCOPY) -u $(MSIHELPPACKTEMPLATESOURCE)$/*.* $(MSIHELPPACKTEMPLATEDIR)
     $(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR)
     $(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
     $(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary
     $(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary
+    $(GNUCOPY) -u $(MSIHELPPACKTEMPLATESOURCE)$/Binary$/*.* $(MSIHELPPACKTEMPLATEDIR)$/Binary
     $(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary
     $(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary
     $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
     $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+    $(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp
     $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
     $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
+    $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
+    $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
+    $(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp
+    $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
+    $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
     $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
     $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp
     $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
     $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
+    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
+    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
+    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp
+    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
+    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
+
+.IF "$(OS)" == "WNT"
+
+ALLLANGSTRING:=$(alllangiso)
+
+openofficeall: hack_msitemplates $(LOCALPYFILES) openoffice_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
+
+openofficedevall: hack_msitemplates $(LOCALPYFILES) openofficedev_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
+
+sdkooall: hack_msitemplates $(LOCALPYFILES) sdkoo_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
+
+sdkoodevall: hack_msitemplates $(LOCALPYFILES) sdkoodev_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
 
+.ENDIF			# "$(OS)" == "WNT"
 
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 8ea316d1baa2..bd8268e90dc2 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -5,29 +5,29 @@ Globals
 		variables
 		{
 			OOOBASEVERSION 3.4
-			OOOPACKAGEVERSION 3.4.0
+  			OOOPACKAGEVERSION 3.4.0
 			UREPACKAGEVERSION 3.4.0
 			URELAYERVERSION 1
-			BASISROOTNAME OpenOffice.org
-			UNIXBASISROOTNAME openoffice.org
-			SERVICETAG_PRODUCTNAME OpenOffice.org 3.4 
+			BASISROOTNAME LibreOffice
+			UNIXBASISROOTNAME libreoffice3.4
+			SERVICETAG_PRODUCTNAME LibreOffice 3.4
 			SERVICETAG_PRODUCTVERSION 3.4
-			SERVICETAG_PARENTNAME OpenOffice.org 3.4 
+			SERVICETAG_PARENTNAME LibreOffice 3.4
 			SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
 			SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
 			HIDELICENSEDIALOG 1
 			PACKAGEPREFIX 
-			BASISPACKAGEPREFIX ooobasis
-			UREPACKAGEPREFIX openoffice.org
-			SOLSUREPACKAGEPREFIX openofficeorg
+			BASISPACKAGEPREFIX libobasis
+			UREPACKAGEPREFIX libreoffice
+			SOLSUREPACKAGEPREFIX libreoffice
 			USE_FILEVERSION 1
 			LIBRARYVERSION 9.4.0
             POOLPRODUCT 1
-            REGISTRATION_HOST https://hs-ws1.oracle.com/RegistrationWeb
-			REGISTRATIONURL http://survey.services.openoffice.org/user/index.php
-			PROGRESSBARCOLOR 14,133,205
-			PROGRESSSIZE 320,7
-			PROGRESSPOSITION 185,206
+            REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb
+			REGISTRATIONURL http://survey.libreoffice.org/user/index.php
+			PROGRESSBARCOLOR 126,170,23
+			PROGRESSSIZE 319,10
+			PROGRESSPOSITION 164,225
 			PROGRESSFRAMECOLOR 207,208,211
 			NATIVEPROGRESS true
 			REGISTRYLAYERNAME Layers
@@ -37,7 +37,7 @@ Globals
             UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
  			PACKAGEMAP package_names.txt,package_names_ext.txt
 			WINDOWSPATCHLEVEL 8
-            OOOVENDOR Oracle
+            OOOVENDOR The Document Foundation
 			OOODOWNLOADNAME 1
 			STARTCENTER_LAYOUT_STYLE 0
 			BUILDIDCWS {buildidcws}
@@ -46,26 +46,26 @@ Globals
 	}
 }
 
-OpenOffice
+LibreOffice
 {
 	Settings
 	{
 		variables
 		{
-			PRODUCTNAME OpenOffice.org
+			PRODUCTNAME LibreOffice
 			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION 
+			SHORT_PRODUCTEXTENSION rc2
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3
+			BRANDPACKAGEVERSION 3.4
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.4.0
 			BASEPRODUCTVERSION 3.4
             PCPFILENAME openoffice.pcp
-			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
-            ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
+			UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+            ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
@@ -74,7 +74,7 @@ OpenOffice
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
 			PACKAGEVERSION 3.4.0
-			PACKAGEREVISION {milestone}
+			PACKAGEREVISION {buildid}
 			LICENSENAME LGPL
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
@@ -93,42 +93,43 @@ OpenOffice
 			DOWNLOADBITMAP	ooobitmap.bmp
 			DOWNLOADSETUPICO	ooosetup.ico
 			RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
-            STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
-            STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
+            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL http://www.libreoffice.org/
+            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
             STARTCENTER_LAYOUT_STYLE 0
-            REGISTRATION_PRODUCT OpenOffice.org
+            REGISTRATION_PRODUCT LibreOffice
             REGISTRATION_CID 926117
-            DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
+            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
 		}
 		active			1
 		compression		5
 		script			setup_osl
-		downloadname	OOo_{productversion}_{os}_install_{languages}
-		langpackdownloadname	OOo_{productversion}_languagepack_{os}_install_{languages}
+		downloadname	LibO_{productversion}_{os}_install_{languages}
+		langpackdownloadname	LibO_{productversion}_languagepack_{os}_install_{languages}
+		helppackdownloadname	LibO_{productversion}_helppack_{os}_install_{languages}
 		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
 
-OpenOffice_wJRE
+LibreOffice_wJRE
 {
 	Settings
 	{
 		variables
 		{
-			PRODUCTNAME OpenOffice.org
+			PRODUCTNAME LibreOffice
 			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION 
+			SHORT_PRODUCTEXTENSION rc2
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3
+			BRANDPACKAGEVERSION 3.4
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.4.0
 			BASEPRODUCTVERSION 3.4
-			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
-            ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
+			UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+            ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
@@ -137,7 +138,7 @@ OpenOffice_wJRE
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
 			PACKAGEVERSION 3.4.0
-			PACKAGEREVISION {milestone}
+			PACKAGEREVISION {buildid}
 			LICENSENAME LGPL
 			WITHJREPRODUCT 1
 			GLOBALFILEGID gid_File_Lib_Vcl
@@ -158,56 +159,56 @@ OpenOffice_wJRE
 			DOWNLOADBITMAP	ooobitmap.bmp
 			DOWNLOADSETUPICO	ooosetup.ico
 			RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
-            STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
-            STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
+            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL http://www.libreoffice.org/
+            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
             STARTCENTER_LAYOUT_STYLE 0
-            REGISTRATION_PRODUCT OpenOffice.org
+            REGISTRATION_PRODUCT LibreOffice
             REGISTRATION_CID 926117
-            DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
+            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
 		}
 		active			1
 		compression		5
 		script			setup_osljre
-		downloadname	OOo_{productversion}_{os}_installwjre_{languages}
+		downloadname	LibO_{productversion}_{os}_installwjre_{languages}
 		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
 
-OpenOffice_Dev
+LibreOffice_Dev
 {
 	Settings
 	{
 		variables
 		{
-			PRODUCTNAME OOo-dev
+			PRODUCTNAME LibO-dev
 			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION 
-			BASISROOTNAME OOo-dev
-			UNIXBASISROOTNAME ooo-dev
+			SHORT_PRODUCTEXTENSION rc2
+			BASISROOTNAME LibO-dev
+			UNIXBASISROOTNAME lo-dev
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3
+			BRANDPACKAGEVERSION 3.4
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.4.0
 			BASEPRODUCTVERSION 3.4
 			DEVELOPMENTPRODUCT 1
-			BASISPACKAGEPREFIX ooobasis-dev
-			UREPACKAGEPREFIX ooodev
-			SOLSUREPACKAGEPREFIX ooodev
+			BASISPACKAGEPREFIX libobasis-dev
+			UREPACKAGEPREFIX lodev
+			SOLSUREPACKAGEPREFIX lodev
 			REGISTRYLAYERNAME LayerDev
 			SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
-			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
-            ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
+			UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+            ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
 			PACKAGEVERSION 3.4.0
-			PACKAGEREVISION {milestone}
+			PACKAGEREVISION {buildid}
 			LICENSENAME LGPL
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
@@ -215,12 +216,11 @@ OpenOffice_Dev
 			OPENSOURCE 1
 			SETSTATICPATH 1
 			OOODOWNLOADNAME 1
-			XPDINSTALLER 1
+			XPDINSTALLER 0
 			BETAUPGRADECODE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
-			JAVAPRODUCT 1
 			LIBRARYVERSION 9.4.0
 			PATCHCODEFILE ooodev_patchcodes.txt
 			CODEFILENAME codes_ooodev.txt
@@ -229,19 +229,20 @@ OpenOffice_Dev
 			DOWNLOADSETUPICO	ooosetup.ico
 			LOCALUSERDIR $ORIGIN/..
 			RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
-            STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
-            STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
+            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL http://www.libreoffice.org/
+            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
             STARTCENTER_LAYOUT_STYLE 0
-            REGISTRATION_PRODUCT OpenOffice.org
+            REGISTRATION_PRODUCT LibreOffice
             REGISTRATION_CID 926117
-            DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
+            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
 		}
 		active			1
 		compression		5
-		script			setup_osljre
-		downloadname	OOo-dev_{productversion}_{os}_install_{languages}
-		langpackdownloadname	OOo_{productversion}_languagepack_{os}_install_{languages}
+		script			setup_osl
+		downloadname	LibO-dev_{productversion}_{os}_install_{languages}
+		langpackdownloadname	LibO_{productversion}_languagepack_{os}_install_{languages}
+		helppackdownloadname	LibO_{productversion}_helppack_{os}_install_{languages}
 		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
@@ -258,8 +259,9 @@ URE
             PACKAGEVERSION 3.4
             PACKAGEREVISION 1
             PRODUCTEXTENSION
+            BRANDPACKAGEVERSION 3.4
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION
+            SHORT_PRODUCTEXTENSION rc2
             LICENSENAME LGPL
             SETSTATICPATH 1
             NOVERSIONINDIRNAME 1
@@ -271,13 +273,13 @@ URE
             DOWNLOADSETUPICO ooosetup.ico
             DONTUSESTARTMENUFOLDER 1
             RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
-            STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
-            STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
+            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL http://www.libreoffice.org/
+            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
             STARTCENTER_LAYOUT_STYLE 0
             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,version.lst
 			PACKAGEMAP package_names_ext.txt
-            DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
+            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
         }
         active 1
         compression 5
@@ -286,27 +288,27 @@ URE
     }
 }
 
-OpenOffice_SDK
+LibreOffice_SDK
 {
     Settings
     {
         downloadname OOo-SDK_{packageversion}_{os}_install_{languages}
         variables
         {
-            PRODUCTNAME OpenOffice.org
+            PRODUCTNAME LibreOffice
             PRODUCTVERSION 3.4
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION
+            SHORT_PRODUCTEXTENSION rc2
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
-            BRANDPACKAGEVERSION 3
+            BRANDPACKAGEVERSION 3.4
             PACKAGEVERSION 3.4.0
-            PACKAGEREVISION {milestone}
+            PACKAGEREVISION {buildid}
             PACK_INSTALLED 1
             POOLPRODUCT 0
             DMG_VOLUMEEXTENSION SDK
-            DATABASENAME openofficeorg33sdk
+            DATABASENAME libreoffice33sdk
             NO_README_IN_ROOTDIR 1
             LICENSENAME LGPL
             IGNOREDIRECTORYLAYER 1
@@ -319,11 +321,11 @@ OpenOffice_SDK
             DOWNLOADSETUPICO ooosetup.ico
             DONTUSESTARTMENUFOLDER 1
             RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
-            STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
-            STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
+            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL http://www.libreoffice.org/
+            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
             STARTCENTER_LAYOUT_STYLE 0
-            DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
+            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
         }
         active 1
         compression 5
@@ -332,34 +334,34 @@ OpenOffice_SDK
     }
 }
 
-OpenOffice_Dev_SDK
+LibreOffice_Dev_SDK
 {
     Settings
     {
         downloadname OOo-Dev-SDK_{packageversion}_{os}_install_{languages}
         variables
         {
-            PRODUCTNAME OOo-dev
+            PRODUCTNAME LibO-dev
             PRODUCTVERSION 3.4
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION
-            BASISROOTNAME OOo-dev
-            UNIXBASISROOTNAME ooo-dev
+            SHORT_PRODUCTEXTENSION rc2
+            BASISROOTNAME LibO-dev
+            UNIXBASISROOTNAME lo-dev
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
-            BRANDPACKAGEVERSION 3
+            BRANDPACKAGEVERSION 3.4
             PACKAGEVERSION 3.4.0
-            PACKAGEREVISION {milestone}
-            BASISPACKAGEPREFIX ooobasis-dev
-            UREPACKAGEPREFIX ooodev
-            SOLSUREPACKAGEPREFIX ooodev
+            PACKAGEREVISION {buildid}
+            BASISPACKAGEPREFIX libobasis-dev
+            UREPACKAGEPREFIX lodev
+            SOLSUREPACKAGEPREFIX lodev
             REGISTRYLAYERNAME LayerDev
 			DEVELOPMENTPRODUCT 1
             PACK_INSTALLED 1
             POOLPRODUCT 0
             DMG_VOLUMEEXTENSION SDK
-            DATABASENAME openofficeorg33devsdk
+            DATABASENAME libreoffice33devsdk
             NO_README_IN_ROOTDIR 1
             LICENSENAME LGPL
             IGNOREDIRECTORYLAYER 1
@@ -372,11 +374,11 @@ OpenOffice_Dev_SDK
             DOWNLOADSETUPICO ooosetup.ico
             DONTUSESTARTMENUFOLDER 1
             RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
-            STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
-            STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
+            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL http://www.libreoffice.org/
+            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
             STARTCENTER_LAYOUT_STYLE 0
-            DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
+            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
         }
         active 1
         compression 5
@@ -385,29 +387,26 @@ OpenOffice_Dev_SDK
     }
 }
 
-BrOffice
+OxygenOffice
 {
 	Settings
 	{
 		variables
 		{
-			PRODUCTNAME BrOffice.org
+			PRODUCTNAME OxygenOffice
 			PRODUCTVERSION 3.4
-			PRODUCTEXTENSION 
-			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION 
+			PRODUCTEXTENSION
+			LONG_PRODUCTEXTENSION
+			SHORT_PRODUCTEXTENSION  rc2
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3
+			BRANDPACKAGEVERSION 3.4
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.4.0
-			PROGRESSBARCOLOR 
-			PROGRESSSIZE 
-			PROGRESSPOSITION 
-			PROGRESSFRAMECOLOR 
-			NATIVEPROGRESS
-			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
-            ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
+			BASEPRODUCTVERSION 3.4
+            PCPFILENAME openoffice.pcp
+			UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+            ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
@@ -416,13 +415,14 @@ BrOffice
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
 			PACKAGEVERSION 3.4.0
-			PACKAGEREVISION {milestone}
+			PACKAGEREVISION {buildid}
 			LICENSENAME LGPL
-			SETSTATICPATH 1
+			SERVICESPROJEKT 1
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 			SPELLCHECKERFILE spellchecker_selection.txt
 			OPENSOURCE 1
+			SETSTATICPATH 1
 			OOODOWNLOADNAME 1
 			XPDINSTALLER 0
 			BETAUPGRADECODE
@@ -430,53 +430,52 @@ BrOffice
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
 			LIBRARYVERSION 9.4.0
-			CODEFILENAME codes_broo.txt
-			PATCHCODEFILE bro_patchcodes.txt
-			DOWNLOADBANNER	brobanner.bmp
-			DOWNLOADBITMAP	brobitmap.bmp
+			PATCHCODEFILE ooo_patchcodes.txt
+			DOWNLOADBANNER	ooobanner_ooop.bmp
+			DOWNLOADBITMAP	ooobitmap_ooop.bmp
+			PROGRESSBARCOLOR 126,170,23
+			PROGRESSSIZE 430,5
+			PROGRESSPOSITION 5,230
+			PROGRESSFRAMECOLOR 207,208,211
 			DOWNLOADSETUPICO	ooosetup.ico
-			WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
 			RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
-            STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
-            STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
+            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL http://www.libreoffice.org/
+            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
             STARTCENTER_LAYOUT_STYLE 0
-            REGISTRATION_PRODUCT OpenOffice.org
+            REGISTRATION_PRODUCT OxygenOffice
             REGISTRATION_CID 926117
-            DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
+            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
 		}
 		active			1
 		compression		5
 		script			setup_osl
-		downloadname	BrOo_{productversion}_{os}_install_{languages}
-		langpackdownloadname	BrOo_{productversion}_languagepack_{os}_install_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		downloadname	OOOP_{productversion}_{os}_install_{languages}
+		langpackdownloadname	OOOP_{productversion}_languagepack_{os}_install_{languages}
+		helppackdownloadname	OOOP_{productversion}_helppack_{os}_install_{languages}
+		include			{solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
 	}
 }
 
-BrOffice_wJRE
+OxygenOffice_wJRE
 {
 	Settings
 	{
 		variables
 		{
-			PRODUCTNAME BrOffice.org
+			PRODUCTNAME OxygenOffice
 			PRODUCTVERSION 3.4
-			PRODUCTEXTENSION 
-			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION 
+			PRODUCTEXTENSION
+			LONG_PRODUCTEXTENSION
+			SHORT_PRODUCTEXTENSION rc2
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3
+			BRANDPACKAGEVERSION 3.4
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.4.0
-			PROGRESSBARCOLOR 
-			PROGRESSSIZE 
-			PROGRESSPOSITION 
-			PROGRESSFRAMECOLOR 
-			NATIVEPROGRESS
-			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
-            ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
+			BASEPRODUCTVERSION 3.4
+			UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+            ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
@@ -485,113 +484,46 @@ BrOffice_wJRE
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
 			PACKAGEVERSION 3.4.0
-			PACKAGEREVISION {milestone}
+			PACKAGEREVISION {buildid}
 			LICENSENAME LGPL
+			SERVICESPROJEKT 1
 			WITHJREPRODUCT 1
-			SETSTATICPATH 1
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 			SPELLCHECKERFILE spellchecker_selection.txt
 			OPENSOURCE 1
-			OOODOWNLOADNAME 1
-			XPDINSTALLER 1
-			BETAUPGRADECODE
-			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
-			CHANGETARGETDIR 1
-			USE_FILEVERSION 1
-			LIBRARYVERSION 9.4.0
-			CODEFILENAME codes_broo.txt
-			PATCHCODEFILE bro_patchcodes.txt
-			JAVAPRODUCT 1
-			DOWNLOADBANNER	brobanner.bmp
-			DOWNLOADBITMAP	brobitmap.bmp
-			DOWNLOADSETUPICO	ooosetup.ico
-			WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
-			RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
-            STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
-            STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
-            STARTCENTER_LAYOUT_STYLE 0
-            REGISTRATION_PRODUCT OpenOffice.org
-            REGISTRATION_CID 926117
-            DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
-		}
-		active			1
-		compression		5
-		script			setup_osljre
-		downloadname	BrOo_{productversion}_{os}_installwjre_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
-	}
-}
-
-BrOffice_Dev
-{
-	Settings
-	{
-		variables
-		{
-			PRODUCTNAME BrOo-dev
-			PRODUCTVERSION 3.4
-			PRODUCTEXTENSION 
-			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION 
-			BASISROOTNAME OOo-dev
-			UNIXBASISROOTNAME ooo-dev
-            POSTVERSIONEXTENSION
-            POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3
-			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.4.0
-			DEVELOPMENTPRODUCT 1
-			BASISPACKAGEPREFIX ooobasis-dev
-			UREPACKAGEPREFIX ooodev
-			SOLSUREPACKAGEPREFIX ooodev
-			REGISTRYLAYERNAME LayerDevBroffice
-			SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
-			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
-            ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
-			EVAL
-			FILEFORMATNAME OpenOffice.org
-			FILEFORMATVERSION 1.0
-			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.4.0
-			PACKAGEREVISION {milestone}
-			LICENSENAME LGPL
 			SETSTATICPATH 1
-			GLOBALFILEGID gid_File_Lib_Vcl
-			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
-			SPELLCHECKERFILE spellchecker_selection.txt
-			OPENSOURCE 1
 			OOODOWNLOADNAME 1
 			XPDINSTALLER 1
 			BETAUPGRADECODE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
-			JAVAPRODUCT 1
 			LIBRARYVERSION 9.4.0
-			PATCHCODEFILE brodev_patchcodes.txt
-			CODEFILENAME codes_broodev.txt
-			DOWNLOADBANNER	brobanner.bmp
-			DOWNLOADBITMAP	brobitmap.bmp
+			PATCHCODEFILE ooo_patchcodes.txt
+			JAVAPRODUCT 1
+			DOWNLOADBANNER	ooobanner_ooop.bmp
+			DOWNLOADBITMAP	ooobitmap_ooop.bmp
 			DOWNLOADSETUPICO	ooosetup.ico
-			WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
-			LOCALUSERDIR $ORIGIN/..
+			PROGRESSBARCOLOR 126,170,23
+			PROGRESSSIZE 430,5
+			PROGRESSPOSITION 5,230
+			PROGRESSFRAMECOLOR 207,208,211
 			RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
-            STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
-            STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
+            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL http://www.libreoffice.org/
+            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
             STARTCENTER_LAYOUT_STYLE 0
-            REGISTRATION_PRODUCT OpenOffice.org
+            REGISTRATION_PRODUCT OxygenOffice
             REGISTRATION_CID 926117
-            DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
+            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
 		}
 		active			1
 		compression		5
 		script			setup_osljre
-		downloadname	BrOo-dev_{productversion}_{os}_install_{languages}
-		langpackdownloadname	BrOo_{productversion}_languagepack_{os}_install_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice_dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice_dev,{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		downloadname	OOOP_{productversion}_{os}_installwjre_{languages}
+		langpackdownloadname	OOOP_{productversion}_languagepack_{os}_installwjre_{languages}
+		helppackdownloadname	OOOP_{productversion}_helppack_{os}_installwjre_{languages}
+		include			{solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
 	}
 }
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index c19039118909..2832afb3c4c7 100644
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -2,23 +2,19 @@
 # Pack.lst: Contains the packaging information for the update packaging process.
 # Syntax: Product, list of platforms, list of languages, target	(Separator: spaces)
 # Syntax for list of languages: One multilingual installation set uses separator ","
-# (Example: "en-US,de" creates english-german multilingual installation set)  
+# (Example: "en-US,de" creates english-german multilingual installation set)
 # Different installation sets use the "|" as separator
 
 # Product       List_of_platforms                                                   List_of_languages   Target
 
-OpenOffice      unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro    en-US   openoffice
-OpenOffice      unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12                                     en-US   openoffice
-#BrOffice                                                                                          pt-BR   broffice
-#OpenOffice_wJRE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,wntmsci12                    en-US   openofficewithjre
-#BrOffice_wJRE                                                                                     pt-BR   brofficewithjre
-OpenOffice_Dev  unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro    en-US   openofficedev
-#BrOffice_Dev                                                                                      pt-BR   brofficedev
-#OpenOffice_SDK  unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12  en-US   sdkoo
-OpenOffice_Dev_SDK  unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12  en-US   sdkoodev
+LibreOffice             unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US|ar|bg|bn|ca|ca-XV|cs|da|de|el|en-GB|es|et|eu|fi|fr|ga|gl|he|hu|it|ja|km|ko|lt|mk|nb|nl|om|pl|pt|pt-BR|ru|sh|sl|sr|sv|tr|vi|zh-CN|zh-TW openoffice
+#LibreOffice      unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12                                  en-US   openoffice
+LibreOffice_wJRE        unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US|ar|bg|bn|ca|ca-XV|cs|da|de|el|en-GB|es|et|eu|fi|fr|ga|gl|he|hu|it|ja|km|ko|lt|mk|nb|nl|om|pl|pt|pt-BR|ru|sh|sl|sr|sv|tr|vi|zh-CN|zh-TW openofficewithjre
+#LibreOffice_Dev  unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro    en-US   openofficedev
+LibreOffice_SDK         unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro  en-US   sdkoo
+#LibreOffice_Dev_SDK  unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro  en-US   sdkoodev
 #URE             unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12  en-US   ure
-OpenOfficeLanguagepack   unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro    de      ooolanguagepack
-OpenOfficeLanguagepack   unxlngi6,unxsoli4,unxsols4,wntmsci12,unxmacxi                                     de      ooolanguagepack
-OpenOfficeDevLanguagepack   unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro     de|fr|ja|ar|ru   ooodevlanguagepack
-#BrOfficeLanguagepack     unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro        pt-BR   broolanguagepack
+LibreOfficeLanguagepack unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US|ar|as|ast|be|bg|bn|ca|ca-XV|cs|da|de|dz|el|en-GB|eo|es|et|eu|fi|fr|ga|gl|gu|he|hi|hu|id|is|it|ja|ka|km|kn|ko|ku|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ro|ru|sh|si|sk|sl|sr|sv|ta|te|th|tr|ug|uk|uz|vi|zh-CN|zh-TW ooolanguagepack
+#LibreOfficeLanguagepack   unxlngi6,unxsoli4,unxsols4,wntmsci12,unxmacxi                                     de      ooolanguagepack
+#LibreOfficeDevLanguagepack   unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro     ar|as|ast|bg|bn|ca|ca-XV|cs|da|de|dz|el|en-GB|es|et|eu|fi|fr|ga|gl|gu|he|hi|hu|id|is|it|ja|km|kn|ko|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ru|sh|si|sk|sl|sr|sv|ta|te|th|tr|ug|uk|vi|zh-CN|zh-TW   ooodevlanguagepack
 
diff --git a/instsetoo_native/util/update.xml b/instsetoo_native/util/update.xml
index 8b8a4dc7cd37..832de6bffcb0 100644
--- a/instsetoo_native/util/update.xml
+++ b/instsetoo_native/util/update.xml
@@ -6,5 +6,5 @@
   <inst:buildid></inst:buildid>
   <inst:os></inst:os>
   <inst:arch></inst:arch>
-  <inst:update type="text/html" src="http://update.services.openoffice.org/ooo/snapshot.html" />
+  <inst:update type="text/html" src="http://update.libreoffice.org/ooo/snapshot.html" />
 </inst:description>
diff --git a/m4/mac/pkg.m4 b/m4/mac/pkg.m4
new file mode 100644
index 000000000000..2cd2290fd3ab
--- /dev/null
+++ b/m4/mac/pkg.m4
@@ -0,0 +1,154 @@
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+#
+# Copyright © 2004 Scott James Remnant <scott@netsplit.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 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.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+        else
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+		[AC_MSG_RESULT([no])
+                $4])
+elif test $pkg_failed = untried; then
+	ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+		[$4])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
diff --git a/makefile.rc b/makefile.rc
deleted file mode 100644
index ebe41042d92f..000000000000
--- a/makefile.rc
+++ /dev/null
@@ -1,99 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-TARGET=OpenOffice.org
-MAKEFILERC=true
-
-# 
-# build targets
-# 
-
-build_all : build_instsetoo_native
-
-all .PHONY : build_all
-
-check_modules .PHONY :
-	@+echo Checking module list
-	@+perl $(SOLARENV)$/bin$/build.pl --checkmodules
-
-# Only build when all modules available
-build_instsetoo_native .SETDIR=instsetoo_native/prj : check_modules
-	@+perl $(SOLARENV)$/bin$/build.pl --all $(PROFULLSWITCH)
-
-depend .SETDIR=instsetoo_native/prj : check_modules
-	@+perl $(SOLARENV)$/bin$/build.pl --all $(PROFULLSWITCH) depend=t
-
-
-# 
-# bootstrap target
-# 
-
-bootstrap .PHONY :
-	@bootstrap
-
-
-distclean .PHONY: clean
-	-rm config.cache
-	-rm config.log
-.IF "$(BUILD_DMAKE)"!="NO"
-	-$(GNUMAKE) -C dmake distclean
-.ENDIF
-
-
-clean .PHONY:
-	-rm -rf */$(INPATH)
-	-rm -rf solver/*/$(INPATH)
-.IF "$(BUILD_DMAKE)"!="NO"
-	-echo cleaning up dmake...
-	-$(GNUMAKE) -C dmake clean
-.ENDIF
-
-# 
-# configure target
-# 
-
-configure .PHONY SETDIR=. :
-	@configure
-
-
-# 
-# install target
-# 
-
-install .PHONY :
-	@test "$(DESTDIR)$(prefix)" != "" || (echo Usage: make install [DESTDIR=DIR] prefix=DIR; exit 2)
-	cp -p instsetoo_native/$(INPATH)/bin/* $(SOLARVER)/$(INPATH)/bin
-	cd instsetoo_native/util \
-	    && OUT=$(INPATH)\
-	    LOCAL_OUT=$(INPATH)\
-	    LOCAL_COMMON_OUT=$(INPATH)\
-            DEFAULT_TO_ENGLISH_FOR_PACKING=1\
-	    PYTHONPATH=$(SOLARVER)/$(INPATH)/bin:$(SOLARVER)/$(INPATH)/lib:$(PYTHONPATH) \
-	    $(PERL) $(SOLARENV)/bin/make_installer.pl -f openoffice.lst -l $(WITH_LANG:f:t",") -p OpenOffice -buildid 0 -simple $(DESTDIR)$(prefix)
-
-#*************************************************************************
-
diff --git a/ooo.lst b/ooo.lst.in
index c9cc99640548..bcd039083db6 100644
--- a/ooo.lst
+++ b/ooo.lst.in
@@ -1,9 +1,8 @@
-http://hg.services.openoffice.org/binaries
+http://download.go-oo.org/src
 48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz
 63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
 09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz
 0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
-68dd2e8253d9a7930e9fd50e2d7220d0-hunspell-1.2.9.tar.gz
 128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz
 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
@@ -15,11 +14,9 @@ http://hg.services.openoffice.org/binaries
 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz
 ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz
 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
-377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt
 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
@@ -28,7 +25,6 @@ ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz
 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
 4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz
 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
-b92261a5679276c400555004937af965-nss-3.12.6-with-nspr-4.8.4.tar.gz
 7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -43,9 +39,6 @@ af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
 bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
 c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
 ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
-cd5997284f4ba1e8dde5d1e5869fc342-libwpd-0.8.8.tar.gz
-d1a3205871c3c52e8a50c9f18510ae12-libformula.zip
-d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz
 d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip
 d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
 e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
@@ -56,12 +49,10 @@ ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
 ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz
 fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
 fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
-fcc6df1160753d0b8c835d17fdeeb0a7-boost_1_39_0.tar.gz
 fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
 37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip
 831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
-cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2
 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
@@ -84,3 +75,47 @@ d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz
 a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
 c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz
 
+314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz
+451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
+47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2
+90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
+debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
+0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
+71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz
+5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2
+8d265a592619166f29c4672ea54812b7-libwpd-0.9.2.tar.bz2
+29721a16f25967d59969d5f0ae485b4a-libwps-0.2.2.tar.bz2
+7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
+f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+9ed97fce60a9a65852402248a6659492-hunspell-1.3.1.tar.gz
+0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz
+763bb9b14eec5ba9a533d7a9279301db-libvisio-0.0.0.tar.gz
+http://download.go-oo.org/extern
+185d60944ea767075d27247c3162b3bc-unowinreg.dll
+b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
+http://www.numbertext.org/linux
+881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip
+http://ooo.itc.hu/oxygenoffice/download/libreoffice/
+@OOOP_GALLERY_PACK@
+@OOOP_TEMPLATES_PACK@
+@OOOP_FONTS_PACK@
+@OOOP_SAMPLES_PACK@
+@CT2N_EXTENSION_PACK@
+@BARCODE_EXTENSION_PACK@
+@DIAGRAM_EXTENSION_PACK@
+@VALIDATOR_EXTENSION_PACK@
+@WATCH_WINDOW_EXTENSION_PACK@
+@NUMBERTEXT_EXTENSION_PACK@
+@HUNART_EXTENSION_PACK@
+@TYPO_EXTENSION_PACK@
+@GOOGLE_DOCS_EXTENSION_PACK@
+@OOOBLOGGER_EXTENSION_PACK@
+@LIGHTPROOF_EN_US_PACK@
+@LIGHTPROOF_HU_PACK@
+@SUNTEMPLATES_DE_PACK@
+@SUNTEMPLATES_EN_US_PACK@
+@SUNTEMPLATES_ES_PACK@
+@SUNTEMPLATES_FR_PACK@
+@SUNTEMPLATES_HU_PACK@
+@SUNTEMPLATES_IT_PACK@
+
diff --git a/oowintool b/oowintool
index 0b4be43f9a7e..fc18a8dd0347 100755
--- a/oowintool
+++ b/oowintool
@@ -46,12 +46,11 @@ sub print_syntax()
     print " commands:\n";
     print "   --msvc-ver              - dump version of MSVC eg. 6.0\n";
     print "   --msvc-copy-dlls <dest> - copy msvc[pr]??.dlls into <dest>/msvcp??/\n";
-    print "   --msvc-copy-instmsi <dest> - copy instmsia.exe, insmsiw.exe into <dest>\n";
     print "   --msvc-productdir       - dump productdir\n";
     print "   --msvs-productdir       - dump productdir\n";
-    print "   --dotnetsdk-dir         - dump .Net SDK path\n";
-    print "   --csc-compilerdir       - dump .Net SDK compiler path\n";
-    print "   --psdk-home             - dump psdk install dir\n";
+    print "   --dotnetsdk-dir         - dump .NET SDK path\n";
+    print "   --csc-compilerdir       - dump .NET SDK compiler path\n";
+    print "   --windows-sdk-home      - dump Windows SDK install dir\n";
     print "   --jdk-home              - dump the jdk install dir\n";
     print "   --nsis-dir              - dump NSIS path\n";
     print "   --help                  - this message\n";
@@ -92,7 +91,7 @@ sub print_path($$)
     print $path;
 }
 
-sub print_psdk_home()
+sub print_windows_sdk_home()
 {
     my ($value, $key);
     $value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/v6.1/InstallationFolder');
@@ -115,92 +114,51 @@ sub print_psdk_home()
 		$value = `/bin/find "$dir" -iname platformsdk | head -n 1`;
     }
 
-    defined $value || die "psdk not found";
+    defined $value || die "Windows Sdk not found";
 
     print cygpath ($value, 'w', $output_format);
 }
 
-my %msvc_net_2003 = (
-    'ver' => '7.1',
-    'key' => 'Microsoft/VisualStudio/7.1/Setup/VC/ProductDir',
-    'instmsi_path' => '../Common7/Tools/Deployment/MsiRedist',
-    'dll_path' => '../Visual Studio .NET Professional 2003 - English',
-    'dll_suffix' => '71'
-);
-my %msvs_net_2003 = (
-    'ver' => '7.1',
-    'key' => 'Microsoft/VisualStudio/7.1/Setup/VS/ProductDir',
-    'instmsi_path' => 'Common7/Tools/Deployment/MsiRedist',
-    'dll_path' => 'Visual Studio .NET Professional 2003 - English',
-    'dll_suffix' => '71'
-);
-my %msvs_net_2003_ea = (
-    'ver' => '7.1',
-    'key' => 'Microsoft/VisualStudio/7.1/Setup/VS/ProductDir',
-    'instmsi_path' => 'Common7/Tools/Deployment/MsiRedist',
-    'dll_path' => 'Visual Studio .NET Enterprise Architect 2003 - English', # testme ...
-    'dll_suffix' => '71'
-);
-my %msvs_express_2005 = (
-    'ver' => '8.0',
-    'key' => 'Microsoft/VCExpress/8.0/Setup/VS/ProductDir',
-    'instmsi_path' => '../SDK/v2.0/BootStrapper/Packages/InstMSI',
-    'dll_path' => '../SDK/v2.0/Bin',
-    'dll_suffix' => '80'
-);
-my %msvc_express_2005 = (
-    'ver' => '8.0',
-    'key' => 'Microsoft/VCExpress/8.0/Setup/VC/ProductDir',
-    'instmsi_path' => '../SDK/v2.0/BootStrapper/Packages/InstMSI',
-    'dll_path' => '../SDK/v2.0/Bin',
-    'dll_suffix' => '80'
-);
-my %msvs_2005 = (
-    'ver' => '8.0',
-    'key' => 'Microsoft/VisualStudio/8.0/Setup/VS/ProductDir',
-    'instmsi_path' => 'SDK/v2.0/BootStrapper/Packages/InstMSI',
-    'dll_path' => 'Visual Studio .NET Professional 2005 - English',
-    'dll_suffix' => '80'
-);
-my %msvc_2005 = (
-    'ver' => '8.0',
-    'key' => 'Microsoft/VisualStudio/8.0/Setup/VC/ProductDir',
-    'instmsi_path' => '../SDK/v2.0/BootStrapper/Packages/InstMSI',
-    'dll_path' => '../SDK/v2.0/Bin',
-    'dll_suffix' => '80'
-);
 my %msvs_2008 = (
     'ver' => '9.0',
     'key' => 'Microsoft/VisualStudio/9.0/Setup/VS/ProductDir',
-    'instmsi_path' => '?',
     'dll_path' => 'VC/redist/x86/Microsoft.VC90.CRT',
     'dll_suffix' => '90'
 );
 my %msvc_2008 = (
     'ver' => '9.0',
     'key' => 'Microsoft/VisualStudio/9.0/Setup/VC/ProductDir',
-    'instmsi_path' => '?',
     'dll_path' => 'redist/x86/Microsoft.VC90.CRT',
     'dll_suffix' => '90'
 );
 my %msvs_express_2008 = (
     'ver' => '9.0',
     'key' => 'Microsoft/VCExpress/9.0/Setup/VS/ProductDir',
-    'instmsi_path' => '?',
     'dll_path' => 'VC/redist/x86/Microsoft.VC90.CRT',
     'dll_suffix' => '90'
 );
 my %msvc_express_2008 = (
     'ver' => '9.0',
     'key' => 'Microsoft/VCExpress/9.0/Setup/VC/ProductDir',
-    'instmsi_path' => '?',
     'dll_path' => 'redist/x86/Microsoft.VC90.CRT',
     'dll_suffix' => '90'
 );
+my %msvs_2010 = (
+    'ver' => '10.0',
+    'key' => 'Microsoft/VisualStudio/10.0/Setup/VS/ProductDir',
+    'dll_path' => 'VC/redist/x86/Microsoft.VC100.CRT',
+    'dll_suffix' => '100'
+);
+my %msvc_2010 = (
+    'ver' => '10.0',
+    'key' => 'Microsoft/VisualStudio/10.0/Setup/VC/ProductDir',
+    'dll_path' => 'redist/x86/Microsoft.VC100.CRT',
+    'dll_suffix' => '100'
+);
 
 sub find_msvs()
 {
-    my @ms_versions = ( \%msvs_2008, \%msvs_express_2008, \%msvs_2005, \%msvs_express_2005, \%msvs_net_2003_ea, \%msvs_net_2003 );
+    my @ms_versions = ( \%msvs_2008, \%msvs_express_2008, \%msvs_2010 );
 
     for $ver (@ms_versions)
     {
@@ -215,7 +173,7 @@ sub find_msvs()
 
 sub find_msvc()
 {
-    my @ms_versions = ( \%msvc_2008, \%msvc_express_2008, \%msvc_2005, \%msvc_express_2005, \%msvc_net_2003 );
+    my @ms_versions = ( \%msvc_2008, \%msvc_express_2008, \%msvc_2010 );
 
     for $ver (@ms_versions)
     {
@@ -249,7 +207,9 @@ sub print_msvs_productdir()
 sub print_csc_compiler_dir()
 {
     my $dir = cygpath (reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/InstallRoot"), 'w', $output_format);
-    my $csc_exe = `/bin/find "$dir" -iname csc.exe | grep "v2\." | head -n 1`;
+    my $csc_exe = `/bin/find "$dir" -iname csc.exe | grep "v3\.5\." | head -n 1` ||
+                  `/bin/find "$dir" -iname csc.exe | grep "v4\." | head -n 1` ||
+                  `/bin/find "$dir" -iname csc.exe | grep "v2\." | head -n 1`;
     print `dirname $csc_exe`;
 }
 
@@ -258,13 +218,16 @@ sub print_dotnetsdk_dir()
     my $dir = 
           reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv1.1") ||
           reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv2.0");
-    print cygpath ($dir, 'w', $output_format);
+    if ($dir) {
+      print cygpath ($dir, 'w', $output_format);
+    }
 }
 
 sub print_jdk_dir()
 {
     my $dir =
 	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.5/JavaHome") ||
+      reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.6/JavaHome") ||
 	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.4/JavaHome") ||
 	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.3/JavaHome");
     print cygpath($dir, 'w', $output_format); 
@@ -314,27 +277,13 @@ sub msvc_copy_dlls($)
 	      $dest . $ver->{'dll_suffix'});
     copy_dll ($srcdir, "msvcr" . $ver->{'dll_suffix'} . ".dll",
 	      $dest . $ver->{'dll_suffix'});
-    if ($ver->{'dll_suffix'} >= 90) {
+    if ($ver->{'dll_suffix'} == 90) {
         copy_dll ($srcdir, "msvcm" . $ver->{'dll_suffix'} . ".dll",
                   $dest . $ver->{'dll_suffix'});
         copy_dll ($srcdir, "Microsoft.VC90.CRT.manifest", $dest . $ver->{'dll_suffix'});
     }
 }
 
-sub msvc_copy_instmsi($)
-{
-    my $dest = shift;
-    my $ver = msvc_find_version('instmsi_path');
-    defined $ver || return;
-    my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' . 
-		  $ver->{'instmsi_path'});
-
-    copy_dll ($srcdir, "instmsia.exe",
-	      $dest);
-    copy_dll ($srcdir, "instmsiw.exe",
-	      $dest);
-}
-
 if (!@ARGV) {
     print_syntax();
     exit 1;
@@ -362,10 +311,6 @@ while (@commands) {
 	my $dest = shift @commands;
 	defined $dest || die "copy-dlls requires a destination directory";
 	msvc_copy_dlls( $dest );
-    } elsif ($opt eq '--msvc-copy-instmsi') {
-	my $dest = shift @commands;
-	defined $dest || die "copy-instmsi requires a destination directory";
-	msvc_copy_instmsi( $dest );
     } elsif ($opt eq '--msvs-productdir') {
 	print_msvs_productdir();
     } elsif ($opt eq '--msvc-productdir') {
@@ -374,8 +319,8 @@ while (@commands) {
 	print_dotnetsdk_dir();
     } elsif ($opt eq '--csc-compilerdir') {
 	print_csc_compiler_dir();
-    } elsif ($opt eq '--psdk-home') {
-	print_psdk_home();
+    } elsif ($opt eq '--windows-sdk-home') {
+	print_windows_sdk_home();
     } elsif ($opt eq '--jdk-home') {
 	print_jdk_dir();
     } elsif ($opt eq '--nsis-dir') {
diff --git a/post_download.in b/post_download.in
new file mode 100755
index 000000000000..d7fa19a47f7d
--- /dev/null
+++ b/post_download.in
@@ -0,0 +1,115 @@
+AC_INIT([LibreOffice], [3.4],,, [http://documentfoundation.org/])
+AC_PREREQ(2.50)
+
+echo "********************************************************************"
+echo "*"
+echo "*   Running the post download checks."
+echo "*"
+echo "********************************************************************"
+
+dnl ===================================================================
+dnl The following is a list of supported systems.
+dnl ===================================================================
+AC_CANONICAL_SYSTEM
+case "$host_os" in
+    solaris*)
+        _os=SunOS
+        ;;
+    linux-gnu*|k*bsd*-gnu*)
+        _os=Linux
+        ;;
+    gnu)
+        _os=GNU
+        ;;
+    cygwin*|mingw32*) # Windows
+        _os=WINNT
+        ;;
+    darwin*) # Mac OS X or iOS
+        _os=Darwin
+        ;;
+    freebsd*)
+        _os=FreeBSD
+        ;;
+    *netbsd*)
+        _os=NetBSD
+        ;;
+    aix*)
+        _os=AIX
+        ;;
+    openbsd*)
+        _os=OpenBSD
+        ;;
+    dragonfly*)
+        _os=DragonFly
+        ;;
+    androideabi*)
+        _os=Android
+        ;;
+   *)
+   AC_MSG_ERROR([$host_os operating system is not suitable for LibreOffice!])
+   ;;
+esac
+
+dnl ===================================================================
+dnl Windows builds need dbghelp.dll in external/dbghelp/
+dnl ===================================================================
+if test "$_os" = "WINNT"; then
+   AC_MSG_CHECKING([for dbghelp.dll])
+   if test -f ./external/dbghelp/dbghelp.dll; then
+      AC_MSG_RESULT([found])
+   else
+      AC_MSG_ERROR([dbghelp.dll is missing in external/dbghelp/.
+Get it from the Microsoft site and put it into external/dbghelp.
+(Note: Microsoft seems to enjoy changing the exact location of this file. You
+may have to search Microsoft's website.) Last time it was seen at:
+<http://www.microsoft.com/downloads/release.asp?releaseid=30682>.])
+   fi
+fi
+
+dnl ===================================================================
+dnl Windows builds - use oowintool to copy CRT dlls and manifest
+dnl ===================================================================
+if test "$COM" = "MSC"; then
+   if ./oowintool --msvc-copy-dlls ./external/msvcp ; then
+       :
+    else
+       AC_MSG_ERROR([oowintool failed to copy CRT])
+    fi
+fi
+
+dnl ===================================================================
+dnl Windows builds need gdiplus.dll in external/gdiplus/
+dnl ===================================================================
+if test "$_os" = "WINNT"; then
+   AC_MSG_CHECKING([for gdiplus.dll])
+   if test -x ./external/gdiplus/gdiplus.dll; then
+      AC_MSG_RESULT([found])
+   else
+      AC_MSG_ERROR([gdiplus.dll is missing in external/gdiplus/.
+Get it from the Microsoft site and put it into external/gdiplus.
+You may have to search Microsoft's website. Last time it was seen at:
+<http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>.])
+   fi
+fi
+
+dnl ===================================================================
+dnl Windows builds need vcredist_x86.exe and vcredist_x64.exe in external/vcredist/
+dnl ===================================================================
+if test "$COM" = "MSC"; then
+   AC_MSG_CHECKING([for vcredist_x86.exe])
+   if test -e ./external/vcredist/vcredist_x86.exe; then
+      AC_MSG_RESULT([found])
+   else
+      AC_MSG_ERROR([vcredist_x86.exe is missing in external/vcredist/.
+Get the version corresponding to your Visual Studio from the Microsoft site
+and put it into external/vcredist.])
+   fi
+   AC_MSG_CHECKING([for vcredist_x64.exe])
+   if test -e ./external/vcredist/vcredist_x64.exe; then
+      AC_MSG_RESULT([found])
+   else
+      AC_MSG_ERROR([vcredist_x64.exe is missing in external/vcredist/.
+Get the version corresponding to your Visual Studio from the Microsoft site
+and put it into external/vcredist.])
+   fi
+fi
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 5388fe8d105d..38fbd9610934 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -116,6 +116,16 @@
         TXT_FILE_BODY; \
         Styles = (ARCHIVE,PATCH)
 
+#ifdef WITH_HELPPACK_INTEGRATION
+#define ARCHIVE_TXT_FILE_BODY_HELPPACK \
+        TXT_FILE_BODY; \
+        Styles = (ARCHIVE,FORCEHELPPACK,LANGUAGEMODULE)
+#else
+#define ARCHIVE_TXT_FILE_BODY_HELPPACK \
+        TXT_FILE_BODY; \
+        Styles = (ARCHIVE,HELPPACK,LANGUAGEMODULE)
+#endif
+
 #define ARCHIVE_SUBST_FILE_BODY \
         TXT_FILE_BODY; \
         Styles = (ARCHIVE,SUBSTITUTE)
@@ -180,7 +190,7 @@
     File id \
         TXT_FILE_BODY; \
         RESFILE_ALL_LANG(name); \
-        Dir     = gid_Brand_Dir_Resource; \
+        Dir     = gid_Brand_Dir_Program_Resource; \
         Styles  = (PACKED); \
     End
 
@@ -316,24 +326,6 @@
         PACKED_LIB_FILE_BODY_PATCH; \
     End
 
-#define WINW4WFILTERFILENAME(name) STRING(CONCAT2(name,f32w.dll))
-
-#define STD_WIN_W4WFILTER_FILE(id,name) \
-    File id \
-        PACKED_FILTER_FILE_BODY; \
-        Name            = WINW4WFILTERFILENAME(name);  \
-    End
-
-#define SOLSW4WFILTERFILENAME(name) STRING(CONCAT2(w4w, name))
-
-#define STD_SOLS_W4WFILTER_FILE(id,name) \
-    File id \
-        BIN_FILE_BODY; \
-        Styles = (PACKED); \
-        Dir = gid_Dir_Filter; \
-        Name = SOLSW4WFILTERFILENAME(name); \
-    End
-
 #define SPECIAL_NO_WARNING_IF_NOT_EXISTS_FILE(id,name) \
     File id \
         TXT_FILE_BODY; \
@@ -508,10 +500,11 @@ End
 #define SCP2_URE_DL_BARE(n) n ".dll"
 #define SCP2_URE_DL_VER(n, v) n v ".dll"
 #define SCP2_URE_DL_COMID_VER(n, v) n v STRING(COMID) ".dll"
+#define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll"
 #define SCP2_URE_DL_UNO_VER(n, v) n v ".dll"
 #define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
 #define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
 #define SCP2_STDLP_DEBUG "d"
 #else
 #define SCP2_STDLP_DEBUG ""
@@ -523,6 +516,8 @@ End
 #define SCP2_URE_DL_VER(n, v) "lib" n STRING(UNXSUFFIX) "." v
 #define SCP2_URE_DL_COMID_VER(n, v) \
     "lib" n STRING(COMID) STRING(UNXSUFFIX) "." v
+#define SCP2_URE_DL_COMID_NORMAL(n) \
+    "lib" n STRING(COMID) STRING(UNXSUFFIX)
 #define SCP2_URE_DL_UNO_VER(n, v) "libuno_" n STRING(UNXSUFFIX) "." v
 #define SCP2_URE_DL_UNO_NORMAL(n) "libuno_" n STRING(UNXSUFFIX)
 #define SCP2_URE_DL_UNO_COMID_VER(n, v)	\
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index d9d1420bdc73..d5dc0f8cc956 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -25,9 +25,11 @@
 #
 #*************************************************************************
 
+my $outfile;
+my $destfile;
+my $config_stamp;
+my $lastcompletelangiso_var;
 my $completelangiso_var = $ENV{COMPLETELANGISO_VAR};
-my $lastcompletelangiso_var;;
-my $outfile = "";
 
 if ( !defined $completelangiso_var) {
     print STDERR "ERROR: No language defined!\n";
@@ -35,16 +37,18 @@ if ( !defined $completelangiso_var) {
 }
 
 my $poorhelplocalizations_var = $ENV{WITH_POOR_HELP_LOCALIZATIONS};
+$poorhelplocalizations_var = $completelangiso_var if ( $poorhelplocalizations_var eq "ALL" );
 my %poorhelplocalizations;
 foreach $lang (split (/ /, $poorhelplocalizations_var)) {
+  next if ( $lang eq "en-US");
   $poorhelplocalizations{$lang}++;
 }
 
-startup_check();
-if ( "$completelangiso_var" eq "$lastcompletelangiso_var" ) {
-    print STDERR "No new languages. Keeping old file\n";
+if (!args_require_build()) {
+    print STDERR "No new languages, or config. Keeping old file\n";
     exit 0;
 }
+print STDERR "re-building macros\n";
 
 my @completelangiso = split " +", $completelangiso_var;
 
@@ -73,6 +77,7 @@ write_FILE_ALL_LANG_LETTER();
 
 close OUTFILE;
 
+rename $outfile, $destfile;
 
 sub write_ALL_LANG
 {
@@ -254,25 +259,26 @@ sub write_FILE_ALL_LANG_LETTER
     print OUTFILE "\n\n";
 }
 
-sub startup_check
+sub args_require_build
 {
-    my $i;
-    for ( $i=0; $i <= $#ARGV; $i++) {
-        if ( "$ARGV[$i]" eq "-o" ) {
-            if ( defined $ARGV[ $i + 1] ) {
-                $outfile = $ARGV[ $i + 1];
-            } else {
-                usage();
-            }
-        }
+    while (@ARGV) {
+        $opt = shift @ARGV;
+        $destfile = shift @ARGV if ($opt eq '-o');
+        $config_stamp = shift @ARGV if ($opt eq '-c');
     }
-    usage() if $i<2;
-    usage() if "$outfile" eq "";
-    if ( -f "$outfile" ) {
-        # changed script - run allways
-        return if (stat($0))[9] > (stat("$outfile"))[9] ;
+    usage() if (!defined ($destfile) || !defined ($config_stamp));
+    $outfile = "$destfile.tmp";
+
+    if ( -f "$destfile" ) {
+        # changed script - run always
+        return 1 if (stat($0))[9] > (stat("$destfile"))[9] ;
 
-        open OLDFILE, "$outfile" or die "$0 - ERROR: $outfile exists but isn't readable.\n";
+        # changed set_soenv.stamp - run always
+        if (-f "$config_stamp") {
+            return 1 if (stat($config_stamp))[9] > (stat($destfile))[9];
+        }
+
+        open OLDFILE, "$destfile" or die "$0 - ERROR: $outfile exists but isn't readable.\n";
         while ( $line = <OLDFILE> ) {
             if ( $line =~ /^\/\/.*completelangiso:/ ) {
                 $lastcompletelangiso_var = $line;
@@ -283,12 +289,15 @@ sub startup_check
 
         }
         close OLDFILE;
+
+        return 0 if ( "$completelangiso_var" eq "$lastcompletelangiso_var" );
     }
+    return 1;
 }
 
 sub usage
 {
     print STDERR "Generate language dependend macros use in *.scp files\n";
-    print STDERR "perl $0 -o outputfile\n";
+    print STDERR "perl $0 -o <outputfile> -c <config_stamp_file>\n";
     exit  1;
 }
diff --git a/scp2/macros/makefile.mk b/scp2/macros/makefile.mk
index d36f25efabd3..790a27385f34 100644
--- a/scp2/macros/makefile.mk
+++ b/scp2/macros/makefile.mk
@@ -45,5 +45,4 @@ ALLTAR : $(INCCOM)$/langmacros.inc
 .PHONY $(INCCOM)$/langmacros.inc:
     @echo ------------------------------
     @echo Making: $@  
-    @@-$(RENAME) $@ $@.tmp
-    $(COMMAND_ECHO)$(PERL) macro.pl $(VERBOSITY) -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
+    $(COMMAND_ECHO)$(PERL) macro.pl $(VERBOSITY) -o $@ -c $(SOLARSRC)/set_soenv.stamp
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index 10632bfc4d45..580280561694 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -1,4 +1,4 @@
-cp    scp2    :    L10N:l10n i18npool setup_native l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
+cp    scp2    :    TRANSLATIONS:translations i18npool setup_native l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
 cp    scp2                        usr1     -    all    cp_mkout NULL
 cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
 cp    scp2\source\templates       nmake    -    all    cp_langtemplates NULL
@@ -8,6 +8,7 @@ cp    scp2\source\calc            nmake    -    all    cp_calc cp_langmacros cp_
 cp    scp2\source\canvas          nmake    -    all    cp_canvas cp_langmacros cp_langtemplates NULL
 cp    scp2\source\crashrep        nmake    -    all    cp_crashrep cp_langmacros cp_langtemplates NULL
 cp    scp2\source\draw            nmake    -    all    cp_draw cp_langmacros cp_langtemplates NULL
+cp    scp2\source\extensions      nmake    -    all    cp_extensions cp_langmacros cp_langtemplates NULL
 cp    scp2\source\gnome           nmake    -    all    cp_gnome cp_langmacros cp_langtemplates NULL
 cp    scp2\source\graphicfilter   nmake    -    all    cp_graphicfilter cp_langmacros cp_langtemplates NULL
 cp    scp2\source\impress         nmake    -    all    cp_impress cp_langmacros cp_langtemplates NULL
@@ -25,4 +26,5 @@ cp    scp2\source\base            nmake    -    all    cp_base cp_langmacros cp_
 cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacros cp_langtemplates NULL
 cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros cp_langtemplates NULL
 cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros cp_langtemplates NULL
-cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
+cp    scp2\source\accessories     nmake    -    all    cp_accessories cp_langmacros NULL
+cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
diff --git a/scp2/prj/d.lst b/scp2/prj/d.lst
index 717c8c5b4f3e..37aaabbbae2a 100644
--- a/scp2/prj/d.lst
+++ b/scp2/prj/d.lst
@@ -1,27 +1,27 @@
-..\%__SRC%\bin\osl\setup_osl.inf %_DEST%\bin%_EXT%\setup_osl.inf
-..\%__SRC%\bin\osl\setup_osl.ins %_DEST%\bin%_EXT%\setup_osl.ins
-..\%__SRC%\bin\osl\ure.inf %_DEST%\bin%_EXT%\ure.inf
-..\%__SRC%\bin\osl\ure.ins %_DEST%\bin%_EXT%\ure.ins
-..\%__SRC%\bin\osl\sdkoo.inf %_DEST%\bin%_EXT%\sdkoo.inf
-..\%__SRC%\bin\osl\sdkoo.ins %_DEST%\bin%_EXT%\sdkoo.ins
-..\%__SRC%\bin\osl\setup_osljre.inf %_DEST%\bin%_EXT%\setup_osljre.inf
-..\%__SRC%\bin\osl\setup_osljre.ins %_DEST%\bin%_EXT%\setup_osljre.ins
+..\%__SRC%\bin\osl\setup_osl.inf %_DEST%\bin\setup_osl.inf
+..\%__SRC%\bin\osl\setup_osl.ins %_DEST%\bin\setup_osl.ins
+..\%__SRC%\bin\osl\ure.inf %_DEST%\bin\ure.inf
+..\%__SRC%\bin\osl\ure.ins %_DEST%\bin\ure.ins
+..\%__SRC%\bin\osl\sdkoo.inf %_DEST%\bin\sdkoo.inf
+..\%__SRC%\bin\osl\sdkoo.ins %_DEST%\bin\sdkoo.ins
+..\%__SRC%\bin\osl\setup_osljre.inf %_DEST%\bin\setup_osljre.inf
+..\%__SRC%\bin\osl\setup_osljre.ins %_DEST%\bin\setup_osljre.ins
 
-mkdir: %_DEST%\par%_EXT%
+mkdir: %_DEST%\par
 
-mkdir: %_DEST%\par%_EXT%\osl
-mkdir: %_DEST%\par%_EXT%\fat
-mkdir: %_DEST%\par%_EXT%\fam
-mkdir: %_DEST%\par%_EXT%\ada
-mkdir: %_DEST%\par%_EXT%\adm
-mkdir: %_DEST%\par%_EXT%\omc
+mkdir: %_DEST%\par\osl
+mkdir: %_DEST%\par\fat
+mkdir: %_DEST%\par\fam
+mkdir: %_DEST%\par\ada
+mkdir: %_DEST%\par\adm
+mkdir: %_DEST%\par\omc
 
-..\%__SRC%\par\osl\*.par %_DEST%\par%_EXT%\osl\*.par
-..\%__SRC%\par\fat\*.par %_DEST%\par%_EXT%\fat\*.par
-..\%__SRC%\par\fam\*.par %_DEST%\par%_EXT%\fam\*.par
-..\%__SRC%\par\ada\*.par %_DEST%\par%_EXT%\ada\*.par
-..\%__SRC%\par\adm\*.par %_DEST%\par%_EXT%\adm\*.par
-..\%__SRC%\par\omc\*.par %_DEST%\par%_EXT%\omc\*.par
+..\%__SRC%\par\osl\*.par %_DEST%\par\osl\*.par
+..\%__SRC%\par\fat\*.par %_DEST%\par\fat\*.par
+..\%__SRC%\par\fam\*.par %_DEST%\par\fam\*.par
+..\%__SRC%\par\ada\*.par %_DEST%\par\ada\*.par
+..\%__SRC%\par\adm\*.par %_DEST%\par\adm\*.par
+..\%__SRC%\par\omc\*.par %_DEST%\par\omc\*.par
 
-..\inc\macros.inc %_DEST%\inc%_EXT%\macros.inc
-..\%__SRC%\inc\langmacros.inc %_DEST%\inc%_EXT%\langmacros.inc
+..\inc\macros.inc %_DEST%\inc\macros.inc
+..\%__SRC%\inc\langmacros.inc %_DEST%\inc\langmacros.inc
diff --git a/scp2/source/accessories/file_font_accessories.scp b/scp2/source/accessories/file_font_accessories.scp
new file mode 100644
index 000000000000..9adbe4bdfacf
--- /dev/null
+++ b/scp2/source/accessories/file_font_accessories.scp
@@ -0,0 +1,882 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+/* Airmole font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_airmole, airmole.ttf, Airmole ) 
+#endif 
+
+/* Airmole Antique font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_airmolea, airmolea.ttf, Airmole Antique ) 
+#endif 
+
+/* Airmole Shaded font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_airmoles, airmoles.ttf, Airmole Shaded ) 
+#endif 
+
+/* Airmole Stripe font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_airmoleq, airmoleq.ttf, Airmole Stripe ) 
+#endif 
+
+/* Astron Boy font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_astronbo, astronbo.ttf, Astron Boy ) 
+#endif 
+
+/* Astron Boy Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_astronbi, astronbi.ttf, Astron Boy Italic ) 
+#endif 
+
+/* Astron Boy Video font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_astronbv, astronbv.ttf, Astron Boy Video ) 
+#endif 
+
+/* Astron Boy Wonder font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_astronbw, astronbw.ttf, Astron Boy Wonder ) 
+#endif 
+
+/* Baveuse font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_baveuse, baveuse.ttf, Baveuse ) 
+#endif 
+
+/* Berylium font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Berylium, Berylium.ttf, Berylium ) 
+#endif 
+
+/* Berylium Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Beryliub, Beryliub.ttf, Berylium Bold )
+#endif 
+
+/* Berylium Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Berylibi, Berylibi.ttf, Berylium Bold Italic ) 
+#endif 
+
+/* Berylium Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Beryliui, Beryliui.ttf, Berylium Italic ) 
+#endif 
+
+/* Betsy Flanagan 2 font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_BETSY2, BETSY2.ttf, Betsy Flanagan 2 ) 
+#endif 
+
+/* Blue Highway font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bluehigh, bluehigh.ttf, Blue Highway ) 
+#endif 
+
+/* Blue Highway Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bluebold, bluebold.ttf, Blue Highway Bold ) 
+#endif 
+
+/* Blue Highway Condensed font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bluecond, bluecond.ttf, Blue Highway Condensed ) 
+#endif 
+
+/* Blue Highway Linocut font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bluehigl, bluehigl.ttf, Blue Highway Linocut ) 
+#endif 
+
+/* Bullpen font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bullpen_, bullpen_.ttf, Bullpen ) 
+#endif 
+
+/* Bullpen 3D font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bullpen3, bullpen3.ttf, Bullpen 3D ) 
+#endif 
+
+/* Bullpen Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bullpeni, bullpeni.ttf, Bullpen Italic ) 
+#endif 
+
+/* Colourbars font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_colourba, colourba.ttf, Colourbars ) 
+#endif 
+
+/* Colourbars Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_colourbb, colourbb.ttf, Colourbars Bold ) 
+#endif 
+
+/* Counterscraps font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_counters, counters.ttf, Counterscraps ) 
+#endif 
+
+/* Credit Valley font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_creditva, creditva.ttf, Credit Valley ) 
+#endif 
+
+/* Credit Valley Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_creditvb, creditvb.ttf, Credit Valley Bold ) 
+#endif 
+
+/* Credit Valley Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_creditvz, creditvz.ttf, Credit Valley Bold Italic ) 
+#endif 
+
+/* Credit Valley Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_creditvi, creditvi.ttf, Credit Valley Italic ) 
+#endif 
+
+/* Edmunds font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_edmunds, edmunds.ttf, Edmunds ) 
+#endif 
+
+/* Edmunds Distressed font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_edmundis, edmundis.ttf, Edmunds Distressed ) 
+#endif 
+
+/* Engebrechtre font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeregu, engeregu.ttf, Engebrechtre ) 
+#endif
+
+/* Engebrechtre Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engebold, engebold.ttf, Engebrechtre Bold ) 
+#endif
+
+/* Engebrechtre Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeboit, engeboit.ttf, Engebrechtre Bold Italic ) 
+#endif
+
+/* Engebrechtre Expanded font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeexpa, engeexpa.ttf, Engebrechtre Expanded ) 
+#endif
+
+/* Engebrechtre Expanded Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeexbo, engeexbo.ttf, Engebrechtre Expanded Bold ) 
+#endif
+
+/* Engebrechtre Expanded Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeexbi, engeexbi.ttf, Engebrechtre Expanded Bold Italic ) 
+#endif
+
+/* Engebrechtre Expanded Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeexit, engeexit.ttf, Engebrechtre Expanded Italic ) 
+#endif
+
+/* Engebrechtre Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeital, engeital.ttf, Engebrechtre Italic ) 
+#endif
+
+/* Goodfish font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_goodfish, goodfish.ttf, Goodfish ) 
+#endif
+
+/* Goodfish Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_goodfisb, goodfisb.ttf, Goodfish Bold ) 
+#endif
+
+/* Goodfish Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_goodfisc, goodfisc.ttf, Goodfish Bold Italic ) 
+#endif
+
+/* Goodfish Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_goodfisi, goodfisi.ttf, Goodfish Italic ) 
+#endif
+
+/* Guanine font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_guanine_, guanine_.ttf, Guanine ) 
+#endif
+
+/* Gunplay font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_gunplay, gunplay.ttf, Gunplay ) 
+#endif
+
+/* Kirsty font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_kirsty__, kirsty__.ttf, Kirsty ) 
+#endif
+
+/* Kirsty Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_kirsty_b, kirsty_b.ttf, Kirsty Bold ) 
+#endif
+
+/* Kirsty Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_kirstybi, kirstybi.ttf, Kirsty Bold Italic ) 
+#endif
+
+/* Kirsty Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_kirsty_i, kirsty_i.ttf, Kirsty Italic ) 
+#endif
+
+/* Kirsty Ink font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_kirstyin, kirstyin.ttf, Kirsty Ink ) 
+#endif
+
+/* Mufferaw font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_mufferaw, mufferaw.ttf, Mufferaw ) 
+#endif
+
+/* Nasalization font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_nasaliza, nasaliza.ttf, Nasalization ) 
+#endif
+
+/* Neuropol font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_NEUROPOL, NEUROPOL.ttf, Neuropol ) 
+#endif
+
+/* Numberpile font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_numberpi, numberpi.ttf, Numberpile ) 
+#endif
+
+/* Pricedown font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_pricedow, pricedow.ttf, Pricedown ) 
+#endif
+
+/* Pupcat font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_pupcat__, pupcat__.ttf, Pupcat ) 
+#endif
+
+/* Rina font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_rina, rina.ttf, Rina ) 
+#endif
+
+/* Sandoval font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_sandoval, sandoval.ttf, Sandoval ) 
+#endif
+
+/* Sappy Mugs font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_SAPPM___, SAPPM___.ttf, Sappy Mugs ) 
+#endif
+
+/* Screengem font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_screenge, screenge.ttf, Screengem ) 
+#endif
+
+/* Steelfish font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_steelfis, steelfis.ttf, Steelfish ) 
+#endif
+
+/* Steelfish Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_steelfib, steelfib.ttf, Steelfish Bold ) 
+#endif
+
+/* Steelfish Outline font */ 
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_steelout, steelout.ttf, Steelfish Outline ) 
+#endif
+
+/* Strenuous font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_strenuou, strenuou.ttf, Strenuous ) 
+#endif
+
+/* Strenuous 3D font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_strenu3d, strenu3d.ttf, Strenuous 3D ) 
+#endif
+
+/* Subpear font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_subpear_, subpear_.ttf, Subpear ) 
+#endif
+
+/* Teen font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_teen____, teen____.ttf, Teen ) 
+#endif
+
+/* Teen Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_teenbold, teenbold.ttf, Teen Bold ) 
+#endif
+
+/* Teen Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_teenbdit, teenbdit.ttf, Teen Bold Italic ) 
+#endif
+
+/* Teen Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_teenital, teenital.ttf, Teen Italic ) 
+#endif
+
+/* Teen Light font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_teenlite, teenlite.ttf, Teen Light ) 
+#endif
+
+/* Teen Light Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_teenlita, teenlita.ttf, Teen Light Italic ) 
+#endif
+
+/* Typodermic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_typoderm, typoderm.ttf, Typodermic ) 
+#endif
+
+/* Vahika font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vahika_, vahika_.ttf, Vahika ) 
+#endif
+
+/* Vahika Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vahikab, vahikab.ttf, Vahika Bold ) 
+#endif
+
+/* Vahika Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vahikac, vahikac.ttf, Vahika Bold Italic ) 
+#endif
+
+/* Vahika Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vahikai, vahikai.ttf, Vahika Italic ) 
+#endif
+
+/* Vectroid font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vectroid, vectroid.ttf, Vectroid ) 
+#endif
+
+/* Velvenda Cooler font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_velvendc, velvendc.ttf, Velvenda Cooler ) 
+#endif
+
+/* Velvenda Megablack font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_velvenda, velvenda.ttf, Velvenda Megablack ) 
+#endif
+
+/* Vibrocentric font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vibrocen, vibrocen.ttf, Vibrocentric ) 
+#endif
+
+/* Vibrocentric Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vibroceb, vibroceb.ttf, Vibrocentric Bold ) 
+#endif
+
+/* Vibrocentric Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vibrocex, vibrocex.ttf, Vibrocentric Bold Italic ) 
+#endif
+
+/* Vibrocentric Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vibrocei, vibrocei.ttf, Vibrocentric Italic ) 
+#endif
+
+/* Wintermute font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_wintermu, wintermu.ttf, Wintermute ) 
+#endif
+
+/* You're Gone font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_youregon, youregon.ttf, You are Gone )
+#endif
+
+/* You're Gone Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_youregoi, youregoi.ttf, You are Gone Italic )
+#endif
+
+/* Zekton font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_zekton__, zekton__.ttf, Zekton ) 
+#endif
+
+/* Zekton Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_zektonbo, zektonbo.ttf, Zekton Bold ) 
+#endif
+
+/* Zekton Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_zektonbi, zektonbi.ttf, Zekton Bold Italic ) 
+#endif
+
+/* Zekton Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_zektonit, zektonit.ttf, Zekton Italic )
+#endif
+
+/* Zorque font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_zorque, zorque.ttf, Zorque ) 
+#endif
+
+/* Additional fonts for 2.0.3 */
+
+/* URW Gothic L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Avantgarde, a010013l.ttf, URW Gothic L ) 
+#endif
+ 
+/* URW Gothic L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Bold_Avantgarde, a010015l.ttf, URW Gothic L Bold ) 
+#endif
+ 
+/* URW Gothic L Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Italic_Avantgarde, a010033l.ttf, URW Gothic L Italic ) 
+#endif
+ 
+/* URW Gothic L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Bold_Italic_Avantgarde, a010035l.ttf, URW Gothic L Bold Italic ) 
+#endif
+ 
+/* URW Bookman L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Bookman, b018012l.ttf, URW Bookman L ) 
+#endif
+ 
+/* URW Bookman L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Bold_Bookman, b018015l.ttf, URW Bookman L Bold ) 
+#endif
+ 
+/* URW Bookman L Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Italic_Bookman, b018032l.ttf, URW Bookman L Italic ) 
+#endif
+ 
+/* URW Bookman L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Bold_Italic_Bookman, b018035l.ttf, URW Bookman L Bold Italic ) 
+#endif
+ 
+/* URW Century Schoolbook L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_New_Century_SchoolBook, c059013l.ttf, URW Century Schoolbook L ) 
+#endif
+ 
+/* URW Century Schoolbook L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_Bold_New_Century_SchoolBook, c059016l.ttf, URW Century Schoolbook L Bold ) 
+#endif
+ 
+/* URW Century Schoolbook L Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_Italic_New_Century_SchoolBook, c059033l.ttf, URW Century Schoolbook L Italic ) 
+#endif
+ 
+/* URW Century Schoolbook L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook, c059036l.ttf, URW Century Schoolbook L Bold Italic ) 
+#endif
+ 
+/* URW Nimbus Sans L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica, n019003l.ttf, URW Nimbus Sans L ) 
+#endif
+ 
+/* URW Nimbus Sans L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica, n019004l.ttf, URW Nimbus Sans L Bold ) 
+#endif
+ 
+/* URW Nimbus Sans L Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica, n019023l.ttf, URW Nimbus Sans L Italic ) 
+#endif
+ 
+/* URW Nimbus Sans L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica, n019024l.ttf, URW Nimbus Sans L Bold Italic ) 
+#endif
+ 
+/* URW Nimbus Sans L Condensed */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica_Condensed, n019043l.ttf, URW Nimbus Sans L Condensed ) 
+#endif
+ 
+/* URW Nimbus Sans L Bold Condensed */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica_Condensed, n019044l.ttf, URW Nimbus Sans L Bold Condensed ) 
+#endif
+ 
+/* URW Nimbus Sans L Italic Condensed */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica_Condensed, n019063l.ttf, URW Nimbus Sans L Italic Condensed ) 
+#endif
+ 
+/* URW Nimbus Sans L Bold Italic Condensed */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed, n019064l.ttf, URW Nimbus Sans L Bold Italic Condensed ) 
+#endif
+ 
+/* URW Nimbus Roman No9 L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Times, n021003l.ttf, URW Nimbus Roman No9 L ) 
+#endif
+ 
+/* URW Nimbus Roman No9 L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Times, n021004l.ttf, URW Nimbus Roman No9 L Bold ) 
+#endif
+ 
+/* URW Nimbus Roman No9 L Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Italic_Times, n021023l.ttf, URW Nimbus Roman No9 L Italic ) 
+#endif
+ 
+/* URW Nimbus Roman No9 L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Italic_Times, n021024l.ttf, URW Nimbus Roman No9 L Bold Italic ) 
+#endif
+ 
+/* URW Nimbus Mono L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_L_Courier, n022003l.ttf, URW Nimbus Mono L ) 
+#endif
+ 
+/* URW Nimbus Mono L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Courier, n022004l.ttf, URW Nimbus Mono L Bold ) 
+#endif
+ 
+/* URW Nimbus Mono LK Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_LK_Italic_Courier, n022023l.ttf, URW Nimbus Mono LK Italic ) 
+#endif
+ 
+/* URW Nimbus Mono L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Italic_Courier, n022024l.ttf, URW Nimbus Mono L Bold Italic ) 
+#endif
+ 
+/* URW Palladio L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Palitino, p052003l.ttf, URW Palladio L ) 
+#endif
+ 
+/* URW Palladio L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Bold_Palitino, p052004l.ttf, URW Palladio L Bold ) 
+#endif
+ 
+/* URW Palladio L Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Italic_Palitino, p052023l.ttf, URW Palladio L Italic ) 
+#endif
+ 
+/* URW Palladio L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Bold_Italic_Palitino, p052024l.ttf, URW Palladio L Bold Italic ) 
+#endif
+ 
+/* URW Standard Symbols L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Standard_Symbols_L_Symbol, s050000l.ttf, URW Standard Symbols L ) 
+#endif
+ 
+/* URW Chancery L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Chancery_L_Zapf_Chancery, z003034l.ttf, URW Chancery L ) 
+#endif
+ 
+/* Dingbats */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Dingbats, d050000l.ttf, Dingbats ) 
+#endif
+ 
+/* Luxi Mono Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Bold, luximb.ttf, Luxi Mono Bold ) 
+#endif
+ 
+/* Luxi Mono Bold Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Bold_Oblique, luximbi.ttf, Luxi Mono Bold Oblique ) 
+#endif
+ 
+/* Luxi Mono Regular */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Regular, luximr.ttf, Luxi Mono Regular ) 
+#endif
+ 
+/* Luxi Mono Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Oblique, luximri.ttf, Luxi Mono Oblique ) 
+#endif
+ 
+/* Luxi Serif Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Bold, luxirb.ttf, Luxi Serif Bold ) 
+#endif
+ 
+/* Luxi Serif Bold Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Bold_Oblique, luxirbi.ttf, Luxi Serif Bold Oblique ) 
+#endif
+ 
+/* Luxi Serif Regular */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Regular, luxirr.ttf, Luxi Serif Regular ) 
+#endif
+ 
+/* Luxi Serif Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Oblique, luxirri.ttf, Luxi Serif Oblique ) 
+#endif
+ 
+/* Luxi Sans Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Bold, luxisb.ttf, Luxi Sans Bold ) 
+#endif
+ 
+/* Luxi Sans Bold Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Bold_Oblique, luxisbi.ttf, Luxi Sans Bold Oblique ) 
+#endif
+ 
+/* Luxi Sans Regular */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Regular, luxisr.ttf, Luxi Sans Regular ) 
+#endif
+ 
+/* Luxi Sans Oblique */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Oblique, luxisri.ttf, Luxi Sans Oblique )
+#endif
+
+/* Gentium */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_Gentium, GenR102.TTF, Gentium )
+#endif
+
+/* Gentium Italic */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_Gentium_Italic, GenI102.TTF, Gentium Italic )
+#endif
+
+/* GentiumAlt */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_GentiumAlt, GenAR102.TTF, GentiumAlt )
+#endif
+
+/* GentiumAlt Italic */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_GentiumAlt_Italic, GenAI102.TTF, GentiumAlt Italic )
+#endif
+
+/* MgOpen Canonica Bold */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Bold, MgOpenCanonicaBold.ttf, MgOpen Canonica Bold )
+#endif
+
+/* MgOpen Canonica Bold Italic */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Bold_Italic, MgOpenCanonicaBoldItalic.ttf, MgOpen Canonica Bold Italic)
+#endif
+
+/* MgOpen Canonica Italic */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Italic, MgOpenCanonicaItalic.ttf, MgOpen Canonica Italic )
+#endif
+
+/* MgOpen Canonica Regular */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Regular, MgOpenCanonicaRegular.ttf, MgOpen Canonica )
+#endif
+
+/* Chopin Script */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Chopin_Script, CHOPS___.TTF, Chopin Script ) 
+#endif
+
+/* DTP Dingbats */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_DTPDingbats, DTPDingbats.ttf, DTP Dingbats ) 
+#endif
+
+/* Justus Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Justus_Bold, Justus-Bold.ttf, Justus Bold ) 
+#endif
+
+/* Justus Italic Oldstyle */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Justus_ItalicOldstyle, Justus-ItalicOldstyle.ttf, Justus Italic Oldstyle ) 
+#endif
+
+/* Justus Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Justus_Italic, Justus-Italic.ttf, Justus Italic ) 
+#endif
+
+/* Justus Oldstyle */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Justus_Oldstyle, Justus-Oldstyle.ttf, Justus Oldstyle ) 
+#endif
+
+/* Justus Roman */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Justus_Roman, Justus-Roman.ttf, Justus Roman ) 
+#endif
+
+/* Justus Versalitas */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Justus_Versalitas, Justus-Versalitas.ttf, Justus Versalitas ) 
+#endif
+
+/* Let's trace basic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Lets_trace_basic, letstracebasic.ttf, Lets trace basic  ) 
+#endif
+
+/* Let's trace ruled */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Lets_trace_ruled, letstraceruled.ttf, Lets trace ruled ) 
+#endif
+
+/* Tuffy Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Tuffy_Bold_Italic, Tuffy_Bold_Italic.ttf, Tuffy Bold Italic ) 
+#endif
+
+/* Tuffy Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Tuffy_Bold, Tuffy_Bold.ttf, Tuffy Bold ) 
+#endif
+
+/* Tuffy Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Tuffy_Italic, Tuffy_Italic.ttf, Tuffy Italic ) 
+#endif
+
+/* Tuffy */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Tuffy, Tuffy.ttf, Tuffy ) 
+#endif
+
+/* Verina Sans Bold Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Bold_Oblique, Verina_Sans_Bold_Oblique.otf, Verina Sans Bold Oblique ) 
+#endif
+
+/* Verina Sans Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Bold, Verina_Sans_Bold.otf, Verina Sans Bold ) 
+#endif
+
+/* Verina Sans Mono Bold Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Bold_Oblique, Verina_Sans_Mono_Bold_Oblique.otf, Verina Sans Mono Bold Oblique ) 
+#endif
+
+/* Verina Sans Mono Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Bold, Verina_Sans_Mono_Bold.otf, Verina Sans Mono Bold ) 
+#endif
+
+/* Verina Sans Mono Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Oblique, Verina_Sans_Mono_Oblique.otf, Verina Sans Mono Oblique ) 
+#endif
+
+/* Verina Sans Mono */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono, Verina_Sans_Mono.otf, Verina Sans Mono ) 
+#endif
+
+/* Verina Sans Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Oblique, Verina_Sans_Oblique.otf, Verina Sans Oblique ) 
+#endif
+
+/* Verina Sans Roman */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Roman, Verina_Sans_Roman.otf, Verina Sans Roman ) 
+#endif
+
+/* Verina Serif Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Serif_Bold, Verina_Serif_Bold.otf, Verina Serif Bold ) 
+#endif
+
+/* Verina Serif */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Serif, Verina_Serif.otf, Verina Serif ) 
+#endif
+
diff --git a/scp2/source/accessories/file_gallery_accessories.scp b/scp2/source/accessories/file_gallery_accessories.scp
new file mode 100644
index 000000000000..46706e1ab54f
--- /dev/null
+++ b/scp2/source/accessories/file_gallery_accessories.scp
@@ -0,0 +1,139 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+/* *** Accessories Extras *** */
+
+/* ** Gallery ** */
+
+#ifdef WITH_EXTRA_GALLERY
+
+File gid_File_Extra_Gallery_Accessories
+    Dir = gid_Dir_Gallery;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgallery.zip";
+End
+
+File gid_File_Extra_Gallery_Draws_People_Accessories
+    Dir = gid_Dir_Gallery_Draws_People;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgallerydrawspeople.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Plants_Accessories
+    Dir = gid_Dir_Gallery_Photos_Plants;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotosplants.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Celebration_Accessories
+    Dir = gid_Dir_Gallery_Photos_Celebration;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotoscelebration.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Fauna_Accessories
+    Dir = gid_Dir_Gallery_Photos_Fauna;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotosfauna.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Flowers_Accessories
+    Dir = gid_Dir_Gallery_Photos_Flowers;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotosflowers.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_FoodsandDrinks_Accessories
+    Dir = gid_Dir_Gallery_Photos_FoodsandDrinks;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotosfoodsanddrinks.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Humans_Accessories
+    Dir = gid_Dir_Gallery_Photos_Humans;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotoshumans.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Landscapes_Accessories
+    Dir = gid_Dir_Gallery_Photos_Landscapes;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotoslandscapes.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Buildings_Accessories
+    Dir = gid_Dir_Gallery_Photos_Buildings;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotosbuildings.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Objects_Accessories
+    Dir = gid_Dir_Gallery_Photos_Objects;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotosobjects.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Cities_Accessories
+    Dir = gid_Dir_Gallery_Photos_Cities;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotoscities.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Space_Accessories
+    Dir = gid_Dir_Gallery_Photos_Space;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotosspace.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Statues_Accessories
+    Dir = gid_Dir_Gallery_Photos_Statues;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotosstatues.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Travel_Accessories
+    Dir = gid_Dir_Gallery_Photos_Travel;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotostravel.zip";
+End
+
+File gid_File_Extra_Gallery_Elements_Bullets2_Accessories
+    Dir = gid_Dir_Gallery_Elements_Bullets2;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryelementsbullets2.zip";
+End
+
+File gid_File_Extra_Gallery_NONFREE_Accessories
+    Dir = gid_Dir_Gallery;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgallerynonfree.zip";
+End
+
+#endif
diff --git a/scp2/source/accessories/file_samples_accessories.scp b/scp2/source/accessories/file_samples_accessories.scp
new file mode 100644
index 000000000000..7b4486fee8e0
--- /dev/null
+++ b/scp2/source/accessories/file_samples_accessories.scp
@@ -0,0 +1,81 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+/* *** Accessories Extras *** */
+
+/* ** Samples ** */
+
+#ifdef WITH_EXTRA_SAMPLE
+
+File gid_File_Extra_Samples_Accessories
+    Dir = gid_Dir_Samples_Language;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamples,zip);
+End
+
+File gid_File_Extra_Samples_Documentations_Accessories
+    Dir = gid_Dir_Samples_Documentations;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesdocumentation,zip);
+End
+
+File gid_File_Extra_Samples_Advertisement_Accessories
+    Dir = gid_Dir_Samples_Advertisement;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesadvertisement,zip);
+End
+
+/* ** Samples - NON FREE** */
+
+File gid_File_Extra_Samples_NONFREE_Accessories
+    Dir = gid_Dir_Samples_Language;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesnonfree,zip);
+End
+
+File gid_File_Extra_Samples_NONFREE_Documentations_Accessories
+    Dir = gid_Dir_Samples_Documentations;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesnonfreedocumentation,zip);
+End
+
+File gid_File_Extra_Samples_NONFREE_Advertisement_Accessories
+    Dir = gid_Dir_Samples_Advertisement;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesnonfreeadvertisement,zip);
+End
+
+#endif
diff --git a/scp2/source/accessories/file_templates_accessories.scp b/scp2/source/accessories/file_templates_accessories.scp
new file mode 100644
index 000000000000..55689d907123
--- /dev/null
+++ b/scp2/source/accessories/file_templates_accessories.scp
@@ -0,0 +1,272 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+/* *** Accessories Extras *** */
+
+/* ** Templates ** */
+
+#ifdef WITH_EXTRA_TEMPLATE
+
+File gid_File_Extra_Templates_Accessories
+    Dir = gid_Dir_Template_Language;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplates,zip);
+End
+
+File gid_File_Extra_Templates_Layout_Accessories
+    Dir = gid_Dir_Template_Layout;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplateslayout,zip);
+End
+
+File gid_File_Extra_Templates_Present_Accessories
+    Dir = gid_Dir_Template_Presnt;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatespresent,zip);
+End
+
+File gid_File_Extra_Templates_Educate_Accessories
+    Dir = gid_Dir_Template_Educate;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplateseducate,zip);
+End
+
+File gid_File_Extra_Templates_Finance_Accessories
+    Dir = gid_Dir_Template_Finance;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesfinance,zip);
+End
+
+File gid_File_Extra_Templates_Forms_Accessories
+    Dir = gid_Dir_Template_Forms;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesforms,zip);
+End
+
+File gid_File_Extra_Templates_Labels_Accessories
+    Dir = gid_Dir_Template_Labels;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplateslabels,zip);
+End
+
+File gid_File_Extra_Templates_Misc_Accessories
+    Dir = gid_Dir_Template_Misc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesmisc,zip);
+End
+
+File gid_File_Extra_Templates_Officorr_Accessories
+    Dir = gid_Dir_Template_Officorr;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesofficorr,zip);
+End
+
+File gid_File_Extra_Templates_Offimisc_Accessories
+    Dir = gid_Dir_Template_Offimisc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesoffimisc,zip);
+End
+
+File gid_File_Extra_Templates_Personal_Accessories
+    Dir = gid_Dir_Template_Personal;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatespersonal,zip);
+End
+
+/* ** Templates - Common ** */
+
+File gid_File_Extra_Templates_Common
+    Dir = gid_Dir_Template_Common;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommon.zip";
+End
+
+File gid_File_Extra_Templates_Common_Layout
+    Dir = gid_Dir_Template_Common_Layout;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonlayout.zip";
+End
+
+File gid_File_Extra_Templates_Common_Present
+    Dir = gid_Dir_Template_Common_Presnt;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonpresent.zip";
+End
+
+File gid_File_Extra_Templates_Common_Educate
+    Dir = gid_Dir_Template_Common_Educate;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommoneducate.zip";
+End
+
+File gid_File_Extra_Templates_Common_Finance
+    Dir = gid_Dir_Template_Common_Finance;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonfinance.zip";
+End
+
+File gid_File_Extra_Templates_Common_Forms
+    Dir = gid_Dir_Template_Common_Forms;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonforms.zip";
+End
+
+File gid_File_Extra_Templates_Common_Labels
+    Dir = gid_Dir_Template_Common_Labels;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonlabels.zip";
+End
+
+File gid_File_Extra_Templates_Common_Misc
+    Dir = gid_Dir_Template_Common_Misc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonmisc.zip";
+End
+
+File gid_File_Extra_Templates_Common_Officorr
+    Dir = gid_Dir_Template_Common_Officorr;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonofficorr.zip";
+End
+
+File gid_File_Extra_Templates_Common_Offimisc
+    Dir = gid_Dir_Template_Common_Offimisc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonoffimisc.zip";
+End
+
+File gid_File_Extra_Templates_Common_Personal
+    Dir = gid_Dir_Template_Common_Personal;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonpersonal.zip";
+End
+
+/* ** Templates - NON FREE ** */
+
+File gid_File_Extra_Templates_NONFREE_Accessories
+    Dir = gid_Dir_Template_Language;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfree,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Layout_Accessories
+    Dir = gid_Dir_Template_Layout;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreelayout,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Present_Accessories
+    Dir = gid_Dir_Template_Presnt;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreepresent,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Educate_Accessories
+    Dir = gid_Dir_Template_Educate;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeeducate,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Finance_Accessories
+    Dir = gid_Dir_Template_Finance;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreefinance,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Forms_Accessories
+    Dir = gid_Dir_Template_Forms;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeforms,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Labels_Accessories
+    Dir = gid_Dir_Template_Labels;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreelabels,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Misc_Accessories
+    Dir = gid_Dir_Template_Misc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreemisc,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Officorr_Accessories
+    Dir = gid_Dir_Template_Officorr;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeofficorr,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Offimisc_Accessories
+    Dir = gid_Dir_Template_Offimisc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeoffimisc,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Personal_Accessories
+    Dir = gid_Dir_Template_Personal;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreepersonal,zip);
+End
+
+#endif
diff --git a/scp2/source/accessories/makefile.mk b/scp2/source/accessories/makefile.mk
new file mode 100644
index 000000000000..45c81ca14582
--- /dev/null
+++ b/scp2/source/accessories/makefile.mk
@@ -0,0 +1,86 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+PRJ=..$/..
+
+PRJPCH=
+
+PRJNAME=scp2
+TARGET=accessories
+TARGETTYPE=CUI
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+SCP_PRODUCT_TYPE=osl
+PARFILES= \
+        module_accessories.par
+.IF "$(WITH_EXTRA_GALLERY)" != ""
+PARFILES += \
+        module_gallery_accessories.par     \
+        file_gallery_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_TEMPLATE)" != ""
+PARFILES += \
+        module_templates_accessories.par   \
+        file_templates_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_SAMPLE)" != ""
+PARFILES += \
+        module_samples_accessories.par     \
+        file_samples_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_FONT)" != ""
+PARFILES += \
+        module_font_accessories.par        \
+        file_font_accessories.par
+.ENDIF
+
+ULFFILES= \
+        module_accessories.ulf
+.IF "$(WITH_EXTRA_GALLERY)" != ""
+ULFFILES += \
+        module_gallery_accessories.ulf
+.ENDIF
+.IF "$(WITH_EXTRA_TEMPLATE)" != ""
+ULFFILES += \
+        module_templates_accessories.ulf
+.ENDIF
+.IF "$(WITH_EXTRA_SAMPLE)" != ""
+ULFFILES += \
+        module_samples_accessories.ulf
+.ENDIF
+.IF "$(WITH_EXTRA_FONT)" != ""
+ULFFILES += \
+        module_font_accessories.ulf
+.ENDIF
+
+
+# --- File ---------------------------------------------------------
+.INCLUDE :  target.mk
diff --git a/scp2/source/accessories/module_accessories.scp b/scp2/source/accessories/module_accessories.scp
new file mode 100644
index 000000000000..ded4717f417a
--- /dev/null
+++ b/scp2/source/accessories/module_accessories.scp
@@ -0,0 +1,40 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Accessories
+    ParentID = gid_Module_Optional;
+    Files = (
+  ); 
+    Sortkey = "300";
+    Minimal = NO;
+    Default = YES;
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES);
+End
+
diff --git a/scp2/source/accessories/module_accessories.ulf b/scp2/source/accessories/module_accessories.ulf
new file mode 100644
index 000000000000..4c1adde8aaa2
--- /dev/null
+++ b/scp2/source/accessories/module_accessories.ulf
@@ -0,0 +1,33 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES]
+en-US = "Accessories"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES]
+en-US = "Useful %PRODUCTNAME accessories including various Galleries, Templates, Sample documents and Fonts."
diff --git a/scp2/source/accessories/module_font_accessories.scp b/scp2/source/accessories/module_font_accessories.scp
new file mode 100644
index 000000000000..b41eb09cba02
--- /dev/null
+++ b/scp2/source/accessories/module_font_accessories.scp
@@ -0,0 +1,205 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+#ifdef WITH_EXTRA_FONT
+
+Module gid_Module_Optional_Accessories_Fonts
+    PackageInfo = "packinfo_accessories.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_FONTS);
+    ParentID = gid_Module_Optional_Accessories;
+    Files = ( 
+        gid_File_Fnt_airmole,
+        gid_File_Fnt_airmolea,
+        gid_File_Fnt_airmoles,
+        gid_File_Fnt_airmoleq,
+        gid_File_Fnt_astronbo,
+        gid_File_Fnt_astronbi,
+        gid_File_Fnt_astronbv,
+        gid_File_Fnt_astronbw,
+        gid_File_Fnt_baveuse,
+        gid_File_Fnt_Berylium,
+        gid_File_Fnt_Beryliub,
+        gid_File_Fnt_Berylibi,
+        gid_File_Fnt_Beryliui,
+        gid_File_Fnt_BETSY2,
+        gid_File_Fnt_bluehigh,
+        gid_File_Fnt_bluebold,
+        gid_File_Fnt_bluecond,
+        gid_File_Fnt_bluehigl,
+        gid_File_Fnt_bullpen_,
+        gid_File_Fnt_bullpen3,
+        gid_File_Fnt_bullpeni,
+        gid_File_Fnt_colourba,
+        gid_File_Fnt_colourbb,
+        gid_File_Fnt_counters,
+        gid_File_Fnt_creditva,
+        gid_File_Fnt_creditvb,
+        gid_File_Fnt_creditvz,
+        gid_File_Fnt_creditvi,
+        gid_File_Fnt_edmunds,
+        gid_File_Fnt_edmundis,
+        gid_File_Fnt_engeregu,
+        gid_File_Fnt_engebold,
+        gid_File_Fnt_engeboit,
+        gid_File_Fnt_engeexpa,
+        gid_File_Fnt_engeexbo,
+        gid_File_Fnt_engeexbi,
+        gid_File_Fnt_engeexit,
+        gid_File_Fnt_engeital,
+        gid_File_Fnt_goodfish,
+        gid_File_Fnt_goodfisb,
+        gid_File_Fnt_goodfisc,
+        gid_File_Fnt_goodfisi,
+        gid_File_Fnt_guanine_,
+        gid_File_Fnt_gunplay,
+        gid_File_Fnt_kirsty__,
+        gid_File_Fnt_kirsty_b,
+        gid_File_Fnt_kirstybi,
+        gid_File_Fnt_kirsty_i,
+        gid_File_Fnt_kirstyin,
+        gid_File_Fnt_mufferaw,
+        gid_File_Fnt_nasaliza,
+        gid_File_Fnt_NEUROPOL,
+        gid_File_Fnt_numberpi,
+        gid_File_Fnt_pricedow,
+        gid_File_Fnt_pupcat__,
+        gid_File_Fnt_rina,
+        gid_File_Fnt_sandoval,
+        gid_File_Fnt_SAPPM___,
+        gid_File_Fnt_screenge,
+        gid_File_Fnt_steelfis,
+        gid_File_Fnt_steelfib,
+        gid_File_Fnt_steelout,
+        gid_File_Fnt_strenuou,
+        gid_File_Fnt_strenu3d,
+        gid_File_Fnt_subpear_,
+        gid_File_Fnt_teen____,
+        gid_File_Fnt_teenbold,
+        gid_File_Fnt_teenbdit,
+        gid_File_Fnt_teenital,
+        gid_File_Fnt_teenlite,
+        gid_File_Fnt_teenlita,
+        gid_File_Fnt_typoderm,
+        gid_File_Fnt_vahika_,
+        gid_File_Fnt_vahikab,
+        gid_File_Fnt_vahikac,
+        gid_File_Fnt_vahikai,
+        gid_File_Fnt_vectroid,
+        gid_File_Fnt_velvendc,
+        gid_File_Fnt_velvenda,
+        gid_File_Fnt_vibrocen,
+        gid_File_Fnt_vibroceb,
+        gid_File_Fnt_vibrocex,
+        gid_File_Fnt_vibrocei,
+        gid_File_Fnt_wintermu,
+        gid_File_Fnt_youregon,
+        gid_File_Fnt_youregoi,
+        gid_File_Fnt_zekton__,
+        gid_File_Fnt_zektonbo,
+        gid_File_Fnt_zektonbi,
+        gid_File_Fnt_zektonit,
+        gid_File_Fnt_zorque,
+        gid_File_Fnt_URW_Gothic_L_Avantgarde,
+        gid_File_Fnt_URW_Gothic_L_Bold_Avantgarde,
+        gid_File_Fnt_URW_Gothic_L_Italic_Avantgarde,
+        gid_File_Fnt_URW_Gothic_L_Bold_Italic_Avantgarde,
+        gid_File_Fnt_URW_Bookman_L_Bookman,
+        gid_File_Fnt_URW_Bookman_L_Bold_Bookman,
+        gid_File_Fnt_URW_Bookman_L_Italic_Bookman,
+        gid_File_Fnt_URW_Bookman_L_Bold_Italic_Bookman,
+        gid_File_Fnt_URW_Century_Schoolbook_L_New_Century_SchoolBook,
+        gid_File_Fnt_URW_Century_Schoolbook_L_Bold_New_Century_SchoolBook,
+        gid_File_Fnt_URW_Century_Schoolbook_L_Italic_New_Century_SchoolBook,
+        gid_File_Fnt_URW_Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook,
+        gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica,
+        gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica,
+        gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica,
+        gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica,
+        gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica_Condensed,
+        gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica_Condensed,
+        gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica_Condensed,
+        gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed,
+        gid_File_Fnt_URW_Nimbus_Roman_No9_L_Times,
+        gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Times,
+        gid_File_Fnt_URW_Nimbus_Roman_No9_L_Italic_Times,
+        gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Italic_Times,
+        gid_File_Fnt_URW_Nimbus_Mono_L_Courier,
+        gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Courier,
+        gid_File_Fnt_URW_Nimbus_Mono_LK_Italic_Courier,
+        gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Italic_Courier,
+        gid_File_Fnt_URW_Palladio_L_Palitino,
+        gid_File_Fnt_URW_Palladio_L_Bold_Palitino,
+        gid_File_Fnt_URW_Palladio_L_Italic_Palitino,
+        gid_File_Fnt_URW_Palladio_L_Bold_Italic_Palitino,
+        gid_File_Fnt_URW_Standard_Symbols_L_Symbol,
+        gid_File_Fnt_URW_Chancery_L_Zapf_Chancery,
+        gid_File_Fnt_Dingbats,
+        gid_File_Fnt_Luxi_Mono_Bold,
+        gid_File_Fnt_Luxi_Mono_Bold_Oblique,
+        gid_File_Fnt_Luxi_Mono_Regular,
+        gid_File_Fnt_Luxi_Mono_Oblique,
+        gid_File_Fnt_Luxi_Serif_Bold,
+        gid_File_Fnt_Luxi_Serif_Bold_Oblique,
+        gid_File_Fnt_Luxi_Serif_Regular,
+        gid_File_Fnt_Luxi_Serif_Oblique,
+        gid_File_Fnt_Luxi_Sans_Bold,
+        gid_File_Fnt_Luxi_Sans_Bold_Oblique,
+        gid_File_Fnt_Luxi_Sans_Regular,
+        gid_File_Fnt_Luxi_Sans_Oblique,
+        gid_File_Fnt_Gentium,
+        gid_File_Fnt_Gentium_Italic,
+        gid_File_Fnt_GentiumAlt,
+        gid_File_Fnt_GentiumAlt_Italic,
+        gid_File_Fnt_MgOpen_Canonica_Bold,
+        gid_File_Fnt_MgOpen_Canonica_Bold_Italic,
+        gid_File_Fnt_MgOpen_Canonica_Italic,
+        gid_File_Fnt_MgOpen_Canonica_Regular,
+        gid_File_Fnt_MagyarLinBiolinum,
+        gid_File_Fnt_MagyarLinBiolinumB,
+        gid_File_Fnt_MagyarLinLibertine,
+        gid_File_Fnt_MagyarLinLibertineB,
+        gid_File_Fnt_MagyarLinLibertineBI,
+        gid_File_Fnt_MagyarLinLibertineC,
+        gid_File_Fnt_MagyarLinLibertineG,
+        gid_File_Fnt_MagyarLinLibertineGB,
+        gid_File_Fnt_MagyarLinLibertineGBI,
+        gid_File_Fnt_MagyarLinLibertineGI,
+        gid_File_Fnt_MagyarLinLibertineI,
+        gid_File_Fnt_MagyarLinLibertineN,
+        gid_File_Fnt_MagyarLinLibertineNB,
+        gid_File_Fnt_MagyarLinLibertineNBI,
+        gid_File_Fnt_MagyarLinLibertineNI,
+        gid_File_Fnt_MagyarLinLibertineNC );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#endif
diff --git a/scp2/source/accessories/module_font_accessories.ulf b/scp2/source/accessories/module_font_accessories.ulf
new file mode 100644
index 000000000000..1fc26c1db003
--- /dev/null
+++ b/scp2/source/accessories/module_font_accessories.ulf
@@ -0,0 +1,33 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_FONTS]
+en-US = "Fonts"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_FONTS]
+en-US = "Additional fonts for %PRODUCTNAME and other applications."
diff --git a/scp2/source/accessories/module_gallery_accessories.scp b/scp2/source/accessories/module_gallery_accessories.scp
new file mode 100644
index 000000000000..533183d498bc
--- /dev/null
+++ b/scp2/source/accessories/module_gallery_accessories.scp
@@ -0,0 +1,60 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+#ifdef WITH_EXTRA_GALLERY
+
+Module gid_Module_Optional_Accessories_Gallery
+    PackageInfo = "packinfo_accessories.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_GALLERY);
+    ParentID = gid_Module_Optional_Accessories;
+    Files = (
+        gid_File_Extra_Gallery_Accessories,
+        gid_File_Extra_Gallery_Draws_People_Accessories,
+        gid_File_Extra_Gallery_Photos_Plants_Accessories,
+        gid_File_Extra_Gallery_Photos_Celebration_Accessories,
+        gid_File_Extra_Gallery_Photos_Fauna_Accessories,
+        gid_File_Extra_Gallery_Photos_Flowers_Accessories,
+        gid_File_Extra_Gallery_Photos_FoodsandDrinks_Accessories,
+        gid_File_Extra_Gallery_Photos_Humans_Accessories,
+        gid_File_Extra_Gallery_Photos_Landscapes_Accessories,
+        gid_File_Extra_Gallery_Photos_Objects_Accessories,
+        gid_File_Extra_Gallery_Photos_Buildings_Accessories,
+        gid_File_Extra_Gallery_Photos_Cities_Accessories,
+        gid_File_Extra_Gallery_Photos_Space_Accessories,
+        gid_File_Extra_Gallery_Photos_Statues_Accessories,
+        gid_File_Extra_Gallery_Photos_Travel_Accessories,
+        gid_File_Extra_Gallery_Elements_Bullets2_Accessories,
+        gid_File_Extra_Gallery_NONFREE_Accessories );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#endif
diff --git a/scp2/source/accessories/module_gallery_accessories.ulf b/scp2/source/accessories/module_gallery_accessories.ulf
new file mode 100644
index 000000000000..31745dfffeb6
--- /dev/null
+++ b/scp2/source/accessories/module_gallery_accessories.ulf
@@ -0,0 +1,33 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_GALLERY]
+en-US = "Additional Gallery Themes"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_GALLERY]
+en-US = "The %PRODUCTNAME Gallery contains more than 3400 elements in various themes."
diff --git a/scp2/source/accessories/module_samples_accessories.scp b/scp2/source/accessories/module_samples_accessories.scp
new file mode 100644
index 000000000000..672774c68f98
--- /dev/null
+++ b/scp2/source/accessories/module_samples_accessories.scp
@@ -0,0 +1,98 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+#ifdef WITH_EXTRA_SAMPLE
+
+Module gid_Module_Optional_Accessories_Advertisement
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT);
+    ParentID = gid_Module_Optional_Accessories;
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+Module gid_Module_Optional_Accessories_Documentations
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS);
+    ParentID = gid_Module_Optional_Accessories;
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+Module gid_Module_Optional_Accessories_Samples
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_SAMPLES);
+    ParentID = gid_Module_Optional_Accessories;
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#include "alllangmodules_accessories_samples_root.inc"
+
+Module gid_Module_Optional_Accessories_Adv_Template
+    ParentID = gid_Module_Optional_Accessories_Advertisement;
+    Name = "gid_Module_Optional_Accessories_Adv_Template";
+    Description = "gid_Module_Optional_Accessories_Adv_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (
+        gid_File_Extra_Samples_Advertisement_Accessories,
+        gid_File_Extra_Samples_NONFREE_Advertisement_Accessories );
+    Minimal = NO;
+    Default = YES;
+End
+
+Module gid_Module_Optional_Accessories_Doc_Template
+    ParentID = gid_Module_Optional_Accessories_Documentations;
+    Name = "gid_Module_Optional_Accessories_Doc_Template";
+    Description = "gid_Module_Optional_Accessories_Doc_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (
+        gid_File_Extra_Samples_Documentations_Accessories,
+        gid_File_Extra_Samples_NONFREE_Documentations_Accessories );
+    Minimal = YES;
+    Default = YES;
+End
+
+Module gid_Module_Optional_Accessories_Sam_Template
+    ParentID = gid_Module_Optional_Accessories_Samples;
+    Name = "gid_Module_Optional_Accessories_Sam_Template";
+    Description = "gid_Module_Optional_Accessories_Sam_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (
+        gid_File_Extra_Samples_Accessories,
+        gid_File_Extra_Samples_NONFREE_Accessories  );
+    Minimal = NO;
+    Default = YES;
+End
+
+#include "alllangmodules_accessories_samples.inc"
+
+#endif
+
diff --git a/scp2/source/accessories/module_samples_accessories.ulf b/scp2/source/accessories/module_samples_accessories.ulf
new file mode 100644
index 000000000000..b6a0f5229786
--- /dev/null
+++ b/scp2/source/accessories/module_samples_accessories.ulf
@@ -0,0 +1,712 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_SAMPLES]
+en-US = "Sample documents"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_SAMPLES]
+en-US = "Sample documents are good for learning."
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS]
+en-US = "Documentations"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS]
+en-US = "%PRODUCTNAME documentations."
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT]
+en-US = "Advertisement"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT]
+en-US = "%PRODUCTNAME advertisement materials."
+
+[STR_NAME_MODULE_LANGPACK_EN_US]
+en-US = "English"
+
+[STR_DESC_MODULE_LANGPACK_EN_US]
+en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DE]
+en-US = "German"
+
+[STR_DESC_MODULE_LANGPACK_DE]
+en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FR]
+en-US = "French"
+
+[STR_DESC_MODULE_LANGPACK_FR]
+en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IT]
+en-US = "Italian"
+
+[STR_DESC_MODULE_LANGPACK_IT]
+en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ES]
+en-US = "Spanish"
+
+[STR_DESC_MODULE_LANGPACK_ES]
+en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SV]
+en-US = "Swedish"
+
+[STR_DESC_MODULE_LANGPACK_SV]
+en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT]
+en-US = "Portuguese"
+
+[STR_DESC_MODULE_LANGPACK_PT]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT_BR]
+en-US = "Portuguese (Brazil)"
+
+[STR_DESC_MODULE_LANGPACK_PT_BR]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_JA]
+en-US = "Japanese"
+
+[STR_DESC_MODULE_LANGPACK_JA]
+en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KO]
+en-US = "Korean"
+
+[STR_DESC_MODULE_LANGPACK_KO]
+en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_CN]
+en-US = "Chinese (simplified)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_CN]
+en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_TW]
+en-US = "Chinese (traditional)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_TW]
+en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NL]
+en-US = "Dutch"
+
+[STR_DESC_MODULE_LANGPACK_NL]
+en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HU]
+en-US = "Hungarian"
+
+[STR_DESC_MODULE_LANGPACK_HU]
+en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PL]
+en-US = "Polish"
+
+[STR_DESC_MODULE_LANGPACK_PL]
+en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RU]
+en-US = "Russian"
+
+[STR_DESC_MODULE_LANGPACK_RU]
+en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_LANGPACK_TR]
+en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EL]
+en-US = "Greek"
+
+[STR_DESC_MODULE_LANGPACK_EL]
+en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TH]
+en-US = "Thai"
+
+[STR_DESC_MODULE_LANGPACK_TH]
+en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CS]
+en-US = "Czech"
+
+[STR_DESC_MODULE_LANGPACK_CS]
+en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SK]
+en-US = "Slovak"
+
+[STR_DESC_MODULE_LANGPACK_SK]
+en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HR]
+en-US = "Croatian"
+
+[STR_DESC_MODULE_LANGPACK_HR]
+en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ET]
+en-US = "Estonian"
+
+[STR_DESC_MODULE_LANGPACK_ET]
+en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VI]
+en-US = "Vietnamese"
+
+[STR_DESC_MODULE_LANGPACK_VI]
+en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BG]
+en-US = "Bulgarian"
+
+[STR_DESC_MODULE_LANGPACK_BG]
+en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KM]
+en-US = "Khmer"
+
+[STR_DESC_MODULE_LANGPACK_KM]
+en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PA_IN]
+en-US = "Punjabi"
+
+[STR_DESC_MODULE_LANGPACK_PA_IN]
+en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU_IN]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU_IN]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA_IN]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA_IN]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI_IN]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI_IN]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ST]
+en-US = "Southern Sotho (Sutu)"
+
+[STR_DESC_MODULE_LANGPACK_ST]
+en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TN]
+en-US = "Tswana"
+
+[STR_DESC_MODULE_LANGPACK_TN]
+en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_XH]
+en-US = "Xhosa"
+
+[STR_DESC_MODULE_LANGPACK_XH]
+en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZU]
+en-US = "Zulu"
+
+[STR_DESC_MODULE_LANGPACK_ZU]
+en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AF]
+en-US = "Afrikaans"
+
+[STR_DESC_MODULE_LANGPACK_AF]
+en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW_TZ]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW_TZ]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LO]
+en-US = "Lao"
+
+[STR_DESC_MODULE_LANGPACK_LO]
+en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MY]
+en-US = "Burmese"
+
+[STR_DESC_MODULE_LANGPACK_MY]
+en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NSO]
+en-US = "Northern Sotho"
+
+[STR_DESC_MODULE_LANGPACK_NSO]
+en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN]
+en-US = "Bengali"
+
+[STR_DESC_MODULE_LANGPACK_BN]
+en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_BD]
+en-US = "Bengali (Bangladesh)"
+
+[STR_DESC_MODULE_LANGPACK_BN_BD]
+en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_IN]
+en-US = "Bengali (India)"
+
+[STR_DESC_MODULE_LANGPACK_BN_IN]
+en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR_IN]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR_IN]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR_IN]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR_IN]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NE]
+en-US = "Nepali"
+
+[STR_DESC_MODULE_LANGPACK_NE]
+en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR_SA]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR_SA]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CA]
+en-US = "Catalan"
+
+[STR_DESC_MODULE_LANGPACK_CA]
+en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DA]
+en-US = "Danish"
+
+[STR_DESC_MODULE_LANGPACK_DA]
+en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FI]
+en-US = "Finnish"
+
+[STR_DESC_MODULE_LANGPACK_FI]
+en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HE]
+en-US = "Hebrew"
+
+[STR_DESC_MODULE_LANGPACK_HE]
+en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IS]
+en-US = "Icelandic"
+
+[STR_DESC_MODULE_LANGPACK_IS]
+en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NB]
+en-US = "Norwegian (Bokmal)"
+
+[STR_DESC_MODULE_LANGPACK_NB]
+en-US = "Installs Norwegian (Bokmal) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NN]
+en-US = "Norwegian (Nynorsk)"
+
+[STR_DESC_MODULE_LANGPACK_NN]
+en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RM]
+en-US = "Rhaeto-Romance"
+
+[STR_DESC_MODULE_LANGPACK_RM]
+en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RO]
+en-US = "Romanian"
+
+[STR_DESC_MODULE_LANGPACK_RO]
+en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SQ]
+en-US = "Albanian"
+
+[STR_DESC_MODULE_LANGPACK_SQ]
+en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ID]
+en-US = "Indonesian"
+
+[STR_DESC_MODULE_LANGPACK_ID]
+en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UK]
+en-US = "Ukrainian"
+
+[STR_DESC_MODULE_LANGPACK_UK]
+en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BE]
+en-US = "Belarusian"
+
+[STR_DESC_MODULE_LANGPACK_BE]
+en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SL]
+en-US = "Slovenian"
+
+[STR_DESC_MODULE_LANGPACK_SL]
+en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LV]
+en-US = "Latvian"
+
+[STR_DESC_MODULE_LANGPACK_LV]
+en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LT]
+en-US = "Lithuanian"
+
+[STR_DESC_MODULE_LANGPACK_LT]
+en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HY]
+en-US = "Armenian"
+
+[STR_DESC_MODULE_LANGPACK_HY]
+en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EU]
+en-US = "Basque"
+
+[STR_DESC_MODULE_LANGPACK_EU]
+en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MK]
+en-US = "Macedonian"
+
+[STR_DESC_MODULE_LANGPACK_MK]
+en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MT]
+en-US = "Maltese"
+
+[STR_DESC_MODULE_LANGPACK_MT]
+en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CY]
+en-US = "Welsh"
+
+[STR_DESC_MODULE_LANGPACK_CY]
+en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GL]
+en-US = "Galician"
+
+[STR_DESC_MODULE_LANGPACK_GL]
+en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH_YU]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH_YU]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GA]
+en-US = "Irish"
+
+[STR_DESC_MODULE_LANGPACK_GA]
+en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR_CS]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR_CS]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BS]
+en-US = "Bosnian"
+
+[STR_DESC_MODULE_LANGPACK_BS]
+en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AS_IN]
+en-US = "Assamese"
+
+[STR_DESC_MODULE_LANGPACK_AS_IN]
+en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RW]
+en-US = "Kinyarwanda"
+
+[STR_DESC_MODULE_LANGPACK_RW]
+en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SA]
+en-US = "Sanskrit"
+
+[STR_DESC_MODULE_LANGPACK_SA]
+en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FA]
+en-US = "Farsi"
+
+[STR_DESC_MODULE_LANGPACK_FA]
+en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FO]
+en-US = "Faroese"
+
+[STR_DESC_MODULE_LANGPACK_FO]
+en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SB]
+en-US = "Sorbian"
+
+[STR_DESC_MODULE_LANGPACK_SB]
+en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TT]
+en-US = "Tatar"
+
+[STR_DESC_MODULE_LANGPACK_TT]
+en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TS]
+en-US = "Tsonga"
+
+[STR_DESC_MODULE_LANGPACK_TS]
+en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_YI]
+en-US = "Yiddish"
+
+[STR_DESC_MODULE_LANGPACK_YI]
+en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BR]
+en-US = "Breton"
+
+[STR_DESC_MODULE_LANGPACK_BR]
+en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NR]
+en-US = "Ndebele South"
+
+[STR_DESC_MODULE_LANGPACK_NR]
+en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SS]
+en-US = "Swazi"
+
+[STR_DESC_MODULE_LANGPACK_SS]
+en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VE]
+en-US = "Venda"
+
+[STR_DESC_MODULE_LANGPACK_VE]
+en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KN]
+en-US = "Kannada"
+
+[STR_DESC_MODULE_LANGPACK_KN]
+en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MS]
+en-US = "Malay (Malaysian)"
+
+[STR_DESC_MODULE_LANGPACK_MS]
+en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TG]
+en-US = "Tajik"
+
+[STR_DESC_MODULE_LANGPACK_TG]
+en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KU]
+en-US = "Kurdish"
+
+[STR_DESC_MODULE_LANGPACK_KU]
+en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DZ]
+en-US = "Dzongkha"
+
+[STR_DESC_MODULE_LANGPACK_DZ]
+en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KA]
+en-US = "Georgian"
+
+[STR_DESC_MODULE_LANGPACK_KA]
+en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EO]
+en-US = "Esperanto"
+
+[STR_DESC_MODULE_LANGPACK_EO]
+en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_ZA]
+en-US = "English (South Africa)"
+
+[STR_DESC_MODULE_LANGPACK_EN_ZA]
+en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_GB]
+en-US = "English (United Kingdom)"
+
+[STR_DESC_MODULE_LANGPACK_EN_GB]
+en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR_IN]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR_IN]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ML_IN]
+en-US = "Malayalam"
+
+[STR_DESC_MODULE_LANGPACK_ML_IN]
+en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TE_IN]
+en-US = "Telugu"
+
+[STR_DESC_MODULE_LANGPACK_TE_IN]
+en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TI_ER]
+en-US = "Tigrinya"
+
+[STR_DESC_MODULE_LANGPACK_TI_ER]
+en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UZ]
+en-US = "Uzbek"
+
+[STR_DESC_MODULE_LANGPACK_UZ]
+en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MN]
+en-US = "Mongolian"
+
+[STR_DESC_MODULE_LANGPACK_MN]
+en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KK]
+en-US = "Kazakh"
+
+[STR_DESC_MODULE_LANGPACK_KK]
+en-US = "Installs Kazakh support in %PRODUCTNAME %PRODUCTVERSION"
+
diff --git a/scp2/source/accessories/module_templates_accessories.scp b/scp2/source/accessories/module_templates_accessories.scp
new file mode 100644
index 000000000000..917cf69b93e6
--- /dev/null
+++ b/scp2/source/accessories/module_templates_accessories.scp
@@ -0,0 +1,99 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+#ifdef WITH_EXTRA_TEMPLATE
+
+Module gid_Module_Optional_Accessories_Templates
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_TEMPLATES);
+    ParentID = gid_Module_Optional_Accessories;
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#include "alllangmodules_accessories_templates_root.inc"
+
+Module gid_Module_Optional_Accessories_Tem_Template
+    ParentID = gid_Module_Optional_Accessories_Templates;
+    Name = "gid_Module_Optional_Accessories_Tem_Template";
+    Description = "gid_Module_Optional_Accessories_Tem_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (
+        gid_File_Extra_Templates_Accessories,
+        gid_File_Extra_Templates_Layout_Accessories,
+        gid_File_Extra_Templates_Present_Accessories,
+        gid_File_Extra_Templates_Educate_Accessories,
+        gid_File_Extra_Templates_Finance_Accessories,
+        gid_File_Extra_Templates_Forms_Accessories,
+        gid_File_Extra_Templates_Labels_Accessories,
+        gid_File_Extra_Templates_Misc_Accessories,
+        gid_File_Extra_Templates_Officorr_Accessories,
+        gid_File_Extra_Templates_Offimisc_Accessories,
+        gid_File_Extra_Templates_Personal_Accessories,
+        gid_File_Extra_Templates_NONFREE_Accessories,
+        gid_File_Extra_Templates_NONFREE_Layout_Accessories,
+        gid_File_Extra_Templates_NONFREE_Present_Accessories,
+        gid_File_Extra_Templates_NONFREE_Educate_Accessories,
+        gid_File_Extra_Templates_NONFREE_Finance_Accessories,
+        gid_File_Extra_Templates_NONFREE_Forms_Accessories,
+        gid_File_Extra_Templates_NONFREE_Labels_Accessories,
+        gid_File_Extra_Templates_NONFREE_Misc_Accessories,
+        gid_File_Extra_Templates_NONFREE_Officorr_Accessories,
+        gid_File_Extra_Templates_NONFREE_Offimisc_Accessories,
+        gid_File_Extra_Templates_NONFREE_Personal_Accessories );
+    Minimal = NO;
+    Default = YES;
+End
+
+Module gid_Module_Optional_Accessories_Tem_Common
+    PackageInfo = "packinfo_accessories.txt";
+    ParentID = gid_Module_Optional_Accessories;
+    Name = "gid_Module_Optional_Accessories_Tem_Common";
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_TEMPLATES_COMMON);
+    Files = (
+        gid_File_Extra_Templates_Common,
+        gid_File_Extra_Templates_Common_Layout,
+        gid_File_Extra_Templates_Common_Present,
+        gid_File_Extra_Templates_Common_Educate,
+        gid_File_Extra_Templates_Common_Finance,
+        gid_File_Extra_Templates_Common_Forms,
+        gid_File_Extra_Templates_Common_Labels,
+        gid_File_Extra_Templates_Common_Misc,
+        gid_File_Extra_Templates_Common_Officorr,
+        gid_File_Extra_Templates_Common_Offimisc,
+        gid_File_Extra_Templates_Common_Personal );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#include "alllangmodules_accessories_templates.inc"
+
+#endif
diff --git a/scp2/source/accessories/module_templates_accessories.ulf b/scp2/source/accessories/module_templates_accessories.ulf
new file mode 100644
index 000000000000..da17fc11244f
--- /dev/null
+++ b/scp2/source/accessories/module_templates_accessories.ulf
@@ -0,0 +1,707 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES]
+en-US = "Templates"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES]
+en-US = "Create perfect documents within seconds with document templates."
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES_COMMON]
+en-US = "Common templates"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES_COMMON]
+en-US = "Create perfect documents within seconds with document templates. Common templates contain language independent templates."
+
+[STR_NAME_MODULE_LANGPACK_EN_US]
+en-US = "English"
+
+[STR_DESC_MODULE_LANGPACK_EN_US]
+en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DE]
+en-US = "German"
+
+[STR_DESC_MODULE_LANGPACK_DE]
+en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FR]
+en-US = "French"
+
+[STR_DESC_MODULE_LANGPACK_FR]
+en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IT]
+en-US = "Italian"
+
+[STR_DESC_MODULE_LANGPACK_IT]
+en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ES]
+en-US = "Spanish"
+
+[STR_DESC_MODULE_LANGPACK_ES]
+en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SV]
+en-US = "Swedish"
+
+[STR_DESC_MODULE_LANGPACK_SV]
+en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT]
+en-US = "Portuguese"
+
+[STR_DESC_MODULE_LANGPACK_PT]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT_BR]
+en-US = "Portuguese (Brazil)"
+
+[STR_DESC_MODULE_LANGPACK_PT_BR]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_JA]
+en-US = "Japanese"
+
+[STR_DESC_MODULE_LANGPACK_JA]
+en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KO]
+en-US = "Korean"
+
+[STR_DESC_MODULE_LANGPACK_KO]
+en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_CN]
+en-US = "Chinese (simplified)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_CN]
+en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_TW]
+en-US = "Chinese (traditional)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_TW]
+en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NL]
+en-US = "Dutch"
+
+[STR_DESC_MODULE_LANGPACK_NL]
+en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HU]
+en-US = "Hungarian"
+
+[STR_DESC_MODULE_LANGPACK_HU]
+en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PL]
+en-US = "Polish"
+
+[STR_DESC_MODULE_LANGPACK_PL]
+en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RU]
+en-US = "Russian"
+
+[STR_DESC_MODULE_LANGPACK_RU]
+en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_LANGPACK_TR]
+en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EL]
+en-US = "Greek"
+
+[STR_DESC_MODULE_LANGPACK_EL]
+en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TH]
+en-US = "Thai"
+
+[STR_DESC_MODULE_LANGPACK_TH]
+en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CS]
+en-US = "Czech"
+
+[STR_DESC_MODULE_LANGPACK_CS]
+en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SK]
+en-US = "Slovak"
+
+[STR_DESC_MODULE_LANGPACK_SK]
+en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HR]
+en-US = "Croatian"
+
+[STR_DESC_MODULE_LANGPACK_HR]
+en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ET]
+en-US = "Estonian"
+
+[STR_DESC_MODULE_LANGPACK_ET]
+en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VI]
+en-US = "Vietnamese"
+
+[STR_DESC_MODULE_LANGPACK_VI]
+en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BG]
+en-US = "Bulgarian"
+
+[STR_DESC_MODULE_LANGPACK_BG]
+en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KM]
+en-US = "Khmer"
+
+[STR_DESC_MODULE_LANGPACK_KM]
+en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PA_IN]
+en-US = "Punjabi"
+
+[STR_DESC_MODULE_LANGPACK_PA_IN]
+en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU_IN]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU_IN]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA_IN]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA_IN]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI_IN]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI_IN]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ST]
+en-US = "Southern Sotho (Sutu)"
+
+[STR_DESC_MODULE_LANGPACK_ST]
+en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TN]
+en-US = "Tswana"
+
+[STR_DESC_MODULE_LANGPACK_TN]
+en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_XH]
+en-US = "Xhosa"
+
+[STR_DESC_MODULE_LANGPACK_XH]
+en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZU]
+en-US = "Zulu"
+
+[STR_DESC_MODULE_LANGPACK_ZU]
+en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AF]
+en-US = "Afrikaans"
+
+[STR_DESC_MODULE_LANGPACK_AF]
+en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW_TZ]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW_TZ]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LO]
+en-US = "Lao"
+
+[STR_DESC_MODULE_LANGPACK_LO]
+en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MY]
+en-US = "Burmese"
+
+[STR_DESC_MODULE_LANGPACK_MY]
+en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NSO]
+en-US = "Northern Sotho"
+
+[STR_DESC_MODULE_LANGPACK_NSO]
+en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN]
+en-US = "Bengali"
+
+[STR_DESC_MODULE_LANGPACK_BN]
+en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_BD]
+en-US = "Bengali (Bangladesh)"
+
+[STR_DESC_MODULE_LANGPACK_BN_BD]
+en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_IN]
+en-US = "Bengali (India)"
+
+[STR_DESC_MODULE_LANGPACK_BN_IN]
+en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR_IN]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR_IN]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR_IN]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR_IN]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NE]
+en-US = "Nepali"
+
+[STR_DESC_MODULE_LANGPACK_NE]
+en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR_SA]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR_SA]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CA]
+en-US = "Catalan"
+
+[STR_DESC_MODULE_LANGPACK_CA]
+en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DA]
+en-US = "Danish"
+
+[STR_DESC_MODULE_LANGPACK_DA]
+en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FI]
+en-US = "Finnish"
+
+[STR_DESC_MODULE_LANGPACK_FI]
+en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HE]
+en-US = "Hebrew"
+
+[STR_DESC_MODULE_LANGPACK_HE]
+en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IS]
+en-US = "Icelandic"
+
+[STR_DESC_MODULE_LANGPACK_IS]
+en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NB]
+en-US = "Norwegian (Bokmal)"
+
+[STR_DESC_MODULE_LANGPACK_NB]
+en-US = "Installs Norwegian (Bokmal) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NN]
+en-US = "Norwegian (Nynorsk)"
+
+[STR_DESC_MODULE_LANGPACK_NN]
+en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RM]
+en-US = "Rhaeto-Romance"
+
+[STR_DESC_MODULE_LANGPACK_RM]
+en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RO]
+en-US = "Romanian"
+
+[STR_DESC_MODULE_LANGPACK_RO]
+en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SQ]
+en-US = "Albanian"
+
+[STR_DESC_MODULE_LANGPACK_SQ]
+en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ID]
+en-US = "Indonesian"
+
+[STR_DESC_MODULE_LANGPACK_ID]
+en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UK]
+en-US = "Ukrainian"
+
+[STR_DESC_MODULE_LANGPACK_UK]
+en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BE]
+en-US = "Belarusian"
+
+[STR_DESC_MODULE_LANGPACK_BE]
+en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SL]
+en-US = "Slovenian"
+
+[STR_DESC_MODULE_LANGPACK_SL]
+en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LV]
+en-US = "Latvian"
+
+[STR_DESC_MODULE_LANGPACK_LV]
+en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LT]
+en-US = "Lithuanian"
+
+[STR_DESC_MODULE_LANGPACK_LT]
+en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HY]
+en-US = "Armenian"
+
+[STR_DESC_MODULE_LANGPACK_HY]
+en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EU]
+en-US = "Basque"
+
+[STR_DESC_MODULE_LANGPACK_EU]
+en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MK]
+en-US = "Macedonian"
+
+[STR_DESC_MODULE_LANGPACK_MK]
+en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MT]
+en-US = "Maltese"
+
+[STR_DESC_MODULE_LANGPACK_MT]
+en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CY]
+en-US = "Welsh"
+
+[STR_DESC_MODULE_LANGPACK_CY]
+en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GL]
+en-US = "Galician"
+
+[STR_DESC_MODULE_LANGPACK_GL]
+en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH_YU]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH_YU]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GA]
+en-US = "Irish"
+
+[STR_DESC_MODULE_LANGPACK_GA]
+en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR_CS]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR_CS]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BS]
+en-US = "Bosnian"
+
+[STR_DESC_MODULE_LANGPACK_BS]
+en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AS_IN]
+en-US = "Assamese"
+
+[STR_DESC_MODULE_LANGPACK_AS_IN]
+en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RW]
+en-US = "Kinyarwanda"
+
+[STR_DESC_MODULE_LANGPACK_RW]
+en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SA]
+en-US = "Sanskrit"
+
+[STR_DESC_MODULE_LANGPACK_SA]
+en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FA]
+en-US = "Farsi"
+
+[STR_DESC_MODULE_LANGPACK_FA]
+en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FO]
+en-US = "Faroese"
+
+[STR_DESC_MODULE_LANGPACK_FO]
+en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SB]
+en-US = "Sorbian"
+
+[STR_DESC_MODULE_LANGPACK_SB]
+en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TT]
+en-US = "Tatar"
+
+[STR_DESC_MODULE_LANGPACK_TT]
+en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TS]
+en-US = "Tsonga"
+
+[STR_DESC_MODULE_LANGPACK_TS]
+en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_YI]
+en-US = "Yiddish"
+
+[STR_DESC_MODULE_LANGPACK_YI]
+en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BR]
+en-US = "Breton"
+
+[STR_DESC_MODULE_LANGPACK_BR]
+en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NR]
+en-US = "Ndebele South"
+
+[STR_DESC_MODULE_LANGPACK_NR]
+en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SS]
+en-US = "Swazi"
+
+[STR_DESC_MODULE_LANGPACK_SS]
+en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VE]
+en-US = "Venda"
+
+[STR_DESC_MODULE_LANGPACK_VE]
+en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KN]
+en-US = "Kannada"
+
+[STR_DESC_MODULE_LANGPACK_KN]
+en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MS]
+en-US = "Malay (Malaysian)"
+
+[STR_DESC_MODULE_LANGPACK_MS]
+en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TG]
+en-US = "Tajik"
+
+[STR_DESC_MODULE_LANGPACK_TG]
+en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KU]
+en-US = "Kurdish"
+
+[STR_DESC_MODULE_LANGPACK_KU]
+en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DZ]
+en-US = "Dzongkha"
+
+[STR_DESC_MODULE_LANGPACK_DZ]
+en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KA]
+en-US = "Georgian"
+
+[STR_DESC_MODULE_LANGPACK_KA]
+en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EO]
+en-US = "Esperanto"
+
+[STR_DESC_MODULE_LANGPACK_EO]
+en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_ZA]
+en-US = "English (South Africa)"
+
+[STR_DESC_MODULE_LANGPACK_EN_ZA]
+en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_GB]
+en-US = "English (United Kingdom)"
+
+[STR_DESC_MODULE_LANGPACK_EN_GB]
+en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR_IN]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR_IN]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ML_IN]
+en-US = "Malayalam"
+
+[STR_DESC_MODULE_LANGPACK_ML_IN]
+en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TE_IN]
+en-US = "Telugu"
+
+[STR_DESC_MODULE_LANGPACK_TE_IN]
+en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TI_ER]
+en-US = "Tigrinya"
+
+[STR_DESC_MODULE_LANGPACK_TI_ER]
+en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UZ]
+en-US = "Uzbek"
+
+[STR_DESC_MODULE_LANGPACK_UZ]
+en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MN]
+en-US = "Mongolian"
+
+[STR_DESC_MODULE_LANGPACK_MN]
+en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KK]
+en-US = "Kazakh"
+
+[STR_DESC_MODULE_LANGPACK_KK]
+en-US = "Installs Kazakh support in %PRODUCTNAME %PRODUCTVERSION"
+
diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp
index 574657b5b441..db9b028def62 100644
--- a/scp2/source/activex/file_activex.scp
+++ b/scp2/source/activex/file_activex.scp
@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 File gid_File_Lib_Soactivex
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -58,3 +60,4 @@ File gid_File_Lib_Regpatchactivex_Msi
     Name = "regpatchactivex.dll";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp
index 808afa874992..aaac49d8012d 100644
--- a/scp2/source/activex/module_activex.scp
+++ b/scp2/source/activex/module_activex.scp
@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 Module gid_Module_Optional_Activexcontrol
     PackageInfo = "packinfo_office.txt";
     MOD_NAME_DESC ( MODULE_OPTIONAL_ACTIVEXCONTROL );
@@ -36,3 +38,5 @@ Module gid_Module_Optional_Activexcontrol
     ParentID = gid_Module_Optional;
     Files = (gid_File_Lib_Soactivex, gid_File_Lib_Soactivex64, gid_File_Lib_Regactivex_Msi, gid_File_Lib_Regpatchactivex_Msi);
 End
+
+#endif // WITH_ACTIVEX_COMPONENT
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 9c0f2d5aca8f..01e0b7f94d2a 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -74,7 +74,7 @@ STD_LIB_FILE( gid_File_Lib_Rptxml, rptxml )
 
 File gid_File_Help_Sdatabase_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdatabase);
     Patchfiles = (); 
 End
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index dc4d76fcf5d1..1a245a657e6c 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -54,15 +54,6 @@ Module gid_Module_Prg_Base_Bin
     );
 End
 
-// Module gid_Module_Prg_Base_Help
-//     MOD_NAME_DESC ( MODULE_PRG_BASE_HELP );
-//     ParentID = gid_Module_Prg_Base;
-//     Sortkey = "200";
-//     Minimal = NO;
-//     Default = YES;
-//     Files = (gid_File_Help_Sdatabase_Zip);
-// End
-
 Module gid_Module_Brand_Prg_Base
     PackageInfo = "packinfo_brand.txt";
     Name = "gid_Module_Brand_Prg_Base";
@@ -81,8 +72,7 @@ Module gid_Module_Langpack_Base_Template
     Name = "gid_Module_Langpack_Base_Template";
     Description = "gid_Module_Langpack_Base_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Sdatabase_Zip,
-             gid_File_Res_Abp,
+    Files = (gid_File_Res_Abp,
              gid_File_Res_Adabasui,
              gid_File_Res_Cnr,
              gid_File_Res_Dbp,
diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
index 833ed3905241..833ed3905241 100755..100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 59d7a5aac90e..b1fd14b4088a 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -53,7 +53,7 @@ STD_LIB_FILE( gid_File_Lib_Sc, sc)
 
 STD_LIB_FILE( gid_File_Lib_Scui, scui)
 
-STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
+STD_FILTER_FILE( gid_File_Lib_Scfilt, scfilt)
 
 STD_LIB_FILE( gid_File_Lib_Scd, scd)
 
@@ -67,7 +67,7 @@ STD_RES_FILE( gid_File_Res_Sc, sc )
 
 File gid_File_Help_Scalc_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(scalc);
     Patchfiles = ();
 End
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 0c26c3a7a78b..0e5e7903e39a 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -47,14 +47,6 @@ Module gid_Module_Prg_Calc_Bin
     gid_File_Tmp_Userinstall_Calc_Inf);
 End
 
-// Module gid_Module_Prg_Calc_Help
-//    MOD_NAME_DESC ( MODULE_PRG_CALC_HELP );
-//    ParentID = gid_Module_Prg_Calc;
-//    Sortkey = "200";
-//    Default = YES;
-//    Files = (gid_File_Help_Scalc_Zip);
-// End
-
 Module gid_Module_Prg_Calc_Addins
     MOD_NAME_DESC ( MODULE_OPTIONAL_ADDINS );
     Styles = (HIDDEN_ROOT);
@@ -82,8 +74,7 @@ Module gid_Module_Langpack_Calc_Template
     Name = "gid_Module_Langpack_Calc_Template";
     Description = "gid_Module_Langpack_Calc_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Scalc_Zip,
-             gid_File_Res_Analysis,
+    Files = (gid_File_Res_Analysis,
              gid_File_Res_Date,
              gid_File_Res_Sc,
              gid_File_Res_Solver);
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index a4708523640f..8220610ec5c3 100755..100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 // MSOLE embedded object in SO7 file format
 RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -265,6 +267,8 @@ RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Versionind
     Value = "opendocument.CalcDocument.1";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -272,6 +276,8 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_6
     REG_VALUE_LNG(SO60_SPREADSHEET)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -279,6 +285,8 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Clsid
     Value = "{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -639,6 +647,8 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1
     REG_VALUE_LNG(OO_CALC)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -646,6 +656,8 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Clsid
     Value = "{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -738,6 +750,53 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Printto_Command
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
+// .fods
+
+RegistryItem gid_Regitem_Fods_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".fods\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Fods_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".fods\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Fods_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".fods\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem__Fods
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".fods";
+    Value = "opendocument.CalcDocument.1";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fods
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Root;
+    Name = ".fods";
+    Value = "opendocument.CalcDocument.1";
+    Styles = (PATCH);
+End
+
+RegistryItem gid_Regitem_Fods_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".fods";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.spreadsheet";
+End
+
 // new ots file extension 
 
 RegistryItem gid_Regitem_Ots_PersistentHandler
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index 9788a90c7f3a..cd2dc9c2d6ea 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -30,11 +30,5 @@
 STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas)
 STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools)
 
-#ifdef ENABLE_AGG
-#ifndef SYSTEM_AGG
-STD_LIB_FILE(gid_File_Lib_Agg, agg)
-#endif
-#endif
-
 SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno)
 SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno)
diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk
index eaffb93f3e0f..1e360bed89bf 100644
--- a/scp2/source/canvas/makefile.mk
+++ b/scp2/source/canvas/makefile.mk
@@ -39,15 +39,9 @@ TARGETTYPE=CUI
 
 SCP_PRODUCT_TYPE=osl
 
-.IF "$(ENABLE_AGG)" == "YES"
-SCPDEFS+=-DENABLE_AGG
-.IF "$(SYSTEM_AGG)" == "YES"
-SCPDEFS+=-DSYSTEM_AGG
-.ENDIF
-.ENDIF
-
 PARFILES= canvascommons.par		\
-          vclcanvas.par
+          vclcanvas.par         \
+          mtfrenderer.par
 
 .IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
 PARFILES+= cairocanvas.par
diff --git a/soldep/inc/soldep/hashobj.hxx b/scp2/source/canvas/mtfrenderer.scp
index d92737f9ecda..fa2a3f908a49 100644
--- a/soldep/inc/soldep/hashobj.hxx
+++ b/scp2/source/canvas/mtfrenderer.scp
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2010 Novell, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -25,21 +25,16 @@
  *
  ************************************************************************/
 
-#ifndef _FMRWRK_HASHOBJ_HXX
-#define _FMRWRK_HASHOBJ_HXX
-
-#include <soldep/hashtbl.hxx>
-
-class ObjectWin;
-
-class MyHashObject
-{
-    ObjectWin* mpWin;
-    sal_uIntPtr mnId;
-public:
-    MyHashObject( sal_uIntPtr nId, ObjectWin* pWin );
-    sal_uIntPtr GetId() { return mnId; };
-};
-
-#endif
+#include "macros.inc"
 
+File gid_File_Lib_MtfRenderer
+    TXT_FILE_BODY;
+    Styles = (PACKED,UNO_COMPONENT);
+    RegistryID = gid_Starregistry_Services_Rdb;
+    Dir = SCP2_OOO_BIN_DIR;
+  #ifdef UNX
+    Name = STRING(CONCAT2(libmtfrenderer.uno,UNXSUFFIX));
+  #else
+    Name = "mtfrenderer.uno.dll";
+  #endif
+End
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index 357e01f3cc00..ed5aa45b6c78 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -36,7 +36,7 @@ End
 
 File gid_File_Help_Sdraw_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdraw);
     Patchfiles = (); 
 End
diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
index 3226e08ea559..b5bec12dc7f8 100644
--- a/scp2/source/draw/module_draw.scp
+++ b/scp2/source/draw/module_draw.scp
@@ -47,14 +47,6 @@ Module gid_Module_Prg_Draw_Bin
     gid_File_Tmp_Userinstall_Draw_Inf);
 End
 
-// Module gid_Module_Prg_Draw_Help
-//     MOD_NAME_DESC ( MODULE_PRG_DRAW_HELP );
-//     ParentID = gid_Module_Prg_Draw;
-//     Sortkey = "200";
-//     Default = YES;
-//     Files = (gid_File_Help_Sdraw_Zip);
-// End
-
 Module gid_Module_Brand_Prg_Draw
     PackageInfo = "packinfo_brand.txt";
     Name = "gid_Module_Brand_Prg_Draw";
@@ -73,7 +65,7 @@ Module gid_Module_Langpack_Draw_Template
     Name = "gid_Module_Langpack_Draw_Template";
     Description = "gid_Module_Langpack_Draw_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Sdraw_Zip);
+    Files = ();
 End
 
 #include "alllangmodules_draw.inc"
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index 63dde34437a1..d722319649cd 100755..100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 // MSOLE embedded object in SO7 file format
 RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -265,7 +267,7 @@ RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Versionind
     Value = "opendocument.DrawDocument.1";
 End
 
-
+#endif // WITH_ACTIVEX_COMPONENT
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -274,6 +276,8 @@ RegistryItem gid_Regitem_Soffice_Stardrawdocument_6
     REG_VALUE_LNG(SO60_DRAWING)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -281,6 +285,8 @@ RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Clsid
     Value = "{41662FC2-0D57-4aff-AB27-AD2E12E7C273}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -639,6 +645,8 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1
     REG_VALUE_LNG(OO_DRAW)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -646,6 +654,8 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Clsid
     Value = "{448BB771-CFE2-47C4-BCDF-1FBF378E202C}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -738,6 +748,53 @@ RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Protocol_Stdfileediting_Ve
     Value = "&Open";
 End
 
+// .fodg
+
+RegistryItem gid_Regitem_Fodg_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".fodg\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Fodg_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".fodg\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Fodg_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".fodg\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_Fodg_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".fodg";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.graphics";
+End
+
+RegistryItem gid_Regitem__Fodg
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".fodg";
+    Value = "opendocument.DrawDocument.1";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodg
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Root;
+    Name = ".fodg";
+    Value = "opendocument.DrawDocument.1";
+    Styles = (PATCH);
+End
+
 // new otg file extension 
 
 RegistryItem gid_Regitem_Otg_PersistentHandler
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
new file mode 100644
index 000000000000..a36885d3d47c
--- /dev/null
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -0,0 +1,303 @@
+/*************************************************************************
+*
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: directory_extensions.scp,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2010/10/31 04:58:10 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    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
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+************************************************************************/
+
+#include "macros.inc"
+
+/* *** Additional Extensions *** */
+
+#ifdef WITH_EXTENSION_INTEGRATION
+
+/* ** Presentation Minimizer ** */
+
+#ifndef WITHOUT_EXTENSION_MINIMIZER
+
+Directory gid_Brand_Dir_Share_Extensions_Presentation_Minimizer
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "presentation-minimizer";
+End
+
+#endif
+
+/* ** Report Builder ** */
+
+#ifndef WITHOUT_EXTENSION_REPORTDESIGN
+
+Directory gid_Brand_Dir_Share_Extensions_Report_Builder
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "report-builder";
+End
+
+#endif
+
+/* ** MediaWiki Publisher** */
+
+#ifndef WITHOUT_EXTENSION_MEDIAWIKI
+
+Directory gid_Brand_Dir_Share_Extensions_MediaWiki
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "wiki-publisher";
+End
+
+#endif
+
+/* ** Presenter Screen ** */
+
+#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN
+
+Directory gid_Brand_Dir_Share_Extensions_Presenter_Screen
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "presenter-screen";
+End
+
+#endif
+
+/* ** PDF Import ** */
+
+#ifndef WITHOUT_EXTENSION_PDFIMPORT
+
+Directory gid_Brand_Dir_Share_Extensions_PDF_Import
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "pdfimport";
+End
+
+#endif
+
+/* ** Lightproof ** */
+
+#ifdef WITH_EXTENSION_LIGHTPROOF
+
+Directory gid_Brand_Dir_Share_Extensions_LightProof
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName (en-US) = "lightproof-en-US-0.1";
+    DosName (hu) = "lightproof-hu-1.2";
+    DosName = "lightproof";
+End
+
+#endif
+
+/* ** Numbertext ** */
+
+#ifdef WITH_EXTENSION_NUMBERTEXT
+
+Directory gid_Brand_Dir_Share_Extensions_NumberText
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "numbertext";
+End
+
+#endif
+
+/* ** ConvertTextToNumber ** */
+
+#ifdef WITH_EXTENSION_CT2N
+
+Directory gid_Brand_Dir_Share_Extensions_CT2N
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "ConvertTextToNumber";
+End
+
+#endif
+
+/* ** Hungarian Cross-reference Toolbar** */
+
+#ifdef WITH_EXTENSION_HUNART
+
+Directory gid_Brand_Dir_Share_Extensions_HunArt
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "hunart";
+End
+
+#endif
+
+/* ** Typography Toolbar** */
+
+#ifdef WITH_EXTENSION_TYPO
+
+Directory gid_Brand_Dir_Share_Extensions_Typo
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "typo";
+End
+
+#endif
+
+/* ** Watch Window ** */
+
+#ifdef WITH_EXTENSION_WATCH_WINDOW
+
+Directory gid_Brand_Dir_Share_Extensions_Watch_Window
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "WatchWindow";
+End
+
+#endif
+
+/* ** Diagram ** */
+
+#ifdef WITH_EXTENSION_DIAGRAM
+
+Directory gid_Brand_Dir_Share_Extensions_Diagram
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "Diagram";
+End
+
+#endif
+
+/* ** Validator ** */
+
+#ifdef WITH_EXTENSION_VALIDATOR
+
+Directory gid_Brand_Dir_Share_Extensions_Validator
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "Validator";
+End
+
+#endif
+
+/* ** Barcode ** */
+
+#ifdef WITH_EXTENSION_BARCODE
+
+Directory gid_Brand_Dir_Share_Extensions_Barcode
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "Barcode";
+End
+
+#endif
+
+/* ** Google Docs ** */
+
+#ifdef WITH_EXTENSION_GOOGLE_DOCS
+
+Directory gid_Brand_Dir_Share_Extensions_Google_Docs
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "gdocs";
+End
+
+#endif
+
+/* ** NLPSolver ** */
+
+#ifdef WITH_EXTENSION_NLPSOLVER
+
+Directory gid_Brand_Dir_Share_Extensions_NLPSolver
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "NLPSolver";
+End
+
+#endif
+
+/* ** LanguageTool ** */
+
+#ifdef WITH_EXTENSION_LANGUAGETOOL
+
+Directory gid_Brand_Dir_Share_Extensions_LanguageTool
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "LanguageTool";
+End
+
+#endif
+
+/* ** MySQL Connector ** */
+
+#ifdef WITH_EXTENSION_MYSQLC
+
+Directory gid_Brand_Dir_Share_Extensions_MySQLConnector
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "mysql-connector-ooo";
+End
+
+#endif
+
+/* ** oooblogger ** */
+
+#ifdef WITH_EXTENSION_OOOBLOGGER
+
+Directory gid_Brand_Dir_Share_Extensions_OOoBlogger
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "oooblogger";
+End
+
+#endif
+
+/* ** Sun Template Pack ** */
+
+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
+
+Directory gid_Brand_Dir_Share_Extensions_Sun_Template_Pack
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName (en-US) = "Sun_ODF_Template_Pack_en-US";
+    DosName (de) = "Sun_ODF_Template_Pack_de";
+    DosName (es) = "Sun_ODF_Template_Pack_es";
+    DosName (fr) = "Sun_ODF_Template_Pack_fr";
+    DosName (hu) = "Sun_ODF_Template_Pack_hu";
+    DosName (it) = "Sun_ODF_Template_Pack_it";
+    DosName = "Sun_ODF_Template_Pack";
+End
+
+#endif
+
+/* ** Script provider for BeanShell ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
+
+Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Beanshell
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "script-provider-for-beanshell";
+End
+
+#endif
+
+/* ** Script provider for JavaScript ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
+
+Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Javascript
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "script-provider-for-javascript";
+End
+
+#endif
+
+/* ** Script provider for Python ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_PYTHON
+
+Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Python
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "script-provider-for-python";
+End
+
+#endif
+
+#endif
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
new file mode 100644
index 000000000000..a2b48ecbac26
--- /dev/null
+++ b/scp2/source/extensions/file_extensions.scp
@@ -0,0 +1,347 @@
+/*************************************************************************
+*
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: file_extensions.scp,v $
+ *
+ *  $Revision: 1.4 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2010/10/31 04:58:10 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    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
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+************************************************************************/
+
+#include "macros.inc"
+
+/* *** Additional Extensions *** */
+
+#ifdef WITH_EXTENSION_INTEGRATION
+
+/* ** Presentation Minimizer ** */
+
+#ifndef WITHOUT_EXTENSION_MINIMIZER
+
+File gid_File_Oxt_Presentation_Minimizer
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Presentation_Minimizer;
+    Name = "presentation-minimizer.oxt";
+End
+
+#endif
+
+/* ** Report Builder ** */
+
+#ifndef WITHOUT_EXTENSION_REPORTDESIGN
+
+File gid_File_Oxt_Report_Builder
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Report_Builder;
+    Name = "report-builder.oxt";
+End
+
+#endif
+
+/* ** MediaWiki Publisher** */
+
+#ifndef WITHOUT_EXTENSION_MEDIAWIKI
+
+File gid_File_Oxt_MediaWiki
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_MediaWiki;
+    Name = "wiki-publisher.oxt";
+End
+
+#endif
+
+/* ** Presenter Screen ** */
+
+#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN
+
+File gid_File_Oxt_Presenter_Screen
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Presenter_Screen;
+    Name = "presenter-screen.oxt";
+End
+
+#endif
+
+/* ** PDF Import ** */
+
+#ifndef WITHOUT_EXTENSION_PDFIMPORT
+
+File gid_File_Oxt_PDF_Import
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_PDF_Import;
+    Name = "pdfimport.oxt";
+End
+
+#endif
+
+/* ** Lightproof ** */
+
+#ifdef WITH_EXTENSION_LIGHTPROOF
+
+File gid_File_Oxt_LightProof
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_LightProof;
+    Name (en-US) = "lightproof-en-US.oxt";
+    Name (hu) = "lightproof-hu.oxt";
+End
+
+#endif
+
+/* ** Numbertext ** */
+
+#ifdef WITH_EXTENSION_NUMBERTEXT
+
+File gid_File_Oxt_NumberText
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_NumberText;
+    Name = "numbertext.oxt";
+End
+
+#endif
+
+/* ** ConvertTextToNumber ** */
+
+#ifdef WITH_EXTENSION_CT2N
+
+File gid_File_Oxt_CT2N
+	TXT_FILE_BODY;
+	Styles = (PACKED, ARCHIVE);
+	Dir = gid_Brand_Dir_Share_Extensions_CT2N;
+	Name = "ConvertTextToNumber.oxt";
+End
+
+#endif
+
+/* ** Hungarian Cross-reference Toolbar** */
+
+#ifdef WITH_EXTENSION_HUNART
+
+File gid_File_Oxt_HunArt
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_HunArt;
+    Name = "hunart.oxt";
+End
+
+#endif
+
+/* ** Typography Toolbar** */
+
+#ifdef WITH_EXTENSION_TYPO
+
+File gid_File_Oxt_Typo
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Typo;
+    Name = "typo.oxt";
+End
+
+#endif
+
+/* ** Watch Window ** */
+
+#ifdef WITH_EXTENSION_WATCH_WINDOW
+
+File gid_File_Oxt_Watch_Window
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Watch_Window;
+    Name = "WatchWindow.oxt";
+End
+
+#endif
+
+/* ** Diagram ** */
+
+#ifdef WITH_EXTENSION_DIAGRAM
+
+File gid_File_Oxt_Diagram
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Diagram;
+    Name = "Diagram.oxt";
+End
+
+#endif
+
+/* ** Validator ** */
+
+#ifdef WITH_EXTENSION_VALIDATOR
+
+File gid_File_Oxt_Validator
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Validator;
+    Name = "Validator.oxt";
+End
+
+#endif
+
+/* ** Barcode ** */
+
+#ifdef WITH_EXTENSION_BARCODE
+
+File gid_File_Oxt_Barcode
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Barcode;
+    Name = "Barcode.oxt";
+End
+
+#endif
+
+/* ** Google Docs ** */
+
+#ifdef WITH_EXTENSION_GOOGLE_DOCS
+
+File gid_File_Oxt_Google_Docs
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Google_Docs;
+    Name = "gdocs.oxt";
+End
+
+#endif
+
+/* ** NLPSolver ** */
+
+#ifdef WITH_EXTENSION_NLPSOLVER
+
+File gid_File_Oxt_NLPSolver
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_NLPSolver;
+    Name = "NLPSolver.oxt";
+End
+
+#endif
+
+/* ** LanguageTool ** */
+
+#ifdef WITH_EXTENSION_LANGUAGETOOL
+
+File gid_File_Oxt_LanguageTool
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_LanguageTool;
+    Name = "LanguageTool.oxt";
+End
+
+#endif
+
+/* ** MySQL Connector ** */
+
+#ifdef WITH_EXTENSION_MYSQLC
+
+File gid_File_Oxt_MySQLConnector
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_MySQLConnector;
+    Name = "mysql-connector-ooo.oxt";
+End
+
+#endif
+
+/* ** oooblogger ** */
+
+#ifdef WITH_EXTENSION_OOOBLOGGER
+
+File gid_File_Oxt_OOoBlogger
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_OOoBlogger;
+    Name = "oooblogger.oxt";
+End
+
+#endif
+
+/* ** Sun Template Pack ** */
+
+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
+
+File gid_File_Optional_Extensions_Sun_Template_Pack
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Sun_Template_Pack;
+    Name (en-US) = "Sun-ODF-Template-Pack-en-US.oxt";
+    Name (de) = "Sun-ODF-Template-Pack-de.oxt";
+    Name (it) = "Sun-ODF-Template-Pack-it.oxt";
+    Name (fr) = "Sun-ODF-Template-Pack-fr.oxt";
+    Name (es) = "Sun-ODF-Template-Pack-es.oxt";
+    Name (hu) = "Sun-ODF-Template-Pack-hu.oxt";
+End
+
+#endif
+
+/* ** Script provider for BeanShell ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
+
+File gid_File_Oxt_Script_Provider_For_Beanshell
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Beanshell;
+    Name = "script-provider-for-beanshell.oxt";
+End
+
+#endif
+
+/* ** Script provider for JavaScript ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
+
+File gid_File_Oxt_Script_Provider_For_Javascript
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Javascript;
+    Name = "script-provider-for-javascript.oxt";
+End
+
+#endif
+
+/* ** Script provider for Python ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_PYTHON
+
+File gid_File_Oxt_Script_Provider_For_Python
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Python;
+    Name = "script-provider-for-python.oxt";
+End
+
+#endif
+
+#endif
diff --git a/scp2/source/extensions/makefile.mk b/scp2/source/extensions/makefile.mk
new file mode 100644
index 000000000000..fef302b2e46c
--- /dev/null
+++ b/scp2/source/extensions/makefile.mk
@@ -0,0 +1,62 @@
+#*************************************************************************
+#
+#  OpenOffice.org - a multi-platform office productivity suite
+#
+#  $RCSfile: makefile.mk,v $
+#
+#  $Revision: 1.1 $
+#
+#  last change: $Author: KAMI $ $Date: 2010/08/12 22:05:54 $
+#
+#  The Contents of this file are made available subject to
+#  the terms of GNU Lesser General Public License Version 3.
+#
+#
+#    GNU Lesser General Public License Version 3
+#    =============================================
+#    Copyright 2005 by Sun Microsystems, Inc.
+#    901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#    This library is free software; you can redistribute it and/or
+#    modify it under the terms of the GNU Lesser General Public
+#    License version 2.1, as published by the Free Software Foundation.
+#
+#    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
+#    Lesser General Public License for more details.
+#
+#    You should have received a copy of the GNU Lesser General Public
+#    License along with this library; if not, write to the Free Software
+#    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#    MA  02111-1307  USA
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJPCH=
+
+PRJNAME=scp2
+TARGET=extensions
+TARGETTYPE=CUI
+
+#--- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+SCP_PRODUCT_TYPE=osl
+PARFILES= \
+        module_extensions.par                        \
+        module_extensions_sun_templates.par          \
+        module_extensions_lightproof.par             \
+        directory_extensions.par                     \
+        file_extensions.par
+
+ULFFILES= \
+        module_extensions.ulf                        \
+        module_extensions_sun_templates.ulf          \
+        module_extensions_lightproof.ulf
+
+#--- File ---------------------------------------------------------
+.INCLUDE :  target.mk
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
new file mode 100644
index 000000000000..568b2e1eca7a
--- /dev/null
+++ b/scp2/source/extensions/module_extensions.scp
@@ -0,0 +1,397 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: module_accessories.scp,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2010/10/31 04:58:10 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    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
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Extensions
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS);
+    ParentID = gid_Module_Optional;
+    Files = ( );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+/* *** Additional Extensions *** */
+
+#ifdef WITH_EXTENSION_INTEGRATION
+
+/* ** Presentation Minimizer ** */
+
+#ifndef WITHOUT_EXTENSION_MINIMIZER
+Module gid_Module_Optional_Extensions_MINIMIZER
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MINIMIZER);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Presentation_Minimizer );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Report Builder ** */
+
+#ifndef WITHOUT_EXTENSION_REPORTDESIGN
+Module gid_Module_Optional_Extensions_REPORTDESIGN
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Report_Builder );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** MediaWiki Publisher** */
+
+#ifndef WITHOUT_EXTENSION_MEDIAWIKI
+Module gid_Module_Optional_Extensions_MEDIAWIKI
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_MediaWiki );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Presenter Screen ** */
+
+#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN
+Module gid_Module_Optional_Extensions_PRESENTER_SCREEN
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Presenter_Screen );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** PDF Import ** */
+
+#ifndef WITHOUT_EXTENSION_PDFIMPORT
+Module gid_Module_Optional_Extensions_PDFIMPORT
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_PDF_Import );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Lightproof ** */
+
+#ifdef WITH_EXTENSION_LIGHTPROOF
+Module gid_Module_Optional_Extensions_LightProof
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_LIGHTPROOF);
+    ParentID = gid_Module_Optional_Extensions;
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#endif
+
+/* ** Numbertext ** */
+
+#ifdef WITH_EXTENSION_NUMBERTEXT
+Module gid_Module_Optional_Extensions_NumberText
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_NumberText );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Hungarian Cross-reference Toolbar ** */
+
+#ifdef WITH_EXTENSION_HUNART
+Module gid_Module_Optional_Extensions_HunArt
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_HUNART);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_HunArt );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Typography Toolbar ** */
+
+#ifdef WITH_EXTENSION_TYPO
+Module gid_Module_Optional_Extensions_Typo
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TYPO);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Typo );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** ConvertTextToNumber ** */
+
+#ifdef WITH_EXTENSION_CT2N
+Module gid_Module_Optional_Extensions_CT2N
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_CT2N);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_CT2N );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Watch Window ** */
+
+#ifdef WITH_EXTENSION_WATCH_WINDOW
+Module gid_Module_Optional_Extensions_Watch_Window
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_WATCH_WINDOW);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Watch_Window );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Diagram ** */
+
+#ifdef WITH_EXTENSION_DIAGRAM
+Module gid_Module_Optional_Extensions_Diagram
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_DIAGRAM);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Diagram );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Validator ** */
+
+#ifdef WITH_EXTENSION_VALIDATOR
+Module gid_Module_Optional_Extensions_Validator
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_VALIDATOR);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Validator );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Barcode ** */
+
+#ifdef WITH_EXTENSION_BARCODE
+Module gid_Module_Optional_Extensions_Barcode
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_BARCODE);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Barcode );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Google Docs ** */
+
+#ifdef WITH_EXTENSION_GOOGLE_DOCS
+Module gid_Module_Optional_Extensions_Google_Docs
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_GOOGLE_DOCS);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Google_Docs );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** NLPSolver ** */
+
+#ifdef WITH_EXTENSION_NLPSOLVER
+Module gid_Module_Optional_Extensions_NLPSolver
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_NLPSolver );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** LanguageTool ** */
+
+#ifdef WITH_EXTENSION_LANGUAGETOOL
+Module gid_Module_Optional_Extensions_LanguageTool
+ PackageInfo = "packinfo_extensions.txt";
+ MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL);
+ ParentID = gid_Module_Optional_Extensions;
+ Files = (
+ gid_File_Oxt_LanguageTool );
+ Minimal = NO;
+ Default = YES;
+ Styles = ( );
+End
+#endif
+
+/* ** MySQL Connector ** */
+
+#ifdef WITH_EXTENSION_MYSQLC
+Module gid_Module_Optional_Extensions_MySQLConnector
+ PackageInfo = "packinfo_extensions.txt";
+ MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MYSQLC);
+ ParentID = gid_Module_Optional_Extensions;
+ Files = (
+ gid_File_Oxt_MySQLConnector );
+ Minimal = NO;
+ Default = YES;
+ Styles = ( );
+End
+#endif
+
+/* ** oooblogger ** */
+
+#ifdef WITH_EXTENSION_OOOBLOGGER
+Module gid_Module_Optional_Extensions_OOoBlogger
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_OOoBlogger );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Sun Template Pack ** */
+
+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
+Module gid_Module_Optional_Extensions_Sun_Template_Pack
+    ParentID = gid_Module_Optional_Extensions;
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SUN_TEMPLATE_PACK);
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Script provider for BeanShell ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
+
+Module gid_Module_Optional_Extensions_Script_Provider_For_Beanshell
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Script_Provider_For_Beanshell );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#endif
+
+/* ** Script provider for JavaScript ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
+
+Module gid_Module_Optional_Extensions_Script_Provider_For_Javascript
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Script_Provider_For_Javascript );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#endif
+
+/* ** Script provider for Python ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_PYTHON
+
+Module gid_Module_Optional_Extensions_Script_Provider_For_Python
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Script_Provider_For_Python );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#endif
+
+#endif
diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf
new file mode 100644
index 000000000000..73c91d699ac9
--- /dev/null
+++ b/scp2/source/extensions/module_extensions.ulf
@@ -0,0 +1,178 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: module_accessories.ulf,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2010/10/31 04:58:10 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    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
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS]
+en-US = "Extensions"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS]
+en-US = "Useful %PRODUCTNAME extensions."
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MINIMIZER]
+en-US = "Presentation Minimizer"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MINIMIZER]
+en-US = "Presentation Minimizer"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN]
+en-US = "Report Builder"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN]
+en-US = "Report Builder"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI]
+en-US = "MediaWiki Publisher"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI]
+en-US = "MediaWiki Publisher"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN]
+en-US = "Presenter Screen"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN]
+en-US = "Presenter Screen"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT]
+en-US = "PDF Import"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT]
+en-US = "PDF Import"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_LIGHTPROOF]
+en-US = "Lightproof"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_LIGHTPROOF]
+en-US = "Lightproof"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT]
+en-US = "Numbertext"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT]
+en-US = "Numbertext"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_HUNART]
+en-US = "Hungarian cross-reference toolbar"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_HUNART]
+en-US = "Toolbar to add cross-references with automatic conditional Hungarian articles (eg. *az* 5. ábra, *a* 6. ábra) to avoid bad article and number combination in cross-references."
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_TYPO]
+en-US = "Typography toolbar"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_TYPO]
+en-US = "Toolbar for Graphite smart font features: ligatures, small caps, old style numbers, proportional or monospaced numbers, automatic thousand separators, minus sign, real superscript and subscript, German umlaut variants, fractions."
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_CT2N]
+en-US = "Convert Text to Number"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_CT2N]
+en-US = "Convert Text to Number"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_WATCH_WINDOW]
+en-US = "Watch Window"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_WATCH_WINDOW]
+en-US = "Watch Window"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_DIAGRAM]
+en-US = "Diagram"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_DIAGRAM]
+en-US = "Diagram"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_VALIDATOR]
+en-US = "Validator"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_VALIDATOR]
+en-US = "Validator"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_BARCODE]
+en-US = "Barcode"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_BARCODE]
+en-US = "Barcode"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_GOOGLE_DOCS]
+en-US = "Google Docs & Zoho"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_GOOGLE_DOCS]
+en-US = "Google Docs & Zoho"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER]
+en-US = "Solver for Nonlinear Programming"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER]
+en-US = "Solver for Nonlinear Programming"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL]
+en-US = "LanguageTool Open Source language checker"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL]
+en-US = "LanguageTool Open Source language checker"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MYSQLC]
+en-US = "MySQL Connector"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MYSQLC]
+en-US = "MySQL Connector"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER]
+en-US = "Metaweblog Support"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER]
+en-US = "Metaweblog Support"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SUN_TEMPLATE_PACK]
+en-US = "Sun Professional Template Pack"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SUN_TEMPLATE_PACK]
+en-US = "Sun Professional Template Pack"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL]
+en-US = "Script provider for BeanShell"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL]
+en-US = "Script provider for BeanShell"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT]
+en-US = "Script provider for JavaScript"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT]
+en-US = "Script provider for JavaScript"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON]
+en-US = "Script provider for Python"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON]
+en-US = "Script provider for Python"
diff --git a/scp2/source/extensions/module_extensions_lightproof.scp b/scp2/source/extensions/module_extensions_lightproof.scp
new file mode 100644
index 000000000000..58aa59ad17c4
--- /dev/null
+++ b/scp2/source/extensions/module_extensions_lightproof.scp
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: module_extensions_sun_templates.scp,v $
+ *
+ *  $Revision: 1.0 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    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
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#include "macros.inc"
+
+/* ** LightProof ** */
+
+#ifdef WITH_EXTENSION_INTEGRATION
+
+#ifdef WITH_EXTENSION_LIGHTPROOF
+
+Module gid_Module_Optional_Extensions_LightProof_Template
+    ParentID = gid_Module_Optional_Extensions_LightProof;
+    Name = "gid_Module_Optional_Extensions_LightProof_Template";
+    Description = "gid_Module_Optional_Extensions_LightProof_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = ( gid_File_Oxt_LightProof );
+    Minimal = NO;
+    Default = YES;
+End
+
+#include "alllangmodules_extensions_lightproof.inc"
+
+#endif
+
+#endif
diff --git a/scp2/source/extensions/module_extensions_lightproof.ulf b/scp2/source/extensions/module_extensions_lightproof.ulf
new file mode 100644
index 000000000000..b78fe12a00d7
--- /dev/null
+++ b/scp2/source/extensions/module_extensions_lightproof.ulf
@@ -0,0 +1,701 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: module_accessories.ulf,v $
+ *
+ *  $Revision: 1.0 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    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
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+
+[STR_NAME_MODULE_LANGPACK_EN_US]
+en-US = "English"
+
+[STR_DESC_MODULE_LANGPACK_EN_US]
+en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DE]
+en-US = "German"
+
+[STR_DESC_MODULE_LANGPACK_DE]
+en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FR]
+en-US = "French"
+
+[STR_DESC_MODULE_LANGPACK_FR]
+en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IT]
+en-US = "Italian"
+
+[STR_DESC_MODULE_LANGPACK_IT]
+en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ES]
+en-US = "Spanish"
+
+[STR_DESC_MODULE_LANGPACK_ES]
+en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SV]
+en-US = "Swedish"
+
+[STR_DESC_MODULE_LANGPACK_SV]
+en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT]
+en-US = "Portuguese"
+
+[STR_DESC_MODULE_LANGPACK_PT]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT_BR]
+en-US = "Portuguese (Brazil)"
+
+[STR_DESC_MODULE_LANGPACK_PT_BR]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_JA]
+en-US = "Japanese"
+
+[STR_DESC_MODULE_LANGPACK_JA]
+en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KO]
+en-US = "Korean"
+
+[STR_DESC_MODULE_LANGPACK_KO]
+en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_CN]
+en-US = "Chinese (simplified)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_CN]
+en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_TW]
+en-US = "Chinese (traditional)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_TW]
+en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NL]
+en-US = "Dutch"
+
+[STR_DESC_MODULE_LANGPACK_NL]
+en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HU]
+en-US = "Hungarian"
+
+[STR_DESC_MODULE_LANGPACK_HU]
+en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PL]
+en-US = "Polish"
+
+[STR_DESC_MODULE_LANGPACK_PL]
+en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RU]
+en-US = "Russian"
+
+[STR_DESC_MODULE_LANGPACK_RU]
+en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_LANGPACK_TR]
+en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EL]
+en-US = "Greek"
+
+[STR_DESC_MODULE_LANGPACK_EL]
+en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TH]
+en-US = "Thai"
+
+[STR_DESC_MODULE_LANGPACK_TH]
+en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CS]
+en-US = "Czech"
+
+[STR_DESC_MODULE_LANGPACK_CS]
+en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SK]
+en-US = "Slovak"
+
+[STR_DESC_MODULE_LANGPACK_SK]
+en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HR]
+en-US = "Croatian"
+
+[STR_DESC_MODULE_LANGPACK_HR]
+en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ET]
+en-US = "Estonian"
+
+[STR_DESC_MODULE_LANGPACK_ET]
+en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VI]
+en-US = "Vietnamese"
+
+[STR_DESC_MODULE_LANGPACK_VI]
+en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BG]
+en-US = "Bulgarian"
+
+[STR_DESC_MODULE_LANGPACK_BG]
+en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KM]
+en-US = "Khmer"
+
+[STR_DESC_MODULE_LANGPACK_KM]
+en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PA_IN]
+en-US = "Punjabi"
+
+[STR_DESC_MODULE_LANGPACK_PA_IN]
+en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU_IN]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU_IN]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA_IN]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA_IN]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI_IN]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI_IN]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ST]
+en-US = "Southern Sotho (Sutu)"
+
+[STR_DESC_MODULE_LANGPACK_ST]
+en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TN]
+en-US = "Tswana"
+
+[STR_DESC_MODULE_LANGPACK_TN]
+en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_XH]
+en-US = "Xhosa"
+
+[STR_DESC_MODULE_LANGPACK_XH]
+en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZU]
+en-US = "Zulu"
+
+[STR_DESC_MODULE_LANGPACK_ZU]
+en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AF]
+en-US = "Afrikaans"
+
+[STR_DESC_MODULE_LANGPACK_AF]
+en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW_TZ]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW_TZ]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LO]
+en-US = "Lao"
+
+[STR_DESC_MODULE_LANGPACK_LO]
+en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MY]
+en-US = "Burmese"
+
+[STR_DESC_MODULE_LANGPACK_MY]
+en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NSO]
+en-US = "Northern Sotho"
+
+[STR_DESC_MODULE_LANGPACK_NSO]
+en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN]
+en-US = "Bengali"
+
+[STR_DESC_MODULE_LANGPACK_BN]
+en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_BD]
+en-US = "Bengali (Bangladesh)"
+
+[STR_DESC_MODULE_LANGPACK_BN_BD]
+en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_IN]
+en-US = "Bengali (India)"
+
+[STR_DESC_MODULE_LANGPACK_BN_IN]
+en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR_IN]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR_IN]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR_IN]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR_IN]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NE]
+en-US = "Nepali"
+
+[STR_DESC_MODULE_LANGPACK_NE]
+en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR_SA]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR_SA]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CA]
+en-US = "Catalan"
+
+[STR_DESC_MODULE_LANGPACK_CA]
+en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DA]
+en-US = "Danish"
+
+[STR_DESC_MODULE_LANGPACK_DA]
+en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FI]
+en-US = "Finnish"
+
+[STR_DESC_MODULE_LANGPACK_FI]
+en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HE]
+en-US = "Hebrew"
+
+[STR_DESC_MODULE_LANGPACK_HE]
+en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IS]
+en-US = "Icelandic"
+
+[STR_DESC_MODULE_LANGPACK_IS]
+en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NB]
+en-US = "Norwegian (Bokmal)"
+
+[STR_DESC_MODULE_LANGPACK_NB]
+en-US = "Installs Norwegian (Bokmal) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NN]
+en-US = "Norwegian (Nynorsk)"
+
+[STR_DESC_MODULE_LANGPACK_NN]
+en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RM]
+en-US = "Rhaeto-Romance"
+
+[STR_DESC_MODULE_LANGPACK_RM]
+en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RO]
+en-US = "Romanian"
+
+[STR_DESC_MODULE_LANGPACK_RO]
+en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SQ]
+en-US = "Albanian"
+
+[STR_DESC_MODULE_LANGPACK_SQ]
+en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ID]
+en-US = "Indonesian"
+
+[STR_DESC_MODULE_LANGPACK_ID]
+en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UK]
+en-US = "Ukrainian"
+
+[STR_DESC_MODULE_LANGPACK_UK]
+en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BE]
+en-US = "Belarusian"
+
+[STR_DESC_MODULE_LANGPACK_BE]
+en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SL]
+en-US = "Slovenian"
+
+[STR_DESC_MODULE_LANGPACK_SL]
+en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LV]
+en-US = "Latvian"
+
+[STR_DESC_MODULE_LANGPACK_LV]
+en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LT]
+en-US = "Lithuanian"
+
+[STR_DESC_MODULE_LANGPACK_LT]
+en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HY]
+en-US = "Armenian"
+
+[STR_DESC_MODULE_LANGPACK_HY]
+en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EU]
+en-US = "Basque"
+
+[STR_DESC_MODULE_LANGPACK_EU]
+en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MK]
+en-US = "Macedonian"
+
+[STR_DESC_MODULE_LANGPACK_MK]
+en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MT]
+en-US = "Maltese"
+
+[STR_DESC_MODULE_LANGPACK_MT]
+en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CY]
+en-US = "Welsh"
+
+[STR_DESC_MODULE_LANGPACK_CY]
+en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GL]
+en-US = "Galician"
+
+[STR_DESC_MODULE_LANGPACK_GL]
+en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH_YU]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH_YU]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GA]
+en-US = "Irish"
+
+[STR_DESC_MODULE_LANGPACK_GA]
+en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR_CS]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR_CS]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BS]
+en-US = "Bosnian"
+
+[STR_DESC_MODULE_LANGPACK_BS]
+en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AS_IN]
+en-US = "Assamese"
+
+[STR_DESC_MODULE_LANGPACK_AS_IN]
+en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RW]
+en-US = "Kinyarwanda"
+
+[STR_DESC_MODULE_LANGPACK_RW]
+en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SA]
+en-US = "Sanskrit"
+
+[STR_DESC_MODULE_LANGPACK_SA]
+en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FA]
+en-US = "Farsi"
+
+[STR_DESC_MODULE_LANGPACK_FA]
+en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FO]
+en-US = "Faroese"
+
+[STR_DESC_MODULE_LANGPACK_FO]
+en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SB]
+en-US = "Sorbian"
+
+[STR_DESC_MODULE_LANGPACK_SB]
+en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TT]
+en-US = "Tatar"
+
+[STR_DESC_MODULE_LANGPACK_TT]
+en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TS]
+en-US = "Tsonga"
+
+[STR_DESC_MODULE_LANGPACK_TS]
+en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_YI]
+en-US = "Yiddish"
+
+[STR_DESC_MODULE_LANGPACK_YI]
+en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BR]
+en-US = "Breton"
+
+[STR_DESC_MODULE_LANGPACK_BR]
+en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NR]
+en-US = "Ndebele South"
+
+[STR_DESC_MODULE_LANGPACK_NR]
+en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SS]
+en-US = "Swazi"
+
+[STR_DESC_MODULE_LANGPACK_SS]
+en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VE]
+en-US = "Venda"
+
+[STR_DESC_MODULE_LANGPACK_VE]
+en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KN]
+en-US = "Kannada"
+
+[STR_DESC_MODULE_LANGPACK_KN]
+en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MS]
+en-US = "Malay (Malaysian)"
+
+[STR_DESC_MODULE_LANGPACK_MS]
+en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TG]
+en-US = "Tajik"
+
+[STR_DESC_MODULE_LANGPACK_TG]
+en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KU]
+en-US = "Kurdish"
+
+[STR_DESC_MODULE_LANGPACK_KU]
+en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DZ]
+en-US = "Dzongkha"
+
+[STR_DESC_MODULE_LANGPACK_DZ]
+en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KA]
+en-US = "Georgian"
+
+[STR_DESC_MODULE_LANGPACK_KA]
+en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EO]
+en-US = "Esperanto"
+
+[STR_DESC_MODULE_LANGPACK_EO]
+en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_ZA]
+en-US = "English (South Africa)"
+
+[STR_DESC_MODULE_LANGPACK_EN_ZA]
+en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_GB]
+en-US = "English (United Kingdom)"
+
+[STR_DESC_MODULE_LANGPACK_EN_GB]
+en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR_IN]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR_IN]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ML_IN]
+en-US = "Malayalam"
+
+[STR_DESC_MODULE_LANGPACK_ML_IN]
+en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TE_IN]
+en-US = "Telugu"
+
+[STR_DESC_MODULE_LANGPACK_TE_IN]
+en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TI_ER]
+en-US = "Tigrinya"
+
+[STR_DESC_MODULE_LANGPACK_TI_ER]
+en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UZ]
+en-US = "Uzbek"
+
+[STR_DESC_MODULE_LANGPACK_UZ]
+en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MN]
+en-US = "Mongolian"
+
+[STR_DESC_MODULE_LANGPACK_MN]
+en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KK]
+en-US = "Kazakh"
+
+[STR_DESC_MODULE_LANGPACK_KK]
+en-US = "Installs Kazakh support in %PRODUCTNAME %PRODUCTVERSION"
diff --git a/scp2/source/extensions/module_extensions_sun_templates.scp b/scp2/source/extensions/module_extensions_sun_templates.scp
new file mode 100644
index 000000000000..6e5897ee58f4
--- /dev/null
+++ b/scp2/source/extensions/module_extensions_sun_templates.scp
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: module_extensions_sun_templates.scp,v $
+ *
+ *  $Revision: 1.0 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    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
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#include "macros.inc"
+
+/* ** Sun Template Pack ** */
+
+#ifdef WITH_EXTENSION_INTEGRATION
+
+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
+
+Module gid_Module_Optional_Extensions_Sun_T_Pack_Template
+    ParentID = gid_Module_Optional_Extensions_Sun_Template_Pack;
+    Name = "gid_Module_Optional_Extensions_Sun_T_Pack_Template";
+    Description = "gid_Module_Optional_Extensions_Sun_T_Pack_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = ( gid_File_Optional_Extensions_Sun_Template_Pack );
+    Minimal = NO;
+    Default = YES;
+End
+
+#include "alllangmodules_extensions_templates.inc"
+
+#endif
+
+#endif
diff --git a/scp2/source/extensions/module_extensions_sun_templates.ulf b/scp2/source/extensions/module_extensions_sun_templates.ulf
new file mode 100644
index 000000000000..b78fe12a00d7
--- /dev/null
+++ b/scp2/source/extensions/module_extensions_sun_templates.ulf
@@ -0,0 +1,701 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: module_accessories.ulf,v $
+ *
+ *  $Revision: 1.0 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    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
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+
+[STR_NAME_MODULE_LANGPACK_EN_US]
+en-US = "English"
+
+[STR_DESC_MODULE_LANGPACK_EN_US]
+en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DE]
+en-US = "German"
+
+[STR_DESC_MODULE_LANGPACK_DE]
+en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FR]
+en-US = "French"
+
+[STR_DESC_MODULE_LANGPACK_FR]
+en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IT]
+en-US = "Italian"
+
+[STR_DESC_MODULE_LANGPACK_IT]
+en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ES]
+en-US = "Spanish"
+
+[STR_DESC_MODULE_LANGPACK_ES]
+en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SV]
+en-US = "Swedish"
+
+[STR_DESC_MODULE_LANGPACK_SV]
+en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT]
+en-US = "Portuguese"
+
+[STR_DESC_MODULE_LANGPACK_PT]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT_BR]
+en-US = "Portuguese (Brazil)"
+
+[STR_DESC_MODULE_LANGPACK_PT_BR]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_JA]
+en-US = "Japanese"
+
+[STR_DESC_MODULE_LANGPACK_JA]
+en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KO]
+en-US = "Korean"
+
+[STR_DESC_MODULE_LANGPACK_KO]
+en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_CN]
+en-US = "Chinese (simplified)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_CN]
+en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_TW]
+en-US = "Chinese (traditional)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_TW]
+en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NL]
+en-US = "Dutch"
+
+[STR_DESC_MODULE_LANGPACK_NL]
+en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HU]
+en-US = "Hungarian"
+
+[STR_DESC_MODULE_LANGPACK_HU]
+en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PL]
+en-US = "Polish"
+
+[STR_DESC_MODULE_LANGPACK_PL]
+en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RU]
+en-US = "Russian"
+
+[STR_DESC_MODULE_LANGPACK_RU]
+en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_LANGPACK_TR]
+en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EL]
+en-US = "Greek"
+
+[STR_DESC_MODULE_LANGPACK_EL]
+en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TH]
+en-US = "Thai"
+
+[STR_DESC_MODULE_LANGPACK_TH]
+en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CS]
+en-US = "Czech"
+
+[STR_DESC_MODULE_LANGPACK_CS]
+en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SK]
+en-US = "Slovak"
+
+[STR_DESC_MODULE_LANGPACK_SK]
+en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HR]
+en-US = "Croatian"
+
+[STR_DESC_MODULE_LANGPACK_HR]
+en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ET]
+en-US = "Estonian"
+
+[STR_DESC_MODULE_LANGPACK_ET]
+en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VI]
+en-US = "Vietnamese"
+
+[STR_DESC_MODULE_LANGPACK_VI]
+en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BG]
+en-US = "Bulgarian"
+
+[STR_DESC_MODULE_LANGPACK_BG]
+en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KM]
+en-US = "Khmer"
+
+[STR_DESC_MODULE_LANGPACK_KM]
+en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PA_IN]
+en-US = "Punjabi"
+
+[STR_DESC_MODULE_LANGPACK_PA_IN]
+en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU_IN]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU_IN]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA_IN]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA_IN]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI_IN]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI_IN]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ST]
+en-US = "Southern Sotho (Sutu)"
+
+[STR_DESC_MODULE_LANGPACK_ST]
+en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TN]
+en-US = "Tswana"
+
+[STR_DESC_MODULE_LANGPACK_TN]
+en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_XH]
+en-US = "Xhosa"
+
+[STR_DESC_MODULE_LANGPACK_XH]
+en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZU]
+en-US = "Zulu"
+
+[STR_DESC_MODULE_LANGPACK_ZU]
+en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AF]
+en-US = "Afrikaans"
+
+[STR_DESC_MODULE_LANGPACK_AF]
+en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW_TZ]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW_TZ]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LO]
+en-US = "Lao"
+
+[STR_DESC_MODULE_LANGPACK_LO]
+en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MY]
+en-US = "Burmese"
+
+[STR_DESC_MODULE_LANGPACK_MY]
+en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NSO]
+en-US = "Northern Sotho"
+
+[STR_DESC_MODULE_LANGPACK_NSO]
+en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN]
+en-US = "Bengali"
+
+[STR_DESC_MODULE_LANGPACK_BN]
+en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_BD]
+en-US = "Bengali (Bangladesh)"
+
+[STR_DESC_MODULE_LANGPACK_BN_BD]
+en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_IN]
+en-US = "Bengali (India)"
+
+[STR_DESC_MODULE_LANGPACK_BN_IN]
+en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR_IN]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR_IN]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR_IN]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR_IN]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NE]
+en-US = "Nepali"
+
+[STR_DESC_MODULE_LANGPACK_NE]
+en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR_SA]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR_SA]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CA]
+en-US = "Catalan"
+
+[STR_DESC_MODULE_LANGPACK_CA]
+en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DA]
+en-US = "Danish"
+
+[STR_DESC_MODULE_LANGPACK_DA]
+en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FI]
+en-US = "Finnish"
+
+[STR_DESC_MODULE_LANGPACK_FI]
+en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HE]
+en-US = "Hebrew"
+
+[STR_DESC_MODULE_LANGPACK_HE]
+en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IS]
+en-US = "Icelandic"
+
+[STR_DESC_MODULE_LANGPACK_IS]
+en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NB]
+en-US = "Norwegian (Bokmal)"
+
+[STR_DESC_MODULE_LANGPACK_NB]
+en-US = "Installs Norwegian (Bokmal) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NN]
+en-US = "Norwegian (Nynorsk)"
+
+[STR_DESC_MODULE_LANGPACK_NN]
+en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RM]
+en-US = "Rhaeto-Romance"
+
+[STR_DESC_MODULE_LANGPACK_RM]
+en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RO]
+en-US = "Romanian"
+
+[STR_DESC_MODULE_LANGPACK_RO]
+en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SQ]
+en-US = "Albanian"
+
+[STR_DESC_MODULE_LANGPACK_SQ]
+en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ID]
+en-US = "Indonesian"
+
+[STR_DESC_MODULE_LANGPACK_ID]
+en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UK]
+en-US = "Ukrainian"
+
+[STR_DESC_MODULE_LANGPACK_UK]
+en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BE]
+en-US = "Belarusian"
+
+[STR_DESC_MODULE_LANGPACK_BE]
+en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SL]
+en-US = "Slovenian"
+
+[STR_DESC_MODULE_LANGPACK_SL]
+en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LV]
+en-US = "Latvian"
+
+[STR_DESC_MODULE_LANGPACK_LV]
+en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LT]
+en-US = "Lithuanian"
+
+[STR_DESC_MODULE_LANGPACK_LT]
+en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HY]
+en-US = "Armenian"
+
+[STR_DESC_MODULE_LANGPACK_HY]
+en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EU]
+en-US = "Basque"
+
+[STR_DESC_MODULE_LANGPACK_EU]
+en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MK]
+en-US = "Macedonian"
+
+[STR_DESC_MODULE_LANGPACK_MK]
+en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MT]
+en-US = "Maltese"
+
+[STR_DESC_MODULE_LANGPACK_MT]
+en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CY]
+en-US = "Welsh"
+
+[STR_DESC_MODULE_LANGPACK_CY]
+en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GL]
+en-US = "Galician"
+
+[STR_DESC_MODULE_LANGPACK_GL]
+en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH_YU]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH_YU]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GA]
+en-US = "Irish"
+
+[STR_DESC_MODULE_LANGPACK_GA]
+en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR_CS]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR_CS]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BS]
+en-US = "Bosnian"
+
+[STR_DESC_MODULE_LANGPACK_BS]
+en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AS_IN]
+en-US = "Assamese"
+
+[STR_DESC_MODULE_LANGPACK_AS_IN]
+en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RW]
+en-US = "Kinyarwanda"
+
+[STR_DESC_MODULE_LANGPACK_RW]
+en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SA]
+en-US = "Sanskrit"
+
+[STR_DESC_MODULE_LANGPACK_SA]
+en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FA]
+en-US = "Farsi"
+
+[STR_DESC_MODULE_LANGPACK_FA]
+en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FO]
+en-US = "Faroese"
+
+[STR_DESC_MODULE_LANGPACK_FO]
+en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SB]
+en-US = "Sorbian"
+
+[STR_DESC_MODULE_LANGPACK_SB]
+en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TT]
+en-US = "Tatar"
+
+[STR_DESC_MODULE_LANGPACK_TT]
+en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TS]
+en-US = "Tsonga"
+
+[STR_DESC_MODULE_LANGPACK_TS]
+en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_YI]
+en-US = "Yiddish"
+
+[STR_DESC_MODULE_LANGPACK_YI]
+en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BR]
+en-US = "Breton"
+
+[STR_DESC_MODULE_LANGPACK_BR]
+en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NR]
+en-US = "Ndebele South"
+
+[STR_DESC_MODULE_LANGPACK_NR]
+en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SS]
+en-US = "Swazi"
+
+[STR_DESC_MODULE_LANGPACK_SS]
+en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VE]
+en-US = "Venda"
+
+[STR_DESC_MODULE_LANGPACK_VE]
+en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KN]
+en-US = "Kannada"
+
+[STR_DESC_MODULE_LANGPACK_KN]
+en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MS]
+en-US = "Malay (Malaysian)"
+
+[STR_DESC_MODULE_LANGPACK_MS]
+en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TG]
+en-US = "Tajik"
+
+[STR_DESC_MODULE_LANGPACK_TG]
+en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KU]
+en-US = "Kurdish"
+
+[STR_DESC_MODULE_LANGPACK_KU]
+en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DZ]
+en-US = "Dzongkha"
+
+[STR_DESC_MODULE_LANGPACK_DZ]
+en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KA]
+en-US = "Georgian"
+
+[STR_DESC_MODULE_LANGPACK_KA]
+en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EO]
+en-US = "Esperanto"
+
+[STR_DESC_MODULE_LANGPACK_EO]
+en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_ZA]
+en-US = "English (South Africa)"
+
+[STR_DESC_MODULE_LANGPACK_EN_ZA]
+en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_GB]
+en-US = "English (United Kingdom)"
+
+[STR_DESC_MODULE_LANGPACK_EN_GB]
+en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR_IN]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR_IN]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ML_IN]
+en-US = "Malayalam"
+
+[STR_DESC_MODULE_LANGPACK_ML_IN]
+en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TE_IN]
+en-US = "Telugu"
+
+[STR_DESC_MODULE_LANGPACK_TE_IN]
+en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TI_ER]
+en-US = "Tigrinya"
+
+[STR_DESC_MODULE_LANGPACK_TI_ER]
+en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UZ]
+en-US = "Uzbek"
+
+[STR_DESC_MODULE_LANGPACK_UZ]
+en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MN]
+en-US = "Mongolian"
+
+[STR_DESC_MODULE_LANGPACK_MN]
+en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KK]
+en-US = "Kazakh"
+
+[STR_DESC_MODULE_LANGPACK_KK]
+en-US = "Installs Kazakh support in %PRODUCTNAME %PRODUCTVERSION"
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index d48915072742..7cfd4556fc1a 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -61,3 +61,12 @@ File gid_File_Lib_Gconfbe
     Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX));
 End
 #endif
+
+#ifdef ENABLE_SYSTRAY_GTK
+File gid_File_Lib_QStart_Gtk
+    Name = LIBNAME(qstart_gtk);
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+End
+#endif
diff --git a/scp2/source/gnome/makefile.mk b/scp2/source/gnome/makefile.mk
index 185915353a5a..43c2440695a9 100644
--- a/scp2/source/gnome/makefile.mk
+++ b/scp2/source/gnome/makefile.mk
@@ -39,6 +39,10 @@ TARGETTYPE=CUI
 
 SCP_PRODUCT_TYPE=osl
 
+.IF "$(ENABLE_SYSTRAY_GTK)" != ""
+SCPDEFS+=-DENABLE_SYSTRAY_GTK
+.ENDIF
+
 .IF "$(ENABLE_GCONF)"!="" || "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!=""
 
 .IF "$(ENABLE_GCONF)" != ""
@@ -57,6 +61,10 @@ SCPDEFS+=-DENABLE_GNOMEVFS
 SCPDEFS+=-DENABLE_GIO
 .ENDIF
 
+.IF "$(ENABLE_GTK3)" != ""
+SCPDEFS+=-DENABLE_GTK3
+.ENDIF
+
 PARFILES =                   \
         module_gnome.par     \
         file_gnome.par
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index f9df5c8969a1..8b84916172ac 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -41,6 +41,17 @@ Module gid_Module_Optional_Gnome
     XpdCheckSolaris = "SUNWgnome-vfs";
 #endif
     Files = (
+      gid_File_Lib_Evoab_2,
+      gid_File_Lib_Fps_Gnome,
+      gid_File_Lib_Vclplug_Gtk,
+#ifdef ENABLE_GTK3
+      gid_File_Lib_Vclplug_Gtk3,
+#endif
+      gid_File_Bin_Gnome_Open_Url,
+      gid_File_Bin_Gnome_Open_Url_Bin,
+#ifdef ENABLE_SYSTRAY_GTK
+      gid_File_Lib_QStart_Gtk,
+#endif
 #ifdef ENABLE_GNOMEVFS
       gid_File_Lib_Gnomevfs, gid_File_Bin_Gnome_Set_Default_Application,
 #endif
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
index be1d35ed84cc..15a18d297421 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -38,3 +38,6 @@ STD_LIB_FILE( gid_File_Lib_Flash, flash )
 
 STD_LIB_FILE( gid_File_Lib_Svg, svgfilter )
 
+STD_FILTER_FILE( gid_File_Lib_WPGImport, wpgimport )
+
+STD_FILTER_FILE( gid_File_Lib_VisioImport, visioimport )
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp
index d5d99969fd64..5b6dffb7d14a 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -33,6 +33,6 @@ Module gid_Module_Optional_Grfflt
     Sortkey = "600";
     ParentID = gid_Module_Optional;
     Default = YES;
-    Files = (gid_File_Lib_Svg, gid_File_Lib_Flash,
+    Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WPGImport,
     		 gid_File_Share_Registry_Graphicfilter_Xcd);
 End
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index 35f934da962e..850593d696a8 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -46,8 +46,7 @@ End
 
 File gid_File_Help_Simpress_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE,DONT_OVERWRITE);
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(simpress);
     Patchfiles = (); 
 End
diff --git a/scp2/source/impress/makefile.mk b/scp2/source/impress/makefile.mk
index 0a6e4c37ef1c..0a67e8608ab6 100644
--- a/scp2/source/impress/makefile.mk
+++ b/scp2/source/impress/makefile.mk
@@ -39,6 +39,10 @@ TARGETTYPE=CUI
 
 SCP_PRODUCT_TYPE=osl
 
+.IF "$(ENABLE_OPENGL)"=="TRUE"
+SCPDEFS+=-DENABLE_OPENGL
+.ENDIF
+
 PARFILES= \
         module_impress.par              \
         file_impress.par 
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index 1682b88d051f..e3313c821db4 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -44,18 +44,10 @@ Module gid_Module_Prg_Impress_Bin
     Styles = (HIDDEN_ROOT);
     Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
     gid_File_Share_Registry_Impress_Xcd,
-	gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
+    gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
     gid_File_Tmp_Userinstall_Impress_Inf);
 End
 
-// Module gid_Module_Prg_Impress_Help
-//     MOD_NAME_DESC ( MODULE_PRG_IMPRESS_HELP );
-//     ParentID = gid_Module_Prg_Impress;
-//     Sortkey = "200";
-//     Default = YES;
-//     Files = (gid_File_Help_Simpress_Zip);
-// End
-
 Module gid_Module_Brand_Prg_Impress
     PackageInfo = "packinfo_brand.txt";
     Name = "gid_Module_Brand_Prg_Impress";
@@ -74,7 +66,7 @@ Module gid_Module_Langpack_Impress_Template
     Name = "gid_Module_Langpack_Impress_Template";
     Description = "gid_Module_Langpack_Impress_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Simpress_Zip);
+    Files = ();
 End
 
 Module gid_Module_Prg_Impress_MSO_Reg
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index 7b270e5aca30..063bcf91f4eb 100755..100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 // MSOLE embedded object in SO7 file format
 RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -265,7 +267,7 @@ RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Versionind
     Value = "opendocument.ImpressDocument.1";
 End
 
-
+#endif // WITH_ACTIVEX_COMPONENT
 
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -274,6 +276,8 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6
     REG_VALUE_LNG(SO60_PRESENT)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -281,6 +285,8 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Clsid
     Value = "{E5A0B632-DFBA-4549-9346-E414DA06E6F8}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -654,6 +660,8 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1
     REG_VALUE_LNG(OO_PRESENT)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -661,6 +669,8 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Clsid
     Value = "{EE5D1EA4-D445-4289-B2FC-55FC93693917}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -767,6 +777,53 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Show_Command
     Value = "\"<progpath>\program\soffice.exe\" -show \"%1\"";
 End
 
+// .fodp
+
+RegistryItem gid_Regitem_Fodp_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".fodp\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Fodp_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".fodp\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Fodp_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".fodp\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem__Fodp
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".fodp";
+    Value = "opendocument.ImpressDocument.1";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodp
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Root;
+    Name = ".fodp";
+    Value = "opendocument.ImpressDocument.1";
+    Styles = (PATCH);
+End
+
+RegistryItem gid_Regitem_Fodp_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".fodp";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.presentation";
+End
+
 // new otp file extension
 
 RegistryItem gid_Regitem_Otp_PersistentHandler
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 6ab010baaf31..c554296d4381 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -52,7 +52,7 @@ End
 
 File gid_File_Help_Smath_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(smath);
     Patchfiles = ();
 End
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index e9c084ba928d..960c3203ba6d 100644
--- a/scp2/source/math/module_math.scp
+++ b/scp2/source/math/module_math.scp
@@ -47,14 +47,6 @@ Module gid_Module_Prg_Math_Bin
     gid_File_Tmp_Userinstall_Math_Inf);
 End
 
-// Module gid_Module_Prg_Math_Help
-//     MOD_NAME_DESC ( MODULE_PRG_MATH_HELP );
-//     ParentID = gid_Module_Prg_Math;
-//     Sortkey = "200";
-//     Default = YES;
-//     Files = (gid_File_Help_Smath_Zip);
-// End
-
 Module gid_Module_Brand_Prg_Math
     PackageInfo = "packinfo_brand.txt";
     Name = "gid_Module_Brand_Prg_Math";
@@ -73,8 +65,7 @@ Module gid_Module_Langpack_Math_Template
     Name = "gid_Module_Langpack_Math_Template";
     Description = "gid_Module_Langpack_Math_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Smath_Zip,
-             gid_File_Res_Sm);
+    Files = (gid_File_Res_Sm);
 End
 
 #include "alllangmodules_math.inc"
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index b87e5b940356..b58e15e5265e 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -26,6 +26,8 @@
  ************************************************************************/
 #include "macros.inc"
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 // MSOLE embedded object in SO7 file format
 RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -264,7 +266,7 @@ RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Versionind
     Value = "opendocument.MathDocument.1";
 End
 
-
+#endif // WITH_ACTIVEX_COMPONENT
 
 RegistryItem gid_Regitem_Soffice_Starmathdocument_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -273,6 +275,8 @@ RegistryItem gid_Regitem_Soffice_Starmathdocument_6
     REG_VALUE_LNG(SO60_FORMULA)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
@@ -280,6 +284,8 @@ RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Clsid
     Value = "{D0484DE6-AAEE-468a-991F-8D4B0737B57A}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
@@ -523,6 +529,8 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1
     REG_VALUE_LNG(OO_FORMULA)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
@@ -530,6 +538,8 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Clsid
     Value = "{D2D59CD1-0A6A-4D36-AE20-47817077D57C}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7afdcd81e1ec..8e08d6980bd6 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -62,8 +62,8 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Bin_Unopkgcom,
              gid_Brand_File_Bin_Unopkgexe,
              gid_Brand_File_Bin_Unopkg,
-             gid_Brand_File_Bin_Msvcr71,
              gid_Brand_File_Bin_Libxml2,
+             gid_Brand_File_Bmp_Shell,
              gid_Brand_File_Bmp_IntroAbout,
              gid_Brand_File_C05_Zip_Faq,
              gid_Brand_File_C05_Zip_Register,
@@ -98,10 +98,13 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Share_Xdg_JavaFilter,
              gid_Brand_File_Share_Xdg_Math,
              gid_Brand_File_Share_Xdg_Printeradmin,
-//             gid_Brand_File_Share_Xdg_QStart,
+             gid_Brand_File_Share_Xdg_QStart,
              gid_Brand_File_Share_Xdg_StartCenter,
              gid_Brand_File_Share_Xdg_Writer,
-             gid_Brand_File_Txt_Package);
+             gid_Brand_File_Txt_Package,
+	     gid_License_Txt,
+	     git_License_Odt,
+	     gid_Credits_Odt);
     Unixlinks = (gid_Brand_Unixlink_BasisLink,
                  gid_Brand_Unixlink_Program,
                  gid_Brand_Unixlink_Unopkg,
@@ -116,34 +119,21 @@ Module gid_Module_Langpack_Brand_Template
     Description = "gid_Module_Langpack_Brand_Template";
     Styles = (TEMPLATEMODULE);
     InstallOrder = "1050";
-    Dirs = (gid_Brand_Dir_Help,
-            gid_Brand_Dir_Help_Isolanguage,
-            gid_Brand_Dir_License,
-            gid_Brand_Dir_Program,
-            gid_Brand_Dir_Resource,
-            gid_Brand_Dir_Readme,
-            gid_Brand_Dir_Share,
-            gid_Brand_Dir_Share_Readme);
-    Files = (gid_Brand_File_Res_About,
+    Dirs = (gid_Brand_Dir_Program,
+            gid_Brand_Dir_Program_Shell,
+            gid_Brand_Dir_Program_Resource,
+            gid_Brand_Dir_Readme);
+    Files = (gid_Brand_File_Res_Iso,
+             gid_Brand_File_Res_Ooo,
              gid_Brand_File_Res_Oirm,
              gid_Brand_File_Help_C05_Sdatabase_Zip,
              gid_Brand_File_Help_C05_Scalc_Zip,
              gid_Brand_File_Help_C05_Sdraw_Zip,
              gid_Brand_File_Help_C05_Swriter_Zip,
-             gid_Brand_File_License_License,
-             gid_Brand_File_License_License_Small,
-             gid_Brand_File_License_License_Html,
-             gid_Brand_File_License_License_Html_Small,
              gid_Brand_File_Readme_Readme,
-             gid_Brand_File_Readme_Readme_Html,
              gid_Brand_File_Share_Registry_Cjk_Xcd,
              gid_Brand_File_Share_Registry_Korea_Xcd,
-             gid_Brand_File_Txt_License,
-             gid_Brand_File_Txt_License_Small,
-             gid_Brand_File_Txt_License_Html,
-             gid_Brand_File_Txt_License_Html_Small,
-             gid_Brand_File_Txt_Readme,
-             gid_Brand_File_Txt_Readme_Html);
+             gid_Brand_File_Txt_Readme);
 End
 
 // Directories
@@ -158,27 +148,23 @@ Directory gid_Brand_Dir_Program
 #endif
 End
 
-Directory gid_Brand_Dir_Resource
+Directory gid_Brand_Dir_Program_Resource
     ParentID = gid_Brand_Dir_Program;
     DosName = "resource";
 End
 
-Directory gid_Brand_Dir_Readme
-#if defined MACOSX
-    ParentID = gid_Brand_Dir_BasisLink;
-#else
-    ParentID = gid_Dir_Brand_Root;
-#endif
-    DosName = "readmes";
+Directory gid_Brand_Dir_Program_Shell
+    ParentID = gid_Brand_Dir_Program;
+    DosName = "shell";
 End
 
-Directory gid_Brand_Dir_License
+Directory gid_Brand_Dir_Readme
 #if defined MACOSX
     ParentID = gid_Brand_Dir_BasisLink;
 #else
     ParentID = gid_Dir_Brand_Root;
 #endif
-    DosName = "licenses";
+    DosName = "readmes";
 End
 
 Directory gid_Brand_Dir_Help
@@ -209,11 +195,6 @@ Directory gid_Brand_Dir_Share_Config
     DosName = "config";
 End
 
-Directory gid_Brand_Dir_Share_Readme
-    ParentID = gid_Brand_Dir_Share;
-    DosName = "readme";
-End
-
 Directory gid_Brand_Dir_Share_Extension
     ParentID = gid_Brand_Dir_Share;
     DosName = "extension";
@@ -240,6 +221,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Af
     DosName = "dict-af";
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_Br
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-br";
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_Ca
     ParentID = gid_Brand_Dir_Share_Extensions;
     DosName = "dict-ca";
@@ -305,6 +291,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Hu
     DosName = "dict-hu";
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_Hr
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-hr";
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_It
     ParentID = gid_Brand_Dir_Share_Extensions;
     DosName = "dict-it";
@@ -335,6 +326,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_No
     DosName = "dict-no";
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_Oc
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-oc";
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_Pl
     ParentID = gid_Brand_Dir_Share_Extensions;
     DosName = "dict-pl";
@@ -385,6 +381,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Th
     DosName = "dict-th";
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_Uk
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-uk";
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_Vi
     ParentID = gid_Brand_Dir_Share_Extensions;
     DosName = "dict-vi";
@@ -445,7 +446,7 @@ Unixlink gid_Brand_Unixlink_BasisLink
     // Styles = (LAYERLINK);
     Name = "basis-link";
     Dir = gid_Dir_Brand_Root;
-    Target = "../${UNIXBASISROOTNAME}/basis${OOOBASEVERSION}";
+    Target = "basis${OOOBASEVERSION}";
 End
 #endif
 
@@ -513,6 +514,17 @@ File gid_Brand_File_Bin_Soffice_Bin
     Name = "soffice.bin";
 End
 
+#if defined UNX && ! defined MACOSX
+
+File gid_File_Bin_QStart_Bin
+    BIN_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED, PATCH);
+    Name = "oosplash.bin";
+End
+
+#endif
+
 // use this for high detail file open dialog >= 5.1 windows
 #ifdef WNT
 File gid_Brand_File_Bin_Soffice_Bin_Manifest
@@ -558,22 +570,6 @@ File gid_Brand_File_Bin_Unopkgexe
 End
 #endif
 
-#ifdef WNT
-File gid_Brand_File_Bin_Rebaseoo
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-    Name = "rebaseoo.exe";
-End
-
-File gid_Brand_File_Bin_Rebasegui
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-    Name = "rebasegui.exe";
-End
-#endif
-
 #if defined UNX && !defined MACOSX
 File gid_Brand_File_Script_Unopkg
     BIN_FILE_BODY;
@@ -600,18 +596,6 @@ File gid_Brand_File_Bin_Unopkg
     Name = "unopkg.bin";
 End
 
-#if defined WNT && \
-    (defined M1310 || \
-     ((defined M1400 || defined M1500) && \
-      !(defined SYSTEM_MOZILLA || defined WITHOUT_MOZILLA)))
-File gid_Brand_File_Bin_Msvcr71
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG);
-    Styles = (PACKED);
-End
-#endif
-
 // Due to Windows DLL search order, OOo executables might pick up a libxml2 DLL
 // from a Windows system directory instead of the one from the URE; to avoid
 // problems, as a HACK, for now a copy of the URE libxml2 DLL is placed next to
@@ -653,6 +637,13 @@ File gid_Brand_File_Images_Brand_Zip
     Styles = (PACKED);
 End
 
+File gid_Brand_File_Bmp_Shell
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program_Shell;
+    Name = "shell.zip";
+    Styles = (ARCHIVE);
+End
+
 File gid_Brand_File_Txt_Package
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Share_Extensions;
@@ -738,16 +729,16 @@ File gid_Brand_File_Share_Xdg_Printeradmin
 End
 #endif
 
-//#if defined UNX && ! defined MACOSX
-//#ifdef ENABLE_GTK
-//File gid_Brand_File_Share_Xdg_QStart
-//    TXT_FILE_BODY;
-//    Dir = gid_Brand_Dir_Share_Xdg;
-//    Styles = (PACKED,SCPZIP_REPLACE);
-//    Name = "qstart.desktop";
-//End
-//#endif
-//#endif
+#if defined UNX && ! defined MACOSX
+#ifdef ENABLE_GTK
+File gid_Brand_File_Share_Xdg_QStart
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Styles = (PACKED,SCPZIP_REPLACE);
+    Name = "qstart.desktop";
+End
+#endif
+#endif
 
 #if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_Writer
@@ -786,23 +777,6 @@ File gid_Brand_File_Lib_Mingwm10
 End
 #endif
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Lib_Msvcr80
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "msvcr80.dll";
-#else
-    Name = "msvcr80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
 #if defined(WNT) && defined( _gcc3 )
 
 #if defined(MINGW_GCCDLL)
@@ -829,57 +803,6 @@ End
 
 #endif
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Lib_Msvcp80
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "msvcp80.dll";
-#else
-    Name = "msvcp80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Lib_Msvcm80
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "msvcm80.dll";
-#else
-    Name = "msvcm80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Msvcm80crt_Manifest
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "Microsoft.VC80.CRT.manifest";
-#else
-    Name = "Microsoft.VC80.DebugCRT.manifest";
-#endif
-End
-#endif
-#endif
-#endif
-
 // Profiles
 
 Profile gid_Brand_Profile_Bootstrap_Ini
@@ -973,7 +896,7 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall
   #elif defined MACOSX
     Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
   #else
-    Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
+    Value = "$SYSUSERCONFIG/%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
   #endif
 End
 
@@ -1039,19 +962,14 @@ ProfileItem gid_Brand_Profileitem_Soffice_NativeProgress_So
     Value = "${NATIVEPROGRESS}";
 End
 
-#ifdef WNT
 ProfileItem gid_Brand_Profileitem_Soffice_Hideeula
     ProfileID = gid_Brand_Profile_Soffice_Ini;
     ModuleID = gid_Module_Root_Brand;
     Section = "Bootstrap";
     Order = 7;
     Key = "HideEula";
-    Value = "[HIDEEULA]";
-    Inifiletablekey = "HideEula";
-    Inifiletableaction = "1";
-    Styles = (INIFILETABLE);
+    Value = "1";
 End
-#endif
 
 #ifdef WNT
 ProfileItem gid_Brand_Profileitem_Soffice_Startlang
@@ -1195,6 +1113,24 @@ ProfileItem gid_Brand_Profileitem_Version_Useragent
     Value = "<PRODUCT> (${buildid}; ${_OS}; ${_ARCH}; BundledLanguages=${AllLanguages})";
 End
 
+ProfileItem gid_Brand_Profileitem_Version_Vendor
+    ProfileID = gid_Brand_Profile_Version_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Version";
+    Order = 16;
+    Key = "Vendor";
+    Value = "<vendor>";
+End
+
+ProfileItem gid_Brand_Profileitem_Version_BuildVersion
+    ProfileID = gid_Brand_Profile_Version_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Version";
+    Order = 17;
+    Key = "BuildVersion";
+    Value = "<buildversion>";
+End
+
 ProfileItem gid_Brand_Profileitem_Version_Ooobaseversion
     ProfileID = gid_Brand_Profile_Version_Ini;
     ModuleID = gid_Module_Root_Brand;
@@ -1210,7 +1146,7 @@ ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl
     Section = "Version";
     Order = 18;
     Key = "ExtensionUpdateURL";
-    Value = "http://updateexte.services.openoffice.org/ExtensionUpdateService/check.Update";
+    Value = "http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update";
 End
 
 ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir
@@ -1488,7 +1424,7 @@ End
 #endif
 
 //TODO: This actually belongs into a module of its own:
-#if !defined SYSTEM_PYTHON
+#if !defined DISABLE_PYUNO && !defined SYSTEM_PYTHON
 File gid_Brand_File_Bin_Python
     BIN_FILE_BODY;
     Name = EXENAME(pyuno/python);
@@ -1497,5 +1433,40 @@ File gid_Brand_File_Bin_Python
 End
 #endif
 
-BRAND_RES_FILE( gid_Brand_File_Res_About, about )
+File gid_License_Txt
+  TXT_FILE_BODY;
+#if defined MACOSX
+    Dir = gid_Brand_Dir_BasisLink;
+#else
+    Dir = gid_Dir_Brand_Root;
+#endif
+  #ifdef UNX
+    Name = "LICENSE";
+  #endif
+  #ifdef WNT
+    Name = "license.txt";
+  #endif
+    Styles = (PACKED);
+End
+
+File gid_License_Odt
+    BIN_FILE_BODY;
+#if defined MACOSX
+    Dir = gid_Brand_Dir_BasisLink;
+#else
+    Dir = gid_Dir_Brand_Root;
+#endif
+    Name = "LICENSE.odt";
+    Styles = (PACKED);
+End
 
+File gid_Credits_Odt
+    BIN_FILE_BODY;
+#if defined MACOSX
+    Dir = gid_Brand_Dir_BasisLink;
+#else
+    Dir = gid_Dir_Brand_Root;
+#endif
+    Name = "CREDITS.odt";
+    Styles = (PACKED);
+End
diff --git a/scp2/source/ooo/common_brand_readme.scp b/scp2/source/ooo/common_brand_readme.scp
index dea9145a000e..77aabc8232d3 100644
--- a/scp2/source/ooo/common_brand_readme.scp
+++ b/scp2/source/ooo/common_brand_readme.scp
@@ -29,81 +29,9 @@
 
 // Files
 
-File gid_Brand_File_Txt_License
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Readme;
-  #ifdef UNX
-    README_ALL_LANG(Name, LICENSE);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, license, txt);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_Brand_File_Txt_License_Html
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Readme;
-  #ifdef UNX
-    README_TXT_ALL_LANG(Name, LICENSE, html);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, license, html);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_Brand_File_License_License
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_License;
-  #ifdef UNX
-    README_ALL_LANG(Name, LICENSE);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, license, txt);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_Brand_File_License_License_Html
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_License;
-  #ifdef UNX
-    README_TXT_ALL_LANG(Name, LICENSE, html);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, license, html);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_Brand_File_Txt_Readme
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Readme;
-  #ifdef UNX
-    README_ALL_LANG(Name, README);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, readme, txt);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_Brand_File_Txt_Readme_Html
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Readme;
-  #ifdef UNX
-    README_TXT_ALL_LANG(Name, README, html);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, readme, html);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
 File gid_Brand_File_Readme_Readme
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Readme;
+  TXT_FILE_BODY;
+  Dir = gid_Brand_Dir_Readme;
   #ifdef UNX
     README_ALL_LANG(Name, README);
   #endif
@@ -112,15 +40,3 @@ File gid_Brand_File_Readme_Readme
   #endif
     Styles = (PACKED, SCPZIP_REPLACE);
 End
-
-File gid_Brand_File_Readme_Readme_Html
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Readme;
-  #ifdef UNX
-    README_TXT_ALL_LANG(Name, README, html);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, readme, html);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 4b20c6de7cc1..0393302ce14b 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -75,7 +75,7 @@ Directory gid_Dir_Ooo_Openofficeorg
   #ifdef WNT
     HostName = "${BASISROOTNAME}";
   #else
-    HostName = "${UNIXBASISROOTNAME}";
+    HostName = ".";
   #endif
 End
 #endif
@@ -163,6 +163,11 @@ Directory gid_Dir_Shellnew
     DosName = "shellnew";
 End
 
+Directory gid_Dir_ShellnewToo
+    ParentID = gid_Dir_Program;
+    DosName = "2shellnew";
+End
+
 #endif
 
 Directory gid_Dir_User
@@ -995,6 +1000,11 @@ Directory gid_Dir_Template_Forms
     DIR_IDENT_ALL_LANG(forms);
 End
 
+Directory gid_Dir_Template_Labels
+    ParentID = gid_Dir_Template_Language;
+    DIR_IDENT_ALL_LANG(labels);
+End
+
 Directory gid_Dir_Template_Layout
     ParentID = gid_Dir_Template_Language;
     DIR_IDENT_ALL_LANG(layout);
@@ -1181,11 +1191,6 @@ Directory gid_Dir_Wordbook
     DosName = "wordbook";
 End
 
-Directory gid_Dir_Wordbook_Language
-    ParentID = gid_Dir_Wordbook;
-    DIR_ISOLANGUAGE_ALL_LANG_2;
-End
-
 Directory gid_Dir_Share_Plugin
     ParentID = gid_Dir_Share;
     DosName = "plugin";
@@ -1217,6 +1222,11 @@ End
 Directory gid_Dir_Help_Isolanguage
     ParentID = gid_Dir_Help;
     DIR_ISOLANGUAGE_ALL_LANG;
+#ifdef WITH_HELPPACK_INTEGRATION
+    Styles = (FORCEHELPPACK);
+#else
+    Styles = (HELPPACK);
+#endif
 End
 
 #ifdef UNX
@@ -1329,3 +1339,183 @@ Directory gid_Dir_Share_Icons
 End
 
 #endif
+
+/* *** Accessories Extras *** */
+
+/* ** Gallery ** */
+
+/* Draws */
+Directory gid_Dir_Gallery_Draws
+    ParentID = gid_Dir_Gallery;
+    DosName = "Draws";
+End
+
+/* Draws - People */
+Directory gid_Dir_Gallery_Draws_People
+    ParentID = gid_Dir_Gallery_Draws;
+    DosName = "People";
+End
+
+/* Photos */
+Directory gid_Dir_Gallery_Photos
+    ParentID = gid_Dir_Gallery;
+    DosName = "Photos";
+End
+
+/* Photos - Cities */
+Directory gid_Dir_Gallery_Photos_Cities
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Cities";
+End
+
+/* Photos - Buildings */
+Directory gid_Dir_Gallery_Photos_Buildings
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Buildings";
+End
+
+/* Photos - Plants */
+Directory gid_Dir_Gallery_Photos_Plants
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Plants";
+End
+
+/* Photos - Fauna */
+Directory gid_Dir_Gallery_Photos_Fauna
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Fauna";
+End
+
+/* Photos - Flowers */
+Directory gid_Dir_Gallery_Photos_Flowers
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Flowers";
+End
+
+/* Photos - Landscapes */
+Directory gid_Dir_Gallery_Photos_Landscapes
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Landscapes";
+End
+
+/* Photos - Statues */
+Directory gid_Dir_Gallery_Photos_Statues
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Statues";
+End
+
+/* Photos - Space */
+Directory gid_Dir_Gallery_Photos_Space
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Space";
+End
+
+/* Photos - Travel */
+Directory gid_Dir_Gallery_Photos_Travel
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Travel";
+End
+
+/* Photos - Objects */
+Directory gid_Dir_Gallery_Photos_Objects
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Objects";
+End
+
+/* Photos - Humans */
+Directory gid_Dir_Gallery_Photos_Humans
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Humans";
+End
+
+/* Photos - FoodsandDrinks */
+Directory gid_Dir_Gallery_Photos_FoodsandDrinks
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "FoodsandDrinks";
+End
+
+/* Photos - Celebration */
+Directory gid_Dir_Gallery_Photos_Celebration
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Celebration";
+End
+
+/* Samples - Documentations */
+Directory gid_Dir_Samples_Documentations
+    ParentID = gid_Dir_Samples_Language;
+    DosName = "Documentations";
+End
+
+/* Samples - Advertisement */
+Directory gid_Dir_Samples_Advertisement
+    ParentID = gid_Dir_Samples_Language;
+    DosName = "Advertisement";
+End
+
+/* Elements */
+Directory gid_Dir_Gallery_Elements
+    ParentID = gid_Dir_Gallery;
+    DosName = "Elements";
+End
+
+/* Elements - Bullets 2 */
+Directory gid_Dir_Gallery_Elements_Bullets2
+    ParentID = gid_Dir_Gallery_Elements;
+    DosName = "Bullets2";
+End
+
+ /* Templates - Common */
+Directory gid_Dir_Template_Common
+    ParentID = gid_Dir_Template;
+    DosName = "common";
+End
+
+Directory gid_Dir_Template_Common_Educate
+    ParentID = gid_Dir_Template_Common;
+    DosName = "educate";
+End
+
+Directory gid_Dir_Template_Common_Finance
+    ParentID = gid_Dir_Template_Common;
+    DosName = "finance";
+End
+
+Directory gid_Dir_Template_Common_Forms
+    ParentID = gid_Dir_Template_Common;
+    DosName = "forms";
+End
+
+Directory gid_Dir_Template_Common_Labels
+    ParentID = gid_Dir_Template_Common;
+    DosName = "labels";
+End
+
+Directory gid_Dir_Template_Common_Layout
+    ParentID = gid_Dir_Template_Common;
+    DosName = "layout";
+End
+
+Directory gid_Dir_Template_Common_Misc
+    ParentID = gid_Dir_Template_Common;
+    DosName = "misc";
+End
+
+Directory gid_Dir_Template_Common_Officorr
+    ParentID = gid_Dir_Template_Common;
+    DosName = "officorr";
+End
+
+Directory gid_Dir_Template_Common_Offimisc
+    ParentID = gid_Dir_Template_Common;
+    DosName = "offimisc";
+End
+
+Directory gid_Dir_Template_Common_Personal
+    ParentID = gid_Dir_Template_Common;
+    DosName = "personal";
+End
+
+Directory gid_Dir_Template_Common_Presnt
+    ParentID = gid_Dir_Template_Common;
+    DosName = "presnt";
+End
diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp
index ee4ad7522938..ab1138d70c44 100755..100644
--- a/scp2/source/ooo/directory_ooo_macosx.scp
+++ b/scp2/source/ooo/directory_ooo_macosx.scp
@@ -34,9 +34,7 @@ Directory gid_Dir_Bundle
     LangPackHostName = "%PRODUCTNAME Language Pack.app";
     PatchHostName = "%PRODUCTNAME Patch.app";
 End
-#endif
 
-#ifdef MACOSX
 Directory gid_Dir_Bundle_Contents
     ParentID = gid_Dir_Bundle;
     HostName = "Contents";
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index ee8c46f2c33e..993161786c26 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -301,13 +301,6 @@ File gid_File_Extra_Palettes
     Patchfiles = ();
 End
 
-File gid_File_Extra_Palettes_Lang
-    Dir = gid_Dir_User_Config;
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(palettes,zip);
-End
-
 File gid_File_Extra_Poll_Asp
     Dir = gid_Dir_Config_Webcast;
     PACKED_TXT_FILE_BODY;
@@ -350,13 +343,6 @@ File gid_File_Extra_Symbols
     Name = "symbols.zip";
 End
 
-File gid_File_Extra_Tpllayoutimpr_Lang
-    Dir = gid_Dir_Template_Layout;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tpllayoutimpr,zip);
-End
-
 File gid_File_Extra_Tplpresntimpr_Lang
     Dir = gid_Dir_Template_Presnt;
     TXT_FILE_BODY;
@@ -364,6 +350,12 @@ File gid_File_Extra_Tplpresntimpr_Lang
     EXTRA_ALL_LANG(tplpresntimpr,zip);
 End
 
+File gid_File_Extra_Tpllayoutimpr
+    Dir = gid_Dir_Template_Common_Layout;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "tpllayoutimpr.zip";
+End
+
 File gid_File_Extra_Tplwizbitmap
     Dir = gid_Dir_Share_Template_Wizard_Bitmap;
     ARCHIVE_TXT_FILE_BODY;
@@ -383,12 +375,6 @@ File gid_File_Extra_Tplwizletter
     Name = "tplwizletter.zip";
 End
 
-File gid_File_Extra_Tplwizletter_Lang
-    Dir = gid_Dir_Template_Wizard_Letter;
-    ARCHIVE_TXT_FILE_BODY;
-    EXTRA_ALL_LANG(tplwizletter,zip);
-End
-
 File gid_File_Extra_Tplwizfax_Lang
     Dir = gid_Dir_Template_Wizard_Fax;
     TXT_FILE_BODY;
@@ -430,15 +416,8 @@ File gid_File_Extra_Webcast_Pl
 End
 
 File gid_File_Extra_Wordbook
-    Dir = gid_Dir_Wordbook_Language;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_IDENT_ALL_LANG(wordbook.zip);
-End
-
-File gid_File_Extra_Wordbook_Lang
-    Dir = gid_Dir_Wordbook_Language;
+    Dir = gid_Dir_Wordbook;
     TXT_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(wordbook,zip);
+    Name = "wordbook.zip";
 End
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 10e2dca219fb..8b42a944f0d3 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -135,6 +135,18 @@ STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicItalic, GenBkBasI.ttf, Gentium Book
 STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium Book Basic Bold Italic)
 #endif 
 
+// Linux Libertine G and Linux Biolinum G fonts
+
+#ifndef WITHOUT_FONTS
+STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Regular, LinLibertineG_Re.ttf, Linux Libertine G Regular)
+STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Bold, LinLibertineG_Bd.ttf, Linux Libertine G Bold)
+STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Italic, LinLibertineG_It.ttf, Linux Libertine G Italic)
+STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_BoldItalic, LinLibertineG_BI.ttf, Linux Libertine G Bold Italic)
+STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Regular, LinBiolinumG_Re.ttf, Linux Biolinum G Regular)
+STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Bold, LinBiolinumG_Bd.ttf, Linux Biolinum G Bold)
+STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Italic, LinBiolinumG_It.ttf, Linux Biolinum G Italic)
+#endif
+
 // fontconfig updates to allow proper use of local fonts
 
 #ifdef UNX
@@ -148,3 +160,30 @@ End
 #endif
 #endif
 
+#ifdef WNT
+#ifdef WITH_AGFA_MONOTYPE_FONTS
+STD_FONTWIN_FILE( gid_File_Fnt_albw, albw.ttf, AlbanyAMT)
+STD_FONTWIN_FILE( gid_File_Fnt_albwb, albwb.ttf, AlbanyAMT Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_albwbi, albwbi.ttf, AlbanyAMT Bold Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_albwi, albwi.ttf, AlbanyAMT Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_andybol, andybol_.ttf, AndyMT Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_andyreg, andyreg_.ttf, AndyMT)
+STD_FONTWIN_FILE( gid_File_Fnt_ans, ans_____.ttf, Andale Sans)
+STD_FONTWIN_FILE( gid_File_Fnt_ansb, ansb____.ttf, Andale Sans Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_ansbi, ansbi___.ttf, Andale Sans Bold Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_ansi, ansi____.ttf, Andale Sans Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_bl, bl______.ttf, BellMT)
+STD_FONTWIN_FILE( gid_File_Fnt_blb, blb_____.ttf, BellMT Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_blbi, blbi____.ttf, BellMT Bold Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_bli, bli_____.ttf, BellMT Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_cumbwb, cumbwb__.ttf, CumberlandAMT Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_cumbwbi, cumbwbi_.ttf, CumberlandAMT Bold Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_cumbwi, cumbwi__.ttf, CumberlandAMT Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_cumbwr, cumbwr__.ttf, CumberlandAMT)
+STD_FONTWIN_FILE( gid_File_Fnt_mtsorts, mtsorts_.ttf, Monotype Sorts)
+STD_FONTWIN_FILE( gid_File_Fnt_thowb, thowb___.ttf, ThorndaleAMT Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_thowbi, thowbi__.ttf, ThorndaleAMT Bold Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_thowi, thowi___.ttf, ThorndaleAMT Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_thowr, thowr___.ttf, ThorndaleAMT)
+#endif
+#endif
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 6c96df0d78ef..87891a257202 100755..100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -26,7 +26,7 @@
  ************************************************************************/
 #include "macros.inc"
 
-#ifdef WNT
+#if defined SOLAR_JAVA && defined WNT
 File gid_File_Lib_Accessbridge
     BIN_FILE_BODY;
     Styles = (PACKED);
@@ -34,9 +34,6 @@ File gid_File_Lib_Accessbridge
     Name = "java_uno_accessbridge.dll";
 End
 #endif
-#if ((defined(WNT)) || (defined(LINUX)) || ((defined(SOLARIS)) && (defined(SPARC)))|| defined(NETBSD) )
-STD_LIB_FILE( gid_File_Lib_Adabas, adabas)
-#endif
 
 #if defined(WNT)
 STD_LIB_FILE( gid_File_Lib_Ado, ado)
@@ -112,9 +109,7 @@ File gid_File_Lib_Cli_Oootypes_Assembly
     Version = "${CLI_OOOTYPES_NEW_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "MSIL";
-#endif
 End
 
 #endif
@@ -130,9 +125,7 @@ File gid_File_Lib_Policy_Cli_Oootypes_Assembly
     Version = "${CLI_OOOTYPES_POLICY_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "MSIL";
-#endif
 End
 
 #endif
@@ -208,25 +201,18 @@ End
 
 #endif
 
-//#ifdef UNX
-//#ifdef ENABLE_GTK
-//#ifdef ENABLE_SYSTRAY_GTK
-//File gid_File_Lib_Egg_Tray
-// TXT_FILE_BODY;
-// Styles = (PACKED);
-// Dir = SCP2_OOO_BIN_DIR;
-// Name = STRING(CONCAT3(libeggtray,DLLPOSTFIX,UNXSUFFIX));
-//End
-//
-//File gid_File_Lib_QStart_Gtk
-//    Name = LIBNAME(qstart_gtk);
-//    TXT_FILE_BODY;
-//    Styles = (PACKED);
-//    Dir = SCP2_OOO_BIN_DIR;
-//End
-//#endif
-//#endif
-//#endif
+#ifdef UNX
+#ifdef ENABLE_GTK
+#ifdef ENABLE_SYSTRAY_GTK
+File gid_File_Lib_QStart_Gtk
+    Name = LIBNAME(qstart_gtk);
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+End
+#endif
+#endif
+#endif
 
 STD_LIB_FILE( gid_File_Lib_Dba, dba)
 
@@ -337,9 +323,9 @@ File gid_File_Lib_Vbaobj
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
-    Name = STRING(CONCAT4(libvbaobj,DLLPOSTFIX,.uno,UNXSUFFIX));
+    Name = STRING(CONCAT3(vbaobj,.uno,UNXSUFFIX));
   #else
-    Name = STRING(CONCAT4(vbaobj,DLLPOSTFIX,.uno,.dll));
+    Name = STRING(CONCAT3(vbaobj,.uno,.dll));
   #endif
 End
 
@@ -537,9 +523,24 @@ File gid_File_Lib_Fps_Kde4
 End
 #endif
 #endif
+#ifdef ENABLE_KDE
+#ifndef MACOSX
+File gid_File_Lib_Fps_Kde
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Program;
+    Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde.uno);
+End
+File gid_File_Bin_KdeFilePicker
+    BIN_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Program;
+    Name = "kdefilepicker";
+End
+#endif
+#endif
 #endif
 
-#ifdef MACOSX
 #ifdef QUARTZ
 File gid_File_Lib_Fps_Aqua
     TXT_FILE_BODY;
@@ -562,6 +563,9 @@ File gid_File_Lib_avmediaQuickTime
 	Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
+
+#ifdef WNT
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_ODMA, fps_odma.uno )
 #endif
 
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno )
@@ -589,6 +593,21 @@ File gid_File_Lib_Cairo
   #endif
 End
 
+File gid_File_Lib_Pixman
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Program;
+  #ifdef UNX
+    #ifdef MACOSX
+       Name = "libpixman-1.a";
+    #else
+       Name = STRING(CONCAT3(libpixman-1,UNXSUFFIX,.0));
+    #endif
+  #elif defined(WNT)
+    Name = "libpixman-1-0.dll";
+  #endif
+End
+
 #endif
 
 STD_LIB_FILE( gid_File_Lib_Frm , frm)
@@ -772,17 +791,6 @@ End
 
 #ifdef WNT
 
-File gid_File_Lib_relnotes
-    BIN_FILE_BODY;
-    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "relnotes.dll";
-End
-
-#endif
-
-#ifdef WNT
-
 File gid_File_Lib_Patchmsi
     TXT_FILE_BODY;
     Name = "patchmsi.dll";
@@ -882,10 +890,20 @@ End
 
 STD_LIB_FILE(gid_File_Lib_Wpft,wpft)
 
+STD_LIB_FILE(gid_File_Lib_Msworks,msworks)
+
 STD_LIB_FILE(gid_File_Lib_T602Filter,t602filter)
 
+STD_LIB_FILE(gid_File_Lib_Wlwp,lwpft)
+
 STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
 
+STD_LIB_FILE(gid_File_Lib_Resource,resourcemodel)
+
+STD_LIB_FILE(gid_File_Lib_Doctok,doctok)
+
+STD_LIB_FILE(gid_File_Lib_ooxml,ooxml)
+
 #ifdef WNT
 #if defined(_gcc3)
 
@@ -899,57 +917,6 @@ End
 #endif
 #endif
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcr80
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "msvcr80.dll";
-#else
-    Name = "msvcr80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcp80
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "msvcp80.dll";
-#else
-    Name = "msvcp80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcm80
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "msvcm80.dll";
-#else
-    Name = "msvcm80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
 #if defined(WNT) && defined( _gcc3 )
 
 #if defined(MINGW_GCCDLL)
@@ -976,23 +943,6 @@ End
 
 #endif
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Msvcm80crt_Manifest
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "Microsoft.VC80.CRT.manifest";
-#else
-    Name = "Microsoft.VC80.DebugCRT.manifest";
-#endif
-End
-#endif
-#endif
-#endif
-
 STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
 STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
 
@@ -1090,6 +1040,14 @@ File gid_File_Lib_Vclplug_Gtk
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
+#ifdef ENABLE_GTK3
+File gid_File_Lib_Vclplug_Gtk3
+    Name = LIBNAME(vclplug_gtk3);
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+End
+#endif
 #ifdef ENABLE_KDE
 #ifndef MACOSX
 File gid_File_Lib_Vclplug_Kde
@@ -1311,6 +1269,10 @@ End
 
 STD_LIB_FILE( gid_File_Lib_Spl, spl)
 
+#if defined UNX && !defined MACOSX
+STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
+#endif
+
 SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
 
 STD_LIB_FILE( gid_File_Lib_Sts , sts)
@@ -1420,6 +1382,10 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno)
 
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
 
+#ifdef WNT
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1)
+#endif
+
 File gid_File_Lib_Lnth
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -1447,17 +1413,6 @@ File gid_File_Lib_Vcl
     Dir = SCP2_OOO_BIN_DIR;
 End
 
-File gid_File_Lib_Vos
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT3(libvos3,COMID,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT3(vos3,COMID,.dll));
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
 STD_LIB_FILE( gid_File_Lib_Xcr, xcr)
 STD_LIB_FILE( gid_File_Lib_Xmx , xmx)
 STD_LIB_FILE( gid_File_Lib_Xof , xof)
@@ -1508,10 +1463,10 @@ STD_LIB_FILE( gid_File_Lib_Unoxml, unoxml )
 // AVMedia
 STD_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
 
-#if defined UNX 
-#if defined ENABLE_GSTREAMER
-SPECIAL_LIB_FILE( gid_File_Lib_AVMediaGst, avmediagst )
-#endif
+#ifdef GSTREAMER
+SPECIAL_LIB_FILE_PATCH( gid_File_Lib_AVMediaGStreamer, avmediagst )
+#else
+#if defined UNX
 #ifdef SOLAR_JAVA
 STD_JAR_FILE( gid_File_Jar_AVmedia, avmedia )
 #endif
@@ -1520,6 +1475,7 @@ STD_JAR_FILE( gid_File_Jar_AVmedia, avmedia )
 SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
 #endif
 #endif
+#endif
 
 #ifndef WITHOUT_MOZILLA
 File gid_File_Lib_XSec_Framework
@@ -1593,6 +1549,17 @@ File gid_File_Lib_Migrationoo2
   #endif
 End
 
+File gid_File_Lib_Migrationoo3
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+  #ifdef UNX
+    Name = STRING(CONCAT2(migrationoo3.uno,UNXSUFFIX));
+  #else
+    Name = "migrationoo3.uno.dll";
+  #endif
+End
+
 #ifndef SYSTEM_LIBTEXTCAT
 File gid_File_Lib_Libtextcat
     TXT_FILE_BODY;
@@ -1660,8 +1627,7 @@ End
 
 STD_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
 
-#if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \
-    !(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG)
+#if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA
         // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
         // gid_Brand_File_Lib_Msvcr80
 File gid_File_Moz_Msvcp80
@@ -1676,6 +1642,12 @@ File gid_File_Moz_Msvcr80
     Name = SCP2_URE_DL_NORMAL("msvcr80");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
+File gid_File_Moz_Msvc80crt_Manifest
+    BIN_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Program;
+    Name = "Microsoft.VC80.CRT.manifest";
+End
 #endif
 
 #ifndef SYSTEM_REDLAND
@@ -1764,7 +1736,7 @@ File gid_File_Lib_Glib
     #ifdef MACOSX
     Name = "libglib-2.0.0.dylib";
     #elif defined WNT
-    Name = "libglib-2.0-0.dll";
+    Name = "gliblo.dll";
     #endif
 End
 File gid_File_Lib_Gthread
@@ -1774,7 +1746,7 @@ File gid_File_Lib_Gthread
     #ifdef MACOSX
     Name = "libgthread-2.0.0.dylib";
     #elif defined WNT
-    Name = "libgthread-2.0-0.dll";
+    Name = "gthreadlo.dll";
     #endif
 End
 File gid_File_Lib_Gobject
@@ -1784,7 +1756,7 @@ File gid_File_Lib_Gobject
     #ifdef MACOSX
     Name = "libgobject-2.0.0.dylib";
     #elif defined WNT
-    Name = "libgobject-2.0-0.dll";
+    Name = "gobjectlo.dll";
     #endif
 End
 File gid_File_Lib_Gio
@@ -1794,7 +1766,7 @@ File gid_File_Lib_Gio
     #ifdef MACOSX
     Name = "libgio-2.0.0.dylib";
     #elif defined WNT
-    Name = "libgio-2.0-0.dll";
+    Name = "giolo.dll";
     #endif
 End
 File gid_File_Lib_Gmodule
@@ -1804,11 +1776,13 @@ File gid_File_Lib_Gmodule
     #ifdef MACOSX
     Name = "libgmodule-2.0.0.dylib";
     #elif defined WNT
-    Name = "libgmodule-2.0-0.dll";
+    Name = "gmodulelo.dll";
     #endif
 End
 #endif
 
+#if ENABLE_LIBRSVG
+
 #if ! defined SYSTEM_GDKPIXBUF
 File gid_File_Lib_Gdkpixbuf
     TXT_FILE_BODY;
@@ -1843,7 +1817,7 @@ File gid_File_Lib_Libpango
     #ifdef MACOSX
     Name = "libpango-1.0.0.dylib";
     #elif defined WNT
-    Name = "libpango-1.0-0.dll";
+    Name = "pangolo.dll";
     #endif
 End
 File gid_File_Lib_Libpangocairo
@@ -1853,7 +1827,7 @@ File gid_File_Lib_Libpangocairo
     #ifdef MACOSX
     Name = "libpangocairo-1.0.0.dylib";
     #elif defined WNT
-    Name = "libpangocairo-1.0-0.dll";
+    Name = "pangocairolo.dll";
     #endif
 End
 #if defined WNT
@@ -1861,7 +1835,7 @@ File gid_File_Lib_Libpangowin32
     TXT_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-    Name = "libpangowin32-1.0-0.dll";
+    Name = "pangowin32lo.dll";
 End
 #endif
 #endif
@@ -1890,3 +1864,17 @@ File gid_File_Lib_Librsvg
 End
 #endif
 
+#endif
+
+#ifdef WNT
+File gid_File_Lib_sellangmsi
+    TXT_FILE_BODY;
+    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+    Dir = gid_Dir_Program;
+    Name = "sellangmsi.dll";
+End
+#endif
+
+#ifdef ENABLE_LOMENUBAR
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Lomenubar, lomenubar.uno )
+#endif
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 1cc97d8bef12..28891ed60f1d 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -108,17 +108,6 @@ File gid_File_Basic_Tutorials
     Name = "basicsrvtutorials.zip";
 End
 
-#ifdef UNX
-
-File gid_File_Bin_Pagein
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-    Name = "pagein";
-End
-
-#endif
-
 #ifndef WITHOUT_MOZILLA
 
 #if !defined(UNX) || defined(ENABLE_GTK)
@@ -314,10 +303,10 @@ File gid_File_Dtd_Toolbar
     Name = "toolbar.dtd";
 End
 
-STD_FILTER_FILE( gid_File_Filter_Eme, eme)
-
 STD_FILTER_FILE( gid_File_Filter_Sdfilt, sdfilt)
 
+STD_FILTER_FILE( gid_File_Filter_Eme, eme)
+
 STD_FILTER_FILE( gid_File_Filter_Icg, icg)
 
 STD_FILTER_FILE( gid_File_Filter_Egi, egi)
@@ -364,7 +353,7 @@ STD_RES_FILE( gid_File_Res_Eps, eps )
 
 File gid_File_Help_Common_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(shared);
     Patchfiles = ();
 End
@@ -377,14 +366,14 @@ End
 
 File gid_File_Help_Sbasic_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sbasic);
     Patchfiles = ();
 End
 
 File gid_File_Help_Schart_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(schart);
 End
 
@@ -417,10 +406,6 @@ STD_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper )
 #endif
 
 #ifdef SOLAR_JAVA
-STD_JAR_FILE( gid_File_Jar_Js, js )
-#endif
-
-#ifdef SOLAR_JAVA
 
 #ifndef MACOSX
 
@@ -465,9 +450,7 @@ End
 
 #ifdef SOLAR_JAVA
 STD_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
-STD_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
 STD_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
-STD_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript )
 #endif
 
 #ifdef SOLAR_JAVA
@@ -1010,7 +993,6 @@ File gid_File_Lm_Zulu
 End
 #endif
 
-
 // mod files
 
 File gid_File_Mod_Chart
@@ -1191,21 +1173,29 @@ File gid_File_Share_Registry_Ctl_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED,MAKE_LANG_SPECIFIC);
     Dir = gid_Dir_Share_Registry;
-    Name (th) = "ctl.xcd";
-    Name (hi-IN) = "ctl.xcd";
-    Name (pa-IN) = "ctl.xcd";
-    Name (ta-IN) = "ctl.xcd";
-    Name (gu-IN) = "ctl.xcd";
     Name (ar) = "ctl.xcd";
-    Name (he) = "ctl.xcd";
-    Name (lo) = "ctl.xcd";
     Name (dz) = "ctl.xcd";
-    Name (km) = "ctl.xcd";
-    Name (gu-IN) = "ctl.xcd";
-    Name (or) = "ctl.xcd";
-    Name (ne) = "ctl.xcd";
     Name (fa) = "ctl.xcd";
+    Name (gu) = "ctl.xcd";
+    Name (he) = "ctl.xcd";
+    Name (hi) = "ctl.xcd";
+    Name (km) = "ctl.xcd";
+    Name (lo) = "ctl.xcd";
     Name (my) = "ctl.xcd";
+    Name (ne) = "ctl.xcd";
+    Name (or) = "ctl.xcd";
+    Name (pa-IN) = "ctl.xcd";
+    Name (ta) = "ctl.xcd";
+    Name (th) = "ctl.xcd";
+End
+
+File gid_File_Share_Registry_Ctlseqcheck_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED,MAKE_LANG_SPECIFIC);
+    Dir = gid_Dir_Share_Registry;
+    Name (km) = "ctlseqcheck.xcd";
+    Name (lo) = "ctlseqcheck.xcd";
+    Name (th) = "ctlseqcheck.xcd";
 End
 
 File gid_File_Scripts_Beanshell
@@ -1241,27 +1231,59 @@ End
 
 STD_SHELLNEW_FILE(gid_File_Shellnew_Ods_Soffice, soffice.ods)
 
+File gid_File_Shellnew2_Ods_Soffice
+    TXT_FILE_BODY;
+    Styles = (PACKED,WORKSTATION, OVERWRITE);
+    Dir = PREDEFINED_OSWINSHELLNEWDIR;
+    NetDir = gid_Dir_ShellnewToo;
+    Name = "soffice.ods";
+End
+
 #endif
 
 #ifdef WNT
 
 STD_SHELLNEW_FILE(gid_File_Shellnew_Odg_Soffice, soffice.odg)
 
+File gid_File_Shellnew2_Odg_Soffice
+    TXT_FILE_BODY;
+    Styles = (PACKED,WORKSTATION, OVERWRITE);
+    Dir = PREDEFINED_OSWINSHELLNEWDIR;
+    NetDir = gid_Dir_ShellnewToo;
+    Name = "soffice.odg";
+End
+
 #endif
 
 #ifdef WNT
 
 STD_SHELLNEW_FILE(gid_File_Shellnew_Odp_Soffice, soffice.odp)
 
+File gid_File_Shellnew2_Odp_Soffice
+    TXT_FILE_BODY;
+    Styles = (PACKED,WORKSTATION, OVERWRITE);
+    Dir = PREDEFINED_OSWINSHELLNEWDIR;
+    NetDir = gid_Dir_ShellnewToo;
+    Name = "soffice.odp";
+End
+
 #endif
 
 #ifdef WNT
 
 STD_SHELLNEW_FILE(gid_File_Shellnew_Odt_Soffice, soffice.odt)
 
+File gid_File_Shellnew2_Odt_Soffice
+    TXT_FILE_BODY;
+    Styles = (PACKED,WORKSTATION, OVERWRITE);
+    Dir = PREDEFINED_OSWINSHELLNEWDIR;
+    NetDir = gid_Dir_ShellnewToo;
+    Name = "soffice.odt";
+End
+
 #endif
 
-#ifdef UNX
+#if defined UNX && ! defined MACOSX
 
 File gid_File_Txt_Pagein_Calc
     TXT_FILE_BODY;
@@ -1270,10 +1292,6 @@ File gid_File_Txt_Pagein_Calc
     Name = "pagein-calc";
 End
 
-#endif
-
-#ifdef UNX
-
 File gid_File_Txt_Pagein_Common
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
@@ -1281,10 +1299,6 @@ File gid_File_Txt_Pagein_Common
     Name = "pagein-common";
 End
 
-#endif
-
-#ifdef UNX
-
 File gid_File_Txt_Pagein_Draw
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
@@ -1292,10 +1306,6 @@ File gid_File_Txt_Pagein_Draw
     Name = "pagein-draw";
 End
 
-#endif
-
-#ifdef UNX
-
 File gid_File_Txt_Pagein_Impress
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
@@ -1303,10 +1313,6 @@ File gid_File_Txt_Pagein_Impress
     Name = "pagein-impress";
 End
 
-#endif
-
-#ifdef UNX
-
 File gid_File_Txt_Pagein_Writer
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
@@ -1740,21 +1746,6 @@ File gid_File_Config_Javasettingsunopkginstall
   #endif
 End
 
-#if defined( BUILD_SPECIAL )
-#if !defined( MACOSX )
-File gid_File_Stclient_Wrapper
-    Dir = gid_Dir_Program;
-    BIN_FILE_BODY;
-#if defined ( WNT )
-    Name = "stclient_wrapper.exe";
-#else
-    Name = "stclient_wrapper";
-#endif
-    Styles = ();
-End
-#endif
-#endif
-
 #ifdef ENABLE_SVCTAGS
 File gid_File_Jar_Productregistration
     TXT_FILE_BODY;
@@ -1764,54 +1755,50 @@ File gid_File_Jar_Productregistration
 End
 #endif
 
+#ifdef THEME_DEFAULT
 File gid_File_Images_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;
     Name = "images.zip";
     Styles = (PACKED);
 End
+#endif
 
+#ifdef THEME_CRYSTAL
 File gid_File_ImagesCrystal_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;
     Name = "images_crystal.zip";
     Styles = (PACKED);
 End
+#endif
 
+#ifdef THEME_OXYGEN
 File gid_File_ImagesOxygen_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;
     Name = "images_oxygen.zip";
     Styles = (PACKED);
 End
+#endif
 
+#ifdef THEME_HICONTRAST
 File gid_File_ImagesHicontrast_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;
     Name = "images_hicontrast.zip";
     Styles = (PACKED);
 End
+#endif
 
-File gid_File_ImagesIndustrial_Zip
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Config;
-    Name = "images_industrial.zip";
-    Styles = (PACKED);
-End
-
+#ifdef THEME_TANGO
 File gid_File_ImagesTango_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;
     Name = "images_tango.zip";
     Styles = (PACKED);
 End
-
-File gid_File_ImagesClassic8_Zip
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Config;
-    Name = "images_classic.zip";
-    Styles = (PACKED);
-End
+#endif
 
 File gid_File_Share_Registry_Lingucomponent_Xcd
     TXT_FILE_BODY;
@@ -1832,6 +1819,15 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Br
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Br;
+	Name = "dict-br.oxt";
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ca
     Dir = gid_Brand_Dir_Share_Extensions_Dict_Ca;
     Name = "dict-ca.oxt";
@@ -1949,6 +1945,15 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Hr
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Hr;
+	Name = "dict-hr.oxt";
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_It
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_It;
 	Name = "dict-it.oxt";
@@ -2003,6 +2008,15 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Oc
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Oc;
+	Name = "dict-oc.oxt";
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Pl
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Pl;
 	Name = "dict-pl.oxt";
@@ -2093,6 +2107,15 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Uk
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Uk;
+	Name = "dict-uk.oxt";
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Vi
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Vi;
 	Name = "dict-vi.oxt";
diff --git a/scp2/source/ooo/folderitem_ooo.ulf b/scp2/source/ooo/folderitem_ooo.ulf
index 93d938531abe..2c4696dacc43 100644
--- a/scp2/source/ooo/folderitem_ooo.ulf
+++ b/scp2/source/ooo/folderitem_ooo.ulf
@@ -32,4 +32,4 @@ en-US = "From Template"
 en-US = "Open Document"
 
 [STR_FI_TOOLTIP_SOFFICE]
-en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Oracle."
+en-US = "LibreOffice, the office productivity suite provided by The Document Foundation. See http://www.documentfoundation.org"
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 7a7507c9fcad..f27828489d64 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -49,6 +49,9 @@ SCPDEFS+=-DBUILD_SPECIAL
 SCPDEFS+=-DBUILD_X64
 .ENDIF
 
+.IF "$(ENABLE_OPENGL)"=="TRUE"
+SCPDEFS+=-DENABLE_OPENGL
+.ENDIF
 .IF "$(PROF_EDITION)"!=""
 SCPDEFS+=-DPROF_EDITION
 .ENDIF
@@ -63,15 +66,10 @@ GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES)
 SCPDEFS+=-DGTK_TWO_FOUR
 .ENDIF
 .ENDIF
-.ENDIF			# "$(GUI)"=="UNX"
-
-.IF "$(ENABLE_SYSTRAY_GTK)" != ""
-SCPDEFS+=-DENABLE_SYSTRAY_GTK
-.ENDIF
-
-.IF "$(ENABLE_GSTREAMER)" != ""
-SCPDEFS+=-DENABLE_GSTREAMER
+.IF "$(ENABLE_GTK3)" != ""
+SCPDEFS+=-DENABLE_GTK3
 .ENDIF
+.ENDIF			# "$(GUI)"=="UNX"
 
 .IF "$(ENABLE_KDE)" != ""
 SCPDEFS+=-DENABLE_KDE
@@ -120,10 +118,6 @@ SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR)
 SCPDEFS+=-DSYSTEM_DB
 .ENDIF
 
-.IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4"
-SCPDEFS+=-DUSE_SYSTEM_STL
-.ENDIF
-
 .IF "$(WITH_MOZILLA)" == "NO"
 SCPDEFS+=-DWITHOUT_MOZILLA
 .ENDIF
@@ -223,9 +217,13 @@ SCPDEFS+=-DOPENSSL
 SCPDEFS+=-DDISABLE_ATL
 .ENDIF
 
+.IF "$(DISABLE_PYTHON)" == "TRUE"
+SCPDEFS+=-DDISABLE_PYUNO
+.ELSE
 .IF "$(SYSTEM_PYTHON)" == "YES"
 SCPDEFS+=-DSYSTEM_PYTHON
 .ENDIF
+.ENDIF
 
 .IF "$(SYSTEM_LIBTEXTCAT)" == "YES"
 SCPDEFS+=-DSYSTEM_LIBTEXTCAT
@@ -271,6 +269,10 @@ SCPDEFS+=-DSYSTEM_LIBCROCO
 SCPDEFS+=-DSYSTEM_LIBJPEG
 .ENDIF
 
+.IF "$(ENABLE_LIBRSVG)" == "INTERNAL"
+SCPDEFS+=-DENABLE_LIBRSVG
+.ENDIF
+
 .IF "$(SYSTEM_LIBRSVG)" == "YES"
 SCPDEFS+=-DSYSTEM_LIBRSVG
 .ENDIF
@@ -283,6 +285,9 @@ SCPDEFS+=-DSYSTEM_PANGO
 SCPDEFS+=-DSYSTEM_LIBGSF
 .ENDIF
 
+.IF "$(ENABLE_LOMENUBAR)" == "TRUE"
+SCPDEFS+=-DENABLE_LOMENUBAR
+.ENDIF
 
 SCP_PRODUCT_TYPE=osl
 
@@ -298,7 +303,6 @@ PARFILES=                          \
         scpaction_ooo.par          \
         directory_ooo.par          \
         directory_ooo_macosx.par   \
-        datacarrier_ooo.par        \
         file_ooo.par               \
         file_extra_ooo.par         \
         file_font_ooo.par          \
@@ -310,6 +314,8 @@ PARFILES=                          \
         module_hidden_ooo.par      \
         module_langpack.par        \
         module_lang_template.par   \
+        module_helppack.par        \
+        module_help_template.par   \
         module_java.par            \
         module_systemint.par       \
         module_improvement.par     \
@@ -337,6 +343,7 @@ ULFFILES=                          \
         folderitem_ooo.ulf         \
         module_ooo.ulf             \
         module_langpack.ulf        \
+        module_helppack.ulf        \
         module_java.ulf            \
         registryitem_ooo.ulf       \
         module_systemint.ulf
diff --git a/stlport/systemstl/hash_set b/scp2/source/ooo/module_help_template.scp
index 11ac7edb5a55..4022d59231ac 100644
--- a/stlport/systemstl/hash_set
+++ b/scp2/source/ooo/module_help_template.scp
@@ -25,28 +25,22 @@
  *
  ************************************************************************/
 
-#ifndef SYSTEM_STL_HASHSET
-#define SYSTEM_STL_HASHSET
+Module gid_Module_Helppack_Help_Template
+    ParentID = gid_Module_Helppack_Helproot;
+    Name = "gid_Module_Helppack_Help_Template";
+    Description = "gid_Module_Helppack_Help_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (gid_File_Help_Common_Zip,
+             gid_File_Help_Sbasic_Zip,
+             gid_File_Help_Scalc_Zip,
+             gid_File_Help_Schart_Zip,
+             gid_File_Help_Sdatabase_Zip,
+             gid_File_Help_Sdraw_Zip,
+             gid_File_Help_Simpress_Zip,
+             gid_File_Help_Smath_Zip,
+             gid_File_Help_Swriter_Zip);
+    Dirs = (gid_Brand_Dir_Help,
+            gid_Brand_Dir_Help_Isolanguage);
+End
 
-#ifdef GCC
-
-# include <functional>
-
-# define _BACKWARD_BACKWARD_WARNING_H 1
-# include <ext/hash_set>
-# undef _BACKWARD_BACKWARD_WARNING_H 
-
-namespace std
-{
-# ifndef __GXX_EXPERIMENTAL_CXX0X__
-	using __gnu_cxx::hash;
-# endif
-	using __gnu_cxx::hash_set;
-	using __gnu_cxx::hash_multiset;
-}
-#else
-# error UNSUPPORTED COMPILER
-#endif
-
-#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+#include "allhelpmodules_root.inc"
diff --git a/scp2/source/ooo/datacarrier_ooo.scp b/scp2/source/ooo/module_helppack.scp
index 89bfef1e5626..3614cb987350 100644
--- a/scp2/source/ooo/datacarrier_ooo.scp
+++ b/scp2/source/ooo/module_helppack.scp
@@ -27,8 +27,16 @@
 
 #include "macros.inc"
 
-DataCarrier gid_Datacarrier
-    Name = "%PRODUCTNAME %PRODUCTVERSION";
-    DiskNo = 1;
+Module gid_Module_Helppack_Helproot
+    ParentID = gid_Module_Root;
+    XPDParentID = "root";
+    Sortkey = "300";
+    MOD_NAME_DESC(MODULE_ROOT_HELPPACK);
+#ifdef WITH_HELPPACK_INTEGRATION
+    Styles = (SHOW_MULTILINGUAL_ONLY);
+#else
+    Styles = (HIDDEN_ROOT);
+#endif
 End
 
+#include "allhelpmodules.inc"
diff --git a/scp2/source/ooo/module_helppack.ulf b/scp2/source/ooo/module_helppack.ulf
new file mode 100644
index 000000000000..b9bb3616fabd
--- /dev/null
+++ b/scp2/source/ooo/module_helppack.ulf
@@ -0,0 +1,848 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+ 
+[STR_NAME_MODULE_ROOT_HELPPACK]
+en-US = "Additional help packs"
+
+[STR_DESC_MODULE_ROOT_HELPPACK]
+en-US = "Additional help packs"
+
+[STR_NAME_MODULE_HELPPACK_EN_US]
+en-US = "English"
+
+[STR_DESC_MODULE_HELPPACK_EN_US]
+en-US = "Installs English help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_DE]
+en-US = "German"
+
+[STR_DESC_MODULE_HELPPACK_DE]
+en-US = "Installs German help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_FR]
+en-US = "French"
+
+[STR_DESC_MODULE_HELPPACK_FR]
+en-US = "Installs French help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_IT]
+en-US = "Italian"
+
+[STR_DESC_MODULE_HELPPACK_IT]
+en-US = "Installs Italian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ES]
+en-US = "Spanish"
+
+[STR_DESC_MODULE_HELPPACK_ES]
+en-US = "Installs Spanish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SV]
+en-US = "Swedish"
+
+[STR_DESC_MODULE_HELPPACK_SV]
+en-US = "Installs Swedish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PT]
+en-US = "Portuguese"
+
+[STR_DESC_MODULE_HELPPACK_PT]
+en-US = "Installs Portuguese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PT_BR]
+en-US = "Portuguese (Brazil)"
+
+[STR_DESC_MODULE_HELPPACK_PT_BR]
+en-US = "Installs Portuguese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_JA]
+en-US = "Japanese"
+
+[STR_DESC_MODULE_HELPPACK_JA]
+en-US = "Installs Japanese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KO]
+en-US = "Korean"
+
+[STR_DESC_MODULE_HELPPACK_KO]
+en-US = "Installs Korean help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ZH_CN]
+en-US = "Chinese (simplified)"
+
+[STR_DESC_MODULE_HELPPACK_ZH_CN]
+en-US = "Installs Chinese (simplified) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ZH_TW]
+en-US = "Chinese (traditional)"
+
+[STR_DESC_MODULE_HELPPACK_ZH_TW]
+en-US = "Installs Chinese (traditional) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_NL]
+en-US = "Dutch"
+
+[STR_DESC_MODULE_HELPPACK_NL]
+en-US = "Installs Dutch help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HU]
+en-US = "Hungarian"
+
+[STR_DESC_MODULE_HELPPACK_HU]
+en-US = "Installs Hungarian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PL]
+en-US = "Polish"
+
+[STR_DESC_MODULE_HELPPACK_PL]
+en-US = "Installs Polish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_RU]
+en-US = "Russian"
+
+[STR_DESC_MODULE_HELPPACK_RU]
+en-US = "Installs Russian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_HELPPACK_TR]
+en-US = "Installs Turkish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_EL]
+en-US = "Greek"
+
+[STR_DESC_MODULE_HELPPACK_EL]
+en-US = "Installs Greek help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TH]
+en-US = "Thai"
+
+[STR_DESC_MODULE_HELPPACK_TH]
+en-US = "Installs Thai help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_CS]
+en-US = "Czech"
+
+[STR_DESC_MODULE_HELPPACK_CS]
+en-US = "Installs Czech help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SK]
+en-US = "Slovak"
+
+[STR_DESC_MODULE_HELPPACK_SK]
+en-US = "Installs Slovak help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HR]
+en-US = "Croatian"
+
+[STR_DESC_MODULE_HELPPACK_HR]
+en-US = "Installs Croatian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ET]
+en-US = "Estonian"
+
+[STR_DESC_MODULE_HELPPACK_ET]
+en-US = "Installs Estonian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_VI]
+en-US = "Vietnamese"
+
+[STR_DESC_MODULE_HELPPACK_VI]
+en-US = "Installs Vietnamese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BG]
+en-US = "Bulgarian"
+
+[STR_DESC_MODULE_HELPPACK_BG]
+en-US = "Installs Bulgarian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KM]
+en-US = "Khmer"
+
+[STR_DESC_MODULE_HELPPACK_KM]
+en-US = "Installs Khmer help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PA_IN]
+en-US = "Punjabi"
+
+[STR_DESC_MODULE_HELPPACK_PA_IN]
+en-US = "Installs Punjabi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_GU_IN]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_HELPPACK_GU_IN]
+en-US = "Installs Gujarati help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TA]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_HELPPACK_TA]
+en-US = "Installs Tamil help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TA_IN]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_HELPPACK_TA_IN]
+en-US = "Installs Tamil help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HI]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_HELPPACK_HI]
+en-US = "Installs Hindi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HI_IN]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_HELPPACK_HI_IN]
+en-US = "Installs Hindi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ST]
+en-US = "Southern Sotho (Sutu)"
+
+[STR_DESC_MODULE_HELPPACK_ST]
+en-US = "Installs Southern Sotho (Sutu) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TN]
+en-US = "Tswana"
+
+[STR_DESC_MODULE_HELPPACK_TN]
+en-US = "Installs Tswana help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_XH]
+en-US = "Xhosa"
+
+[STR_DESC_MODULE_HELPPACK_XH]
+en-US = "Installs Xhosa help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ZU]
+en-US = "Zulu"
+
+[STR_DESC_MODULE_HELPPACK_ZU]
+en-US = "Installs Zulu help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_AF]
+en-US = "Afrikaans"
+
+[STR_DESC_MODULE_HELPPACK_AF]
+en-US = "Installs Afrikaans help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SW]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_HELPPACK_SW]
+en-US = "Installs Swahili help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SW_TZ]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_HELPPACK_SW_TZ]
+en-US = "Installs Swahili help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_LO]
+en-US = "Lao"
+
+[STR_DESC_MODULE_HELPPACK_LO]
+en-US = "Installs Lao help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_NSO]
+en-US = "Northern Sotho"
+
+[STR_DESC_MODULE_HELPPACK_NSO]
+en-US = "Installs Northern Sotho help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BN]
+en-US = "Bengali"
+
+[STR_DESC_MODULE_HELPPACK_BN]
+en-US = "Installs Bengali help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BN_BD]
+en-US = "Bengali (Bangladesh)"
+
+[STR_DESC_MODULE_HELPPACK_BN_BD]
+en-US = "Installs Bengali (Bangladesh) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BN_IN]
+en-US = "Bengali (India)"
+
+[STR_DESC_MODULE_HELPPACK_BN_IN]
+en-US = "Installs Bengali (India) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_OR]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_HELPPACK_OR]
+en-US = "Installs Oriya help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_OR_IN]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_HELPPACK_OR_IN]
+en-US = "Installs Oriya help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MR]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_HELPPACK_MR]
+en-US = "Installs Marathi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MR_IN]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_HELPPACK_MR_IN]
+en-US = "Installs Marathi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_NE]
+en-US = "Nepali"
+
+[STR_DESC_MODULE_HELPPACK_NE]
+en-US = "Installs Nepali help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_AR]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_HELPPACK_AR]
+en-US = "Installs Arabic help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_AR_SA]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_HELPPACK_AR_SA]
+en-US = "Installs Arabic help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_CA]
+en-US = "Catalan"
+
+[STR_DESC_MODULE_HELPPACK_CA]
+en-US = "Installs Catalan help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_CA_XV]
+en-US = "Catalan (Valencian)"
+
+[STR_DESC_MODULE_HELPPACK_CA_XV]
+en-US = "Installs Catalan (Valencian) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_DA]
+en-US = "Danish"
+
+[STR_DESC_MODULE_HELPPACK_DA]
+en-US = "Installs Danish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_FI]
+en-US = "Finnish"
+
+[STR_DESC_MODULE_HELPPACK_FI]
+en-US = "Installs Finnish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HE]
+en-US = "Hebrew"
+
+[STR_DESC_MODULE_HELPPACK_HE]
+en-US = "Installs Hebrew help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_IS]
+en-US = "Icelandic"
+
+[STR_DESC_MODULE_HELPPACK_IS]
+en-US = "Installs Icelandic help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_NB]
+en-US = "Norwegian (Bokmål)"
+
+[STR_DESC_MODULE_HELPPACK_NB]
+en-US = "Installs Norwegian (Bokmål) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_NN]
+en-US = "Norwegian (Nynorsk)"
+
+[STR_DESC_MODULE_HELPPACK_NN]
+en-US = "Installs Norwegian (Nynorsk) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_RM]
+en-US = "Rhaeto-Romance"
+
+[STR_DESC_MODULE_HELPPACK_RM]
+en-US = "Installs Rhaeto-Romance help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_RO]
+en-US = "Romanian"
+
+[STR_DESC_MODULE_HELPPACK_RO]
+en-US = "Installs Romanian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SQ]
+en-US = "Albanian"
+
+[STR_DESC_MODULE_HELPPACK_SQ]
+en-US = "Installs Albanian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_UR]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_HELPPACK_UR]
+en-US = "Installs Urdu help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ID]
+en-US = "Indonesian"
+
+[STR_DESC_MODULE_HELPPACK_ID]
+en-US = "Installs Indonesian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_UK]
+en-US = "Ukrainian"
+
+[STR_DESC_MODULE_HELPPACK_UK]
+en-US = "Installs Ukrainian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BE]
+en-US = "Belarusian"
+
+[STR_DESC_MODULE_HELPPACK_BE]
+en-US = "Installs Belarusian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SL]
+en-US = "Slovenian"
+
+[STR_DESC_MODULE_HELPPACK_SL]
+en-US = "Installs Slovenian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_LV]
+en-US = "Latvian"
+
+[STR_DESC_MODULE_HELPPACK_LV]
+en-US = "Installs Latvian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_LT]
+en-US = "Lithuanian"
+
+[STR_DESC_MODULE_HELPPACK_LT]
+en-US = "Installs Lithuanian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HY]
+en-US = "Armenian"
+
+[STR_DESC_MODULE_HELPPACK_HY]
+en-US = "Installs Armenian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_EU]
+en-US = "Basque"
+
+[STR_DESC_MODULE_HELPPACK_EU]
+en-US = "Installs Basque help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MK]
+en-US = "Macedonian"
+
+[STR_DESC_MODULE_HELPPACK_MK]
+en-US = "Installs Macedonian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MT]
+en-US = "Maltese"
+
+[STR_DESC_MODULE_HELPPACK_MT]
+en-US = "Installs Maltese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_CY]
+en-US = "Welsh"
+
+[STR_DESC_MODULE_HELPPACK_CY]
+en-US = "Installs Welsh help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_GL]
+en-US = "Galician"
+
+[STR_DESC_MODULE_HELPPACK_GL]
+en-US = "Installs Galician help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SH_YU]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_HELPPACK_SH_YU]
+en-US = "Installs Serbian (Latin) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SH]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_HELPPACK_SH]
+en-US = "Installs Serbian (Latin) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_GA]
+en-US = "Irish"
+
+[STR_DESC_MODULE_HELPPACK_GA]
+en-US = "Installs Irish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SR_CS]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_HELPPACK_SR_CS]
+en-US = "Installs Serbian (Cyrillic) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SR]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_HELPPACK_SR]
+en-US = "Installs Serbian (Cyrillic) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BS]
+en-US = "Bosnian"
+
+[STR_DESC_MODULE_HELPPACK_BS]
+en-US = "Installs Bosnian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_AS_IN]
+en-US = "Assamese"
+
+[STR_DESC_MODULE_HELPPACK_AS_IN]
+en-US = "Installs Assamese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_AST]
+en-US = "Asturian"
+
+[STR_DESC_MODULE_HELPPACK_AST]
+en-US = "Installs Asturian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_RW]
+en-US = "Kinyarwanda"
+
+[STR_DESC_MODULE_HELPPACK_RW]
+en-US = "Installs Kinyarwanda help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SA]
+en-US = "Sanskrit"
+
+[STR_DESC_MODULE_HELPPACK_SA]
+en-US = "Installs Sanskrit help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_FA]
+en-US = "Farsi"
+
+[STR_DESC_MODULE_HELPPACK_FA]
+en-US = "Installs Farsi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_FO]
+en-US = "Faroese"
+
+[STR_DESC_MODULE_HELPPACK_FO]
+en-US = "Installs Faroese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SB]
+en-US = "Sorbian"
+
+[STR_DESC_MODULE_HELPPACK_SB]
+en-US = "Installs Sorbian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TT]
+en-US = "Tatar"
+
+[STR_DESC_MODULE_HELPPACK_TT]
+en-US = "Installs Tatar help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TS]
+en-US = "Tsonga"
+
+[STR_DESC_MODULE_HELPPACK_TS]
+en-US = "Installs Tsonga help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_YI]
+en-US = "Yiddish"
+
+[STR_DESC_MODULE_HELPPACK_YI]
+en-US = "Installs Yiddish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BR]
+en-US = "Breton"
+
+[STR_DESC_MODULE_HELPPACK_BR]
+en-US = "Installs Breton help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_NR]
+en-US = "Ndebele South"
+
+[STR_DESC_MODULE_HELPPACK_NR]
+en-US = "Installs Ndebele South help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SS]
+en-US = "Swazi"
+
+[STR_DESC_MODULE_HELPPACK_SS]
+en-US = "Installs Swazi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_VE]
+en-US = "Venda"
+
+[STR_DESC_MODULE_HELPPACK_VE]
+en-US = "Installs Venda help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KN]
+en-US = "Kannada"
+
+[STR_DESC_MODULE_HELPPACK_KN]
+en-US = "Installs Kannada help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MS]
+en-US = "Malay (Malaysian)"
+
+[STR_DESC_MODULE_HELPPACK_MS]
+en-US = "Installs Malay (Malaysian) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TG]
+en-US = "Tajik"
+
+[STR_DESC_MODULE_HELPPACK_TG]
+en-US = "Installs Tajik help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KU]
+en-US = "Kurdish"
+
+[STR_DESC_MODULE_HELPPACK_KU]
+en-US = "Installs Kurdish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_DZ]
+en-US = "Dzongkha"
+
+[STR_DESC_MODULE_HELPPACK_DZ]
+en-US = "Installs Dzongkha help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KA]
+en-US = "Georgian"
+
+[STR_DESC_MODULE_HELPPACK_KA]
+en-US = "Installs Georgian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_EO]
+en-US = "Esperanto"
+
+[STR_DESC_MODULE_HELPPACK_EO]
+en-US = "Installs Esperanto help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_GU]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_HELPPACK_GU]
+en-US = "Installs Gujarati help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_EN_ZA]
+en-US = "English (South Africa)"
+
+[STR_DESC_MODULE_HELPPACK_EN_ZA]
+en-US = "Installs English (South Africa) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_EN_GB]
+en-US = "English (United Kingdom)"
+
+[STR_DESC_MODULE_HELPPACK_EN_GB]
+en-US = "Installs English (United Kingdom) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_UR_IN]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_HELPPACK_UR_IN]
+en-US = "Installs Urdu help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ML_IN]
+en-US = "Malayalam"
+
+[STR_DESC_MODULE_HELPPACK_ML_IN]
+en-US = "Installs Malayalam help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TE_IN]
+en-US = "Telugu"
+
+[STR_DESC_MODULE_HELPPACK_TE_IN]
+en-US = "Installs Telugu help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TI_ER]
+en-US = "Tigrinya"
+
+[STR_DESC_MODULE_HELPPACK_TI_ER]
+en-US = "Installs Tigrinya help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_UZ]
+en-US = "Uzbek"
+
+[STR_DESC_MODULE_HELPPACK_UZ]
+en-US = "Installs Uzbek help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MN]
+en-US = "Mongolian"
+
+[STR_DESC_MODULE_HELPPACK_MN]
+en-US = "Installs Mongolian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MY]
+en-US = "Burmese"
+
+[STR_DESC_MODULE_HELPPACK_MY]
+en-US = "Installs Burmese (Myanmar) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BO]
+en-US = "Tibetan"
+
+[STR_DESC_MODULE_HELPPACK_BO]
+en-US = "Installs Tibetan help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_OC]
+en-US = "Occitan"
+
+[STR_DESC_MODULE_HELPPACK_OC]
+en-US = "Installs Occitan help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_OM]
+en-US = "Oromo"
+
+[STR_DESC_MODULE_HELPPACK_OM]
+en-US = "Installs Oromo help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SI]
+en-US = "Sinhala"
+
+[STR_DESC_MODULE_HELPPACK_SI]
+en-US = "Installs Sinhala help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_UG]
+en-US = "Uyghur"
+
+[STR_DESC_MODULE_HELPPACK_UG]
+en-US = "Installs Uyghur help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_AS]
+en-US = "Assamese"
+
+[STR_DESC_MODULE_HELPPACK_AS]
+en-US = "Installs Assamese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BRX]
+en-US = "Bodo"
+
+[STR_DESC_MODULE_HELPPACK_BRX]
+en-US = "Installs Bodo help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_DGO]
+en-US = "Dogri"
+
+[STR_DESC_MODULE_HELPPACK_DGO]
+en-US = "Installs Dogri help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_GD]
+en-US = "Scottish Gaelic"
+
+[STR_DESC_MODULE_HELPPACK_GD]
+en-US = "Installs Scottish Gaelic help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KK]
+en-US = "Kazakh"
+
+[STR_DESC_MODULE_HELPPACK_KK]
+en-US = "Installs Kazakh help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KOK]
+en-US = "Konkani"
+
+[STR_DESC_MODULE_HELPPACK_KOK]
+en-US = "Installs Konkani help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KS]
+en-US = "Kashmiri"
+
+[STR_DESC_MODULE_HELPPACK_KS]
+en-US = "Installs Kashmiri help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KY]
+en-US = "Kyrgyz"
+
+[STR_DESC_MODULE_HELPPACK_KY]
+en-US = "Installs Kyrgyz help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MAI]
+en-US = "Maithili"
+
+[STR_DESC_MODULE_HELPPACK_MAI]
+en-US = "Installs Maithili help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ML]
+en-US = "Malayalam"
+
+[STR_DESC_MODULE_HELPPACK_ML]
+en-US = "Installs Malayalam help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MNI]
+en-US = "Manipuri"
+
+[STR_DESC_MODULE_HELPPACK_MNI]
+en-US = "Installs Manipuri help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PAP]
+en-US = "Papiamento"
+
+[STR_DESC_MODULE_HELPPACK_PAP]
+en-US = "Installs Papiamento help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PS]
+en-US = "Pashto"
+
+[STR_DESC_MODULE_HELPPACK_PS]
+en-US = "Installs Pashto help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SA_IN]
+en-US = "Sanskrit (India)"
+
+[STR_DESC_MODULE_HELPPACK_SA_IN]
+en-US = "Installs Sanskrit help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SAT]
+en-US = "Santali"
+
+[STR_DESC_MODULE_HELPPACK_SAT]
+en-US = "Installs Santali help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SC]
+en-US = "Sardinian"
+
+[STR_DESC_MODULE_HELPPACK_SC]
+en-US = "Installs Sardinian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SD]
+en-US = "Sindhi"
+
+[STR_DESC_MODULE_HELPPACK_SD]
+en-US = "Installs Sindhi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TE]
+en-US = "Telugu"
+
+[STR_DESC_MODULE_HELPPACK_TE]
+en-US = "Installs Telugu help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TI]
+en-US = "Tigrinya"
+
+[STR_DESC_MODULE_HELPPACK_TI]
+en-US = "Installs Tigrinya help in %PRODUCTNAME %PRODUCTVERSION"
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index bba74c8dd56f..4cf3c5825b59 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -27,6 +27,52 @@
 
 #include "macros.inc"
 
+#ifdef AIX
+#ifndef SYSTEM_CURL
+Unixlink gid_Unixlink_File_Lib_Curl
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(libcurl,UNXSUFFIX));
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = STRING(CONCAT3(libcurl,UNXSUFFIX,.3));
+End
+#endif
+#ifndef SYSTEM_REDLAND
+Unixlink gid_Unixlink_File_Lib_Raptor
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(libraptor,UNXSUFFIX));
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = STRING(CONCAT3(libraptor,UNXSUFFIX,.1));
+End
+
+Unixlink gid_Unixlink_File_Lib_Rasqal
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(librasqal,UNXSUFFIX));
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = STRING(CONCAT3(librasqal,UNXSUFFIX,.1));
+End
+
+Unixlink gid_Unixlink_File_Lib_Rdf
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(librdf,UNXSUFFIX));
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = STRING(CONCAT3(librdf,UNXSUFFIX,.0));
+End
+#endif
+#ifndef SYSTEM_LIBXSLT
+Unixlink gid_Unixlink_File_Lib_Xslt
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(libxslt,UNXSUFFIX));
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = STRING(CONCAT3(libxslt,UNXSUFFIX,.1));
+End
+#endif
+#endif
+
 Module gid_Module_Root_Files_2
     PackageInfo = "packinfo_office.txt";
 	ParentID = gid_Module_Root;
@@ -37,8 +83,6 @@ Module gid_Module_Root_Files_2
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Bin_Cde_Open_Url,
-	gid_File_Bin_Gnome_Open_Url,
-	gid_File_Bin_Gnome_Open_Url_Bin,
 	gid_File_Bin_Kde_Open_Url,
 	gid_File_Bin_Open_Url,
 	gid_File_Bin_Pagein,
@@ -91,7 +135,6 @@ Module gid_Module_Root_Files_3
 	gid_File_Jar_Hsqldb,
 	gid_File_Jar_Hsqldb_Sdbc,
 	gid_File_Jar_Accessbridge,
-	gid_File_Jar_Js,
 	gid_File_Jar_Officebean,
 	gid_File_Jar_Report,
 	gid_File_Jar_Table,
@@ -104,9 +147,7 @@ Module gid_Module_Root_Files_3
 	gid_File_Jar_Commonwizards,
 	gid_File_Jar_Sandbox,
 	gid_File_Jar_Scriptframework,
-	gid_File_Jar_Scriptproviderforbeanshell,
 	gid_File_Jar_Scriptproviderforjava,
-	gid_File_Jar_Scriptproviderforjavascript,
 	gid_File_Jar_Xml_Apis,
 	gid_File_Jar_Bsh,
 	gid_File_Jar_Classes,
@@ -213,7 +254,7 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Svx,
 	gid_File_Lib_AVMedia,
 	gid_File_Lib_AVMediaWin,
-	gid_File_Lib_AVMediaGst,
+    gid_File_Lib_AVMediaGStreamer,
 	gid_File_Lib_BaseGfx,
 	gid_File_Lib_Sysdtrans,
 	gid_File_Lib_Sw,
@@ -233,9 +274,9 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Xof,
 	gid_File_Lib_Xsltdlg,
 	gid_File_Lib_Xsltfilter,
+	gid_File_Lib_Odfflatxml,
 	gid_File_Lib_Zip,
 	gid_File_Lib_Vclplug_Gen,
-	gid_File_Lib_Vclplug_Gtk,
 	gid_File_Lib_Vclplug_Kde,
 	gid_File_Lib_Vclplug_Kde4,
 	gid_File_Lib_Vclplug_Svp,
@@ -303,11 +344,11 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Adabas,
 	gid_File_Lib_Cached1,
 	gid_File_Lib_Curl,
+	gid_Unixlink_File_Lib_Curl,
 	gid_File_Lib_Db,
 	gid_File_Lib_Dbpool,
 	gid_File_Lib_Embobj,
 	gid_File_Lib_Emboleobj,
-	gid_File_Lib_Evoab_2,
 	gid_File_Lib_Kab_1,
     gid_File_Lib_Kab_Drv_1,
 	gid_File_Lib_Macab_1,
@@ -315,7 +356,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Evtatt,
 	gid_File_Lib_Fileacc,
 	gid_File_Lib_Filterconfig1,
-	gid_File_Lib_Fps_Gnome,
 	gid_File_Lib_Dbodbcbase,
 	gid_File_Lib_I18npool,
 	gid_File_Lib_I18npaper,
@@ -355,15 +395,18 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Tab,
 	gid_File_Lib_Tab2,
 	gid_File_Lib_Unoxml,
-	gid_File_Lib_Vos,
 	gid_File_Lib_Localebe,
 	gid_File_Lib_Migrationoo2,
+	gid_File_Lib_Migrationoo3,
 	gid_File_Lib_Syssh,
 	gid_File_Ucptdoc1,
 	gid_File_Ucpexpand1,
 	gid_File_Lib_Raptor,
+	gid_Unixlink_File_Lib_Raptor,
 	gid_File_Lib_Rasqal,
+	gid_Unixlink_File_Lib_Rasqal,
 	gid_File_Lib_Rdf,
+	gid_Unixlink_File_Lib_Rdf,
 	gid_File_Lib_Unordf,
 	gid_File_Lib_Sndfile,
 	gid_File_Lib_Tvhlp1,
@@ -377,6 +420,7 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Ucphier1,
 	gid_File_Lib_Ucppkg1,
 	gid_File_Lib_Xslt,
+	gid_Unixlink_File_Lib_Xslt,
 	gid_File_Lib_LibXMLSec_xmlsecnss,
 	gid_File_Lib_LibXMLSec_xmlseccore,
 	gid_File_Lib_LibXMLSec_xmlsecmscrypto,
@@ -408,8 +452,10 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Fps,
 	gid_File_Lib_Ftransl,
 	gid_File_Lib_Lngpckinsthlp,
+#ifdef ENABLE_LOMENUBAR
+	gid_File_Lib_Lomenubar,
+#endif
     gid_File_Lib_sn_tools,
-    gid_File_Lib_relnotes,
     GID_FILE_LIB_WPD,
     gid_File_Lib_Mingw_GccS,
     gid_File_Lib_Mingw_Stdcpp,
@@ -445,6 +491,11 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Cli_Oootypes_Assembly,
 	gid_File_Lib_Policy_Cli_Oootypes_Assembly,
 	gid_File_Lib_Policy_Cli_Oootypes_Config);
+    Unixlinks = (gid_Unixlink_File_Lib_Curl,
+	gid_Unixlink_File_Lib_Raptor,
+	gid_Unixlink_File_Lib_Rasqal,
+	gid_Unixlink_File_Lib_Rdf,
+	gid_Unixlink_File_Lib_Xslt);
 End
 
 Module gid_Module_Root_Files_6
@@ -479,19 +530,9 @@ Module gid_Module_Root_Files_6
 	gid_File_Extra_Gallwwwgraf,
 	gid_File_Extra_Migration,
 	gid_File_Extra_Migration_Lang_Multi,
+	gid_File_Extra_Tpllayoutimpr,
 	gid_File_Extra_Tplwizbitmap,
 	gid_File_Extra_Tplwizletter,
-	gid_File_Extra_Tplwizletter_en_US,
-	gid_File_Extra_Tplwizletter_de,
-	gid_File_Extra_Tplwizletter_fr,
-	gid_File_Extra_Tplwizletter_es,
-	gid_File_Extra_Tplwizletter_it,
-	gid_File_Extra_Tplwizletter_pt_BR,
-	gid_File_Extra_Tplwizletter_sv,
-	gid_File_Extra_Tplwizletter_ja,
-	gid_File_Extra_Tplwizletter_ko,
-	gid_File_Extra_Tplwizletter_zh_CN,
-	gid_File_Extra_Tplwizletter_zh_TW,
 	gid_File_Extra_Tplwizmemo_Lang,
 	gid_File_Extra_Autotextuser_Lang,
 	gid_File_Extra_Dir_Fonts,
@@ -654,6 +695,7 @@ Module gid_Module_Root_Files_6
     gid_File_Share_Registry_Main_Xcd,
     gid_File_Share_Registry_Forcedefault_Xcd,
 	gid_File_Pymailmerge,
+	gid_File_Pymailmerge_msgbox,
     gid_File_Xsl_Common_Measure_Conversion,
 	gid_File_Xsl_Common_Math_Functions,
 	gid_File_Xsl_Export_Common_Body,
@@ -738,13 +780,23 @@ Module gid_Module_Root_Files_Images
 	Sortkey = "2050";
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
-	Files = (gid_File_Images_Zip,
+	Files = (
+#ifdef THEME_DEFAULT
+	     gid_File_Images_Zip,
+#endif
+#ifdef THEME_CRYSTAL
              gid_File_ImagesCrystal_Zip,
+#endif
+#ifdef THEME_OXYGEN
              gid_File_ImagesOxygen_Zip,
+#endif
+#ifdef THEME_HICONTRAST
              gid_File_ImagesHicontrast_Zip,
-             gid_File_ImagesIndustrial_Zip,
-             gid_File_ImagesTango_Zip,
-             gid_File_ImagesClassic8_Zip);
+#endif
+#ifdef THEME_TANGO
+             gid_File_ImagesTango_Zip
+#endif
+	);
 End
 
 #ifndef WITHOUT_FONTS
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 0769df7ed214..60ee02b8b760 100755..100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -31,21 +31,17 @@ Module gid_Module_Langpack_Basis_Template
     Description = "gid_Module_Langpack_Root_Template";
     Styles = (TEMPLATEMODULE);
     Files = (gid_File_Extra_Autotextshare_Lang,
-             gid_File_Extra_Palettes_Lang,
-             gid_File_Extra_Tpllayoutimpr_Lang,
              gid_File_Extra_Tplpresntimpr_Lang,
              gid_File_Extra_Tplwizagenda_Lang,
              gid_File_Extra_Tplwizdesktop_Lang,
              gid_File_Extra_Tplwizfax_Lang,
-             gid_File_Extra_Tplwizletter_Lang,
              gid_File_Extra_Tplwizreport_Lang,
              gid_File_Extra_Tplwizstyles_Lang,
-             gid_File_Extra_Wordbook,
-             gid_File_Extra_Wordbook_Lang,
              gid_File_Registry_Filter_Zip,
              gid_File_Registry_Lang,
              gid_File_Registry_Spool_Langpack_Lang,
              gid_File_Share_Registry_Ctl_Xcd,
+             gid_File_Share_Registry_Ctlseqcheck_Xcd,
              gid_File_InfoPlist_Lang);
     Dirs = (gid_Dir_Samples_Language);
 End
@@ -108,17 +104,6 @@ Module gid_Module_Langpack_Resource_Template
              gid_File_Res_UpdChk,
              gid_File_Res_Upd);
 End
-
-Module gid_Module_Langpack_Help_Template
-    ParentID = gid_Module_Langpack_Languageroot;
-    Name = "gid_Module_Langpack_Help_Template";
-    Description = "gid_Module_Langpack_Help_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Common_Zip,
-             gid_File_Help_Sbasic_Zip,
-             gid_File_Help_Schart_Zip);
-End
-
 Module gid_Module_Langpack_Fonts_Template
     ParentID = gid_Module_Langpack_Languageroot;
     Name = "gid_Module_Langpack_Fonts_Template";
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index 591c84a6a939..7e1f9e6e8d3e 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -26,691 +26,823 @@
  ************************************************************************/
  
 [STR_NAME_MODULE_ROOT_LANGPACK]
-en-US = "Additional language packs"
+en-US = "Additional user interface languages"
 
 [STR_DESC_MODULE_ROOT_LANGPACK]
-en-US = "Additional language packs"
+en-US = "Additional user interface languages"
 
 [STR_NAME_MODULE_LANGPACK_EN_US]
 en-US = "English"
 
 [STR_DESC_MODULE_LANGPACK_EN_US]
-en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the English user interface"
 
 [STR_NAME_MODULE_LANGPACK_DE]
 en-US = "German"
 
 [STR_DESC_MODULE_LANGPACK_DE]
-en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the German user interface"
 
 [STR_NAME_MODULE_LANGPACK_FR]
 en-US = "French"
 
 [STR_DESC_MODULE_LANGPACK_FR]
-en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the French user interface"
 
 [STR_NAME_MODULE_LANGPACK_IT]
 en-US = "Italian"
 
 [STR_DESC_MODULE_LANGPACK_IT]
-en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Italian user interface"
 
 [STR_NAME_MODULE_LANGPACK_ES]
 en-US = "Spanish"
 
 [STR_DESC_MODULE_LANGPACK_ES]
-en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Spanish user interface"
 
 [STR_NAME_MODULE_LANGPACK_SV]
 en-US = "Swedish"
 
 [STR_DESC_MODULE_LANGPACK_SV]
-en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Swedish user interface"
 
 [STR_NAME_MODULE_LANGPACK_PT]
 en-US = "Portuguese"
 
 [STR_DESC_MODULE_LANGPACK_PT]
-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Portuguese user interface"
 
 [STR_NAME_MODULE_LANGPACK_PT_BR]
 en-US = "Portuguese (Brazil)"
 
 [STR_DESC_MODULE_LANGPACK_PT_BR]
-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Portuguese user interface"
 
 [STR_NAME_MODULE_LANGPACK_JA]
 en-US = "Japanese"
 
 [STR_DESC_MODULE_LANGPACK_JA]
-en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Japanese user interface"
 
 [STR_NAME_MODULE_LANGPACK_KO]
 en-US = "Korean"
 
 [STR_DESC_MODULE_LANGPACK_KO]
-en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Korean user interface"
 
 [STR_NAME_MODULE_LANGPACK_ZH_CN]
 en-US = "Chinese (simplified)"
 
 [STR_DESC_MODULE_LANGPACK_ZH_CN]
-en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Chinese (simplified) user interface"
 
 [STR_NAME_MODULE_LANGPACK_ZH_TW]
 en-US = "Chinese (traditional)"
 
 [STR_DESC_MODULE_LANGPACK_ZH_TW]
-en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Chinese (traditional) user interface"
 
 [STR_NAME_MODULE_LANGPACK_NL]
 en-US = "Dutch"
 
 [STR_DESC_MODULE_LANGPACK_NL]
-en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Dutch user interface"
 
 [STR_NAME_MODULE_LANGPACK_HU]
 en-US = "Hungarian"
 
 [STR_DESC_MODULE_LANGPACK_HU]
-en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Hungarian user interface"
 
 [STR_NAME_MODULE_LANGPACK_PL]
 en-US = "Polish"
 
 [STR_DESC_MODULE_LANGPACK_PL]
-en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Polish user interface"
 
 [STR_NAME_MODULE_LANGPACK_RU]
 en-US = "Russian"
 
 [STR_DESC_MODULE_LANGPACK_RU]
-en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Russian user interface"
 
 [STR_NAME_MODULE_LANGPACK_TR]
 en-US = "Turkish"
 
 [STR_DESC_MODULE_LANGPACK_TR]
-en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Turkish user interface"
 
 [STR_NAME_MODULE_LANGPACK_EL]
 en-US = "Greek"
 
 [STR_DESC_MODULE_LANGPACK_EL]
-en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Greek user interface"
 
 [STR_NAME_MODULE_LANGPACK_TH]
 en-US = "Thai"
 
 [STR_DESC_MODULE_LANGPACK_TH]
-en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Thai user interface"
 
 [STR_NAME_MODULE_LANGPACK_CS]
 en-US = "Czech"
 
 [STR_DESC_MODULE_LANGPACK_CS]
-en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Czech user interface"
 
 [STR_NAME_MODULE_LANGPACK_SK]
 en-US = "Slovak"
 
 [STR_DESC_MODULE_LANGPACK_SK]
-en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Slovak user interface"
 
 [STR_NAME_MODULE_LANGPACK_HR]
 en-US = "Croatian"
 
 [STR_DESC_MODULE_LANGPACK_HR]
-en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Croatian user interface"
 
 [STR_NAME_MODULE_LANGPACK_ET]
 en-US = "Estonian"
 
 [STR_DESC_MODULE_LANGPACK_ET]
-en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Estonian user interface"
 
 [STR_NAME_MODULE_LANGPACK_VI]
 en-US = "Vietnamese"
 
 [STR_DESC_MODULE_LANGPACK_VI]
-en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Vietnamese user interface"
 
 [STR_NAME_MODULE_LANGPACK_BG]
 en-US = "Bulgarian"
 
 [STR_DESC_MODULE_LANGPACK_BG]
-en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Bulgarian user interface"
 
 [STR_NAME_MODULE_LANGPACK_KM]
 en-US = "Khmer"
 
 [STR_DESC_MODULE_LANGPACK_KM]
-en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Khmer user interface"
 
 [STR_NAME_MODULE_LANGPACK_PA_IN]
 en-US = "Punjabi"
 
 [STR_DESC_MODULE_LANGPACK_PA_IN]
-en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Punjabi user interface"
 
 [STR_NAME_MODULE_LANGPACK_GU_IN]
 en-US = "Gujarati"
 
 [STR_DESC_MODULE_LANGPACK_GU_IN]
-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Gujarati user interface"
 
 [STR_NAME_MODULE_LANGPACK_TA]
 en-US = "Tamil"
 
 [STR_DESC_MODULE_LANGPACK_TA]
-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Tamil user interface"
 
 [STR_NAME_MODULE_LANGPACK_TA_IN]
 en-US = "Tamil"
 
 [STR_DESC_MODULE_LANGPACK_TA_IN]
-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Tamil user interface"
 
 [STR_NAME_MODULE_LANGPACK_HI]
 en-US = "Hindi"
 
 [STR_DESC_MODULE_LANGPACK_HI]
-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Hindi user interface"
 
 [STR_NAME_MODULE_LANGPACK_HI_IN]
 en-US = "Hindi"
 
 [STR_DESC_MODULE_LANGPACK_HI_IN]
-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Hindi user interface"
 
 [STR_NAME_MODULE_LANGPACK_ST]
 en-US = "Southern Sotho (Sutu)"
 
 [STR_DESC_MODULE_LANGPACK_ST]
-en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Southern Sotho (Sutu) user interface"
 
 [STR_NAME_MODULE_LANGPACK_TN]
 en-US = "Tswana"
 
 [STR_DESC_MODULE_LANGPACK_TN]
-en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Tswana user interface"
 
 [STR_NAME_MODULE_LANGPACK_XH]
 en-US = "Xhosa"
 
 [STR_DESC_MODULE_LANGPACK_XH]
-en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Xhosa user interface"
 
 [STR_NAME_MODULE_LANGPACK_ZU]
 en-US = "Zulu"
 
 [STR_DESC_MODULE_LANGPACK_ZU]
-en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Zulu user interface"
 
 [STR_NAME_MODULE_LANGPACK_AF]
 en-US = "Afrikaans"
 
 [STR_DESC_MODULE_LANGPACK_AF]
-en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Afrikaans user interface"
 
 [STR_NAME_MODULE_LANGPACK_SW]
 en-US = "Swahili"
 
 [STR_DESC_MODULE_LANGPACK_SW]
-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Swahili user interface"
 
 [STR_NAME_MODULE_LANGPACK_SW_TZ]
 en-US = "Swahili"
 
 [STR_DESC_MODULE_LANGPACK_SW_TZ]
-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Swahili user interface"
 
 [STR_NAME_MODULE_LANGPACK_LO]
 en-US = "Lao"
 
 [STR_DESC_MODULE_LANGPACK_LO]
-en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Lao user interface"
 
-[STR_NAME_MODULE_LANGPACK_NS]
+[STR_NAME_MODULE_LANGPACK_MY]
+en-US = "Burmese"
+
+[STR_DESC_MODULE_LANGPACK_MY]
+en-US = "Installs the Burmese (Myanmar) user interface"
+
+[STR_NAME_MODULE_LANGPACK_NSO]
 en-US = "Northern Sotho"
 
-[STR_DESC_MODULE_LANGPACK_NS]
-en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
+[STR_DESC_MODULE_LANGPACK_NSO]
+en-US = "Installs the Northern Sotho user interface"
 
 [STR_NAME_MODULE_LANGPACK_BN]
 en-US = "Bengali"
 
 [STR_DESC_MODULE_LANGPACK_BN]
-en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Bengali user interface"
 
 [STR_NAME_MODULE_LANGPACK_BN_BD]
 en-US = "Bengali (Bangladesh)"
 
 [STR_DESC_MODULE_LANGPACK_BN_BD]
-en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Bengali (Bangladesh) user interface"
 
 [STR_NAME_MODULE_LANGPACK_BN_IN]
 en-US = "Bengali (India)"
 
 [STR_DESC_MODULE_LANGPACK_BN_IN]
-en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Bengali (India) user interface"
 
 [STR_NAME_MODULE_LANGPACK_OR]
 en-US = "Oriya"
 
 [STR_DESC_MODULE_LANGPACK_OR]
-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Oriya user interface"
 
 [STR_NAME_MODULE_LANGPACK_OR_IN]
 en-US = "Oriya"
 
 [STR_DESC_MODULE_LANGPACK_OR_IN]
-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Oriya user interface"
 
 [STR_NAME_MODULE_LANGPACK_MR]
 en-US = "Marathi"
 
 [STR_DESC_MODULE_LANGPACK_MR]
-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Marathi user interface"
 
 [STR_NAME_MODULE_LANGPACK_MR_IN]
 en-US = "Marathi"
 
 [STR_DESC_MODULE_LANGPACK_MR_IN]
-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Marathi user interface"
 
 [STR_NAME_MODULE_LANGPACK_NE]
 en-US = "Nepali"
 
 [STR_DESC_MODULE_LANGPACK_NE]
-en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Nepali user interface"
 
 [STR_NAME_MODULE_LANGPACK_AR]
 en-US = "Arabic"
 
 [STR_DESC_MODULE_LANGPACK_AR]
-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Arabic user interface"
 
 [STR_NAME_MODULE_LANGPACK_AR_SA]
 en-US = "Arabic"
 
 [STR_DESC_MODULE_LANGPACK_AR_SA]
-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Arabic user interface"
 
 [STR_NAME_MODULE_LANGPACK_CA]
 en-US = "Catalan"
 
 [STR_DESC_MODULE_LANGPACK_CA]
-en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Catalan user interface"
+
+[STR_NAME_MODULE_LANGPACK_CA_XV]
+en-US = "Catalan (Valencian)"
+
+[STR_DESC_MODULE_LANGPACK_CA_XV]
+en-US = "Installs the Catalan (Valencian) user interface"
 
 [STR_NAME_MODULE_LANGPACK_DA]
 en-US = "Danish"
 
 [STR_DESC_MODULE_LANGPACK_DA]
-en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Danish user interface"
 
 [STR_NAME_MODULE_LANGPACK_FI]
 en-US = "Finnish"
 
 [STR_DESC_MODULE_LANGPACK_FI]
-en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Finnish user interface"
 
 [STR_NAME_MODULE_LANGPACK_HE]
 en-US = "Hebrew"
 
 [STR_DESC_MODULE_LANGPACK_HE]
-en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Hebrew user interface"
 
 [STR_NAME_MODULE_LANGPACK_IS]
 en-US = "Icelandic"
 
 [STR_DESC_MODULE_LANGPACK_IS]
-en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Icelandic user interface"
 
 [STR_NAME_MODULE_LANGPACK_NB]
 en-US = "Norwegian (Bokmål)"
 
 [STR_DESC_MODULE_LANGPACK_NB]
-en-US = "Installs Norwegian (Bokmål) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Norwegian (Bokmål) user interface"
 
 [STR_NAME_MODULE_LANGPACK_NN]
 en-US = "Norwegian (Nynorsk)"
 
 [STR_DESC_MODULE_LANGPACK_NN]
-en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Norwegian (Nynorsk) user interface"
 
 [STR_NAME_MODULE_LANGPACK_RM]
 en-US = "Rhaeto-Romance"
 
 [STR_DESC_MODULE_LANGPACK_RM]
-en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Rhaeto-Romance user interface"
 
 [STR_NAME_MODULE_LANGPACK_RO]
 en-US = "Romanian"
 
 [STR_DESC_MODULE_LANGPACK_RO]
-en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Romanian user interface"
 
 [STR_NAME_MODULE_LANGPACK_SQ]
 en-US = "Albanian"
 
 [STR_DESC_MODULE_LANGPACK_SQ]
-en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Albanian user interface"
 
 [STR_NAME_MODULE_LANGPACK_UR]
 en-US = "Urdu"
 
 [STR_DESC_MODULE_LANGPACK_UR]
-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Urdu user interface"
 
 [STR_NAME_MODULE_LANGPACK_ID]
 en-US = "Indonesian"
 
 [STR_DESC_MODULE_LANGPACK_ID]
-en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Indonesian user interface"
 
 [STR_NAME_MODULE_LANGPACK_UK]
 en-US = "Ukrainian"
 
 [STR_DESC_MODULE_LANGPACK_UK]
-en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Ukrainian user interface"
 
-[STR_NAME_MODULE_LANGPACK_BE_BY]
+[STR_NAME_MODULE_LANGPACK_BE]
 en-US = "Belarusian"
 
-[STR_DESC_MODULE_LANGPACK_BE_BY]
-en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
+[STR_DESC_MODULE_LANGPACK_BE]
+en-US = "Installs the Belarusian user interface"
 
 [STR_NAME_MODULE_LANGPACK_SL]
 en-US = "Slovenian"
 
 [STR_DESC_MODULE_LANGPACK_SL]
-en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Slovenian user interface"
 
 [STR_NAME_MODULE_LANGPACK_LV]
 en-US = "Latvian"
 
 [STR_DESC_MODULE_LANGPACK_LV]
-en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Latvian user interface"
 
 [STR_NAME_MODULE_LANGPACK_LT]
 en-US = "Lithuanian"
 
 [STR_DESC_MODULE_LANGPACK_LT]
-en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Lithuanian user interface"
 
 [STR_NAME_MODULE_LANGPACK_HY]
 en-US = "Armenian"
 
 [STR_DESC_MODULE_LANGPACK_HY]
-en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Armenian user interface"
 
 [STR_NAME_MODULE_LANGPACK_EU]
 en-US = "Basque"
 
 [STR_DESC_MODULE_LANGPACK_EU]
-en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Basque user interface"
 
 [STR_NAME_MODULE_LANGPACK_MK]
 en-US = "Macedonian"
 
 [STR_DESC_MODULE_LANGPACK_MK]
-en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Macedonian user interface"
 
 [STR_NAME_MODULE_LANGPACK_MT]
 en-US = "Maltese"
 
 [STR_DESC_MODULE_LANGPACK_MT]
-en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Maltese user interface"
 
 [STR_NAME_MODULE_LANGPACK_CY]
 en-US = "Welsh"
 
 [STR_DESC_MODULE_LANGPACK_CY]
-en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Welsh user interface"
 
 [STR_NAME_MODULE_LANGPACK_GL]
 en-US = "Galician"
 
 [STR_DESC_MODULE_LANGPACK_GL]
-en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Galician user interface"
 
 [STR_NAME_MODULE_LANGPACK_SH_YU]
 en-US = "Serbian (Latin)"
 
 [STR_DESC_MODULE_LANGPACK_SH_YU]
-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Serbian (Latin) user interface"
 
 [STR_NAME_MODULE_LANGPACK_SH]
 en-US = "Serbian (Latin)"
 
 [STR_DESC_MODULE_LANGPACK_SH]
-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Serbian (Latin) user interface"
 
 [STR_NAME_MODULE_LANGPACK_GA]
 en-US = "Irish"
 
 [STR_DESC_MODULE_LANGPACK_GA]
-en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Irish user interface"
 
 [STR_NAME_MODULE_LANGPACK_SR_CS]
 en-US = "Serbian (Cyrillic)"
 
 [STR_DESC_MODULE_LANGPACK_SR_CS]
-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Serbian (Cyrillic) user interface"
 
 [STR_NAME_MODULE_LANGPACK_SR]
 en-US = "Serbian (Cyrillic)"
 
 [STR_DESC_MODULE_LANGPACK_SR]
-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Serbian (Cyrillic) user interface"
 
 [STR_NAME_MODULE_LANGPACK_BS]
 en-US = "Bosnian"
 
 [STR_DESC_MODULE_LANGPACK_BS]
-en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Bosnian user interface"
 
 [STR_NAME_MODULE_LANGPACK_AS_IN]
 en-US = "Assamese"
 
 [STR_DESC_MODULE_LANGPACK_AS_IN]
-en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Assamese user interface"
+
+[STR_NAME_MODULE_LANGPACK_AST]
+en-US = "Asturian"
+
+[STR_DESC_MODULE_LANGPACK_AST]
+en-US = "Installs the Asturian user interface"
 
 [STR_NAME_MODULE_LANGPACK_RW]
 en-US = "Kinyarwanda"
 
 [STR_DESC_MODULE_LANGPACK_RW]
-en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Kinyarwanda user interface"
 
 [STR_NAME_MODULE_LANGPACK_SA]
 en-US = "Sanskrit"
 
 [STR_DESC_MODULE_LANGPACK_SA]
-en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Sanskrit user interface"
 
 [STR_NAME_MODULE_LANGPACK_FA]
 en-US = "Farsi"
 
 [STR_DESC_MODULE_LANGPACK_FA]
-en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Farsi user interface"
 
 [STR_NAME_MODULE_LANGPACK_FO]
 en-US = "Faroese"
 
 [STR_DESC_MODULE_LANGPACK_FO]
-en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Faroese user interface"
 
 [STR_NAME_MODULE_LANGPACK_SB]
 en-US = "Sorbian"
 
 [STR_DESC_MODULE_LANGPACK_SB]
-en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Sorbian user interface"
 
 [STR_NAME_MODULE_LANGPACK_TT]
 en-US = "Tatar"
 
 [STR_DESC_MODULE_LANGPACK_TT]
-en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Tatar user interface"
 
 [STR_NAME_MODULE_LANGPACK_TS]
 en-US = "Tsonga"
 
 [STR_DESC_MODULE_LANGPACK_TS]
-en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Tsonga user interface"
 
 [STR_NAME_MODULE_LANGPACK_YI]
 en-US = "Yiddish"
 
 [STR_DESC_MODULE_LANGPACK_YI]
-en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Yiddish user interface"
 
 [STR_NAME_MODULE_LANGPACK_BR]
 en-US = "Breton"
 
 [STR_DESC_MODULE_LANGPACK_BR]
-en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Breton user interface"
 
 [STR_NAME_MODULE_LANGPACK_NR]
 en-US = "Ndebele South"
 
 [STR_DESC_MODULE_LANGPACK_NR]
-en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Ndebele South user interface"
 
 [STR_NAME_MODULE_LANGPACK_SS]
 en-US = "Swazi"
 
 [STR_DESC_MODULE_LANGPACK_SS]
-en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Swazi user interface"
 
 [STR_NAME_MODULE_LANGPACK_VE]
 en-US = "Venda"
 
 [STR_DESC_MODULE_LANGPACK_VE]
-en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Venda user interface"
 
 [STR_NAME_MODULE_LANGPACK_KN]
 en-US = "Kannada"
 
 [STR_DESC_MODULE_LANGPACK_KN]
-en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Kannada user interface"
 
 [STR_NAME_MODULE_LANGPACK_MS]
 en-US = "Malay (Malaysian)"
 
 [STR_DESC_MODULE_LANGPACK_MS]
-en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Malay (Malaysian) user interface"
 
 [STR_NAME_MODULE_LANGPACK_TG]
 en-US = "Tajik"
 
 [STR_DESC_MODULE_LANGPACK_TG]
-en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Tajik user interface"
 
 [STR_NAME_MODULE_LANGPACK_KU]
 en-US = "Kurdish"
 
 [STR_DESC_MODULE_LANGPACK_KU]
-en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Kurdish user interface"
 
 [STR_NAME_MODULE_LANGPACK_DZ]
 en-US = "Dzongkha"
 
 [STR_DESC_MODULE_LANGPACK_DZ]
-en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Dzongkha user interface"
 
 [STR_NAME_MODULE_LANGPACK_KA]
 en-US = "Georgian"
 
 [STR_DESC_MODULE_LANGPACK_KA]
-en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Georgian user interface"
 
 [STR_NAME_MODULE_LANGPACK_EO]
 en-US = "Esperanto"
 
 [STR_DESC_MODULE_LANGPACK_EO]
-en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Esperanto user interface"
 
 [STR_NAME_MODULE_LANGPACK_GU]
 en-US = "Gujarati"
 
 [STR_DESC_MODULE_LANGPACK_GU]
-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Gujarati user interface"
 
 [STR_NAME_MODULE_LANGPACK_EN_ZA]
 en-US = "English (South Africa)"
 
 [STR_DESC_MODULE_LANGPACK_EN_ZA]
-en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the English (South Africa) user interface"
 
 [STR_NAME_MODULE_LANGPACK_EN_GB]
 en-US = "English (United Kingdom)"
 
 [STR_DESC_MODULE_LANGPACK_EN_GB]
-en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the English (United Kingdom) user interface"
 
 [STR_NAME_MODULE_LANGPACK_UR_IN]
 en-US = "Urdu"
 
 [STR_DESC_MODULE_LANGPACK_UR_IN]
-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Urdu user interface"
 
 [STR_NAME_MODULE_LANGPACK_ML_IN]
 en-US = "Malayalam"
 
 [STR_DESC_MODULE_LANGPACK_ML_IN]
-en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Malayalam user interface"
 
 [STR_NAME_MODULE_LANGPACK_TE_IN]
 en-US = "Telugu"
 
 [STR_DESC_MODULE_LANGPACK_TE_IN]
-en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Telugu user interface"
 
 [STR_NAME_MODULE_LANGPACK_TI_ER]
 en-US = "Tigrinya"
 
 [STR_DESC_MODULE_LANGPACK_TI_ER]
-en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Tigrinya user interface"
 
 [STR_NAME_MODULE_LANGPACK_UZ]
 en-US = "Uzbek"
 
 [STR_DESC_MODULE_LANGPACK_UZ]
-en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Uzbek user interface"
 
 [STR_NAME_MODULE_LANGPACK_MN]
 en-US = "Mongolian"
 
 [STR_DESC_MODULE_LANGPACK_MN]
-en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Mongolian user interface"
+
+[STR_NAME_MODULE_LANGPACK_BO]
+en-US = "Tibetan"
+
+[STR_DESC_MODULE_LANGPACK_BO]
+en-US = "Installs the Tibetan user interface"
 
 [STR_NAME_MODULE_LANGPACK_OC]
 en-US = "Occitan"
 
 [STR_DESC_MODULE_LANGPACK_OC]
-en-US = "Installs Occitan support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Occitan user interface"
 
-[STR_NAME_MODULE_LANGPACK_UG]
-en-US = "Uighur"
+[STR_NAME_MODULE_LANGPACK_OM]
+en-US = "Oromo"
 
-[STR_DESC_MODULE_LANGPACK_UG]
-en-US = "Installs Uighur support in %PRODUCTNAME %PRODUCTVERSION"
+[STR_DESC_MODULE_LANGPACK_OM]
+en-US = "Installs the Oromo user interface"
 
 [STR_NAME_MODULE_LANGPACK_SI]
 en-US = "Sinhala"
 
 [STR_DESC_MODULE_LANGPACK_SI]
-en-US = "Installs Sinhala support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Sinhala user interface"
 
-[STR_NAME_MODULE_LANGPACK_OM]
-en-US = "Oromo"
+[STR_NAME_MODULE_LANGPACK_UG]
+en-US = "Uyghur"
 
-[STR_DESC_MODULE_LANGPACK_OM]
-en-US = "Installs Oromo support in %PRODUCTNAME %PRODUCTVERSION"
+[STR_DESC_MODULE_LANGPACK_UG]
+en-US = "Installs the Uyghur user interface"
 
-[STR_NAME_MODULE_LANGPACK_AST]
-en-US = "Asturian"
+[STR_NAME_MODULE_LANGPACK_AS]
+en-US = "Assamese"
 
-[STR_DESC_MODULE_LANGPACK_AST]
-en-US = "Installs Asturian support in %PRODUCTNAME %PRODUCTVERSION"
+[STR_DESC_MODULE_LANGPACK_AS]
+en-US = "Installs the Assamese user interface"
+
+[STR_NAME_MODULE_LANGPACK_BRX]
+en-US = "Bodo"
+
+[STR_DESC_MODULE_LANGPACK_BRX]
+en-US = "Installs the Bodo user interface"
+
+[STR_NAME_MODULE_LANGPACK_DGO]
+en-US = "Dogri"
+
+[STR_DESC_MODULE_LANGPACK_DGO]
+en-US = "Installs the Dogri user interface"
+
+[STR_NAME_MODULE_LANGPACK_GD]
+en-US = "Scottish Gaelic"
+
+[STR_DESC_MODULE_LANGPACK_GD]
+en-US = "Installs the Scottish Gaelic user interface"
+
+[STR_NAME_MODULE_LANGPACK_KK]
+en-US = "Kazakh"
+
+[STR_DESC_MODULE_LANGPACK_KK]
+en-US = "Installs the Kazakh user interface"
+
+[STR_NAME_MODULE_LANGPACK_KOK]
+en-US = "Konkani"
+
+[STR_DESC_MODULE_LANGPACK_KOK]
+en-US = "Installs the Konkani user interface"
+
+[STR_NAME_MODULE_LANGPACK_KS]
+en-US = "Kashmiri"
+
+[STR_DESC_MODULE_LANGPACK_KS]
+en-US = "Installs the Kashmiri user interface"
+
+[STR_NAME_MODULE_LANGPACK_KY]
+en-US = "Kyrgyz"
+
+[STR_DESC_MODULE_LANGPACK_KY]
+en-US = "Installs the Kyrgyz user interface"
+
+[STR_NAME_MODULE_LANGPACK_MAI]
+en-US = "Maithili"
+
+[STR_DESC_MODULE_LANGPACK_MAI]
+en-US = "Installs the Maithili user interface"
+
+[STR_NAME_MODULE_LANGPACK_ML]
+en-US = "Malayalam"
+
+[STR_DESC_MODULE_LANGPACK_ML]
+en-US = "Installs the Malayalam user interface"
+
+[STR_NAME_MODULE_LANGPACK_MNI]
+en-US = "Manipuri"
+
+[STR_DESC_MODULE_LANGPACK_MNI]
+en-US = "Installs the Manipuri user interface"
+
+[STR_NAME_MODULE_LANGPACK_PAP]
+en-US = "Papiamento"
+
+[STR_DESC_MODULE_LANGPACK_PAP]
+en-US = "Installs the Papiamento user interface"
+
+[STR_NAME_MODULE_LANGPACK_PS]
+en-US = "Pashto"
+
+[STR_DESC_MODULE_LANGPACK_PS]
+en-US = "Installs the Pashto user interface"
+
+[STR_NAME_MODULE_LANGPACK_SA_IN]
+en-US = "Sanskrit (India)"
+
+[STR_DESC_MODULE_LANGPACK_SA_IN]
+en-US = "Installs the Sanskrit user interface"
+
+[STR_NAME_MODULE_LANGPACK_SAT]
+en-US = "Santali"
+
+[STR_DESC_MODULE_LANGPACK_SAT]
+en-US = "Installs the Santali user interface"
+
+[STR_NAME_MODULE_LANGPACK_SC]
+en-US = "Sardinian"
+
+[STR_DESC_MODULE_LANGPACK_SC]
+en-US = "Installs the Sardinian user interface"
+
+[STR_NAME_MODULE_LANGPACK_SD]
+en-US = "Sindhi"
+
+[STR_DESC_MODULE_LANGPACK_SD]
+en-US = "Installs the Sindhi user interface"
+
+[STR_NAME_MODULE_LANGPACK_TE]
+en-US = "Telugu"
+
+[STR_DESC_MODULE_LANGPACK_TE]
+en-US = "Installs the Telugu user interface"
+
+[STR_NAME_MODULE_LANGPACK_TI]
+en-US = "Tigrinya"
+
+[STR_DESC_MODULE_LANGPACK_TI]
+en-US = "Installs the Tigrinya user interface"
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index dcd29c2ed31d..293878bc9e71 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -58,13 +58,24 @@ End
 
 Module gid_Module_Root_Extension_Dictionary_Af
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AF );
-	Files = (gid_File_Extension_Dictionary_Af);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Af);
+    InstallOrder = "2000";
     Sortkey = "510";
-	Spellcheckerlanguage = "af";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "af";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Br
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BR );
+    Files = (gid_File_Extension_Dictionary_Br);
+    InstallOrder = "2000";
+    Sortkey = "515";
+    Spellcheckerlanguage = "br";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Ca
@@ -80,35 +91,35 @@ End
 
 Module gid_Module_Root_Extension_Dictionary_Cs
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_CS );
-	Files = (gid_File_Extension_Dictionary_Cs);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Cs);
+    InstallOrder = "2000";
     Sortkey = "530";
-	Spellcheckerlanguage = "cs";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "cs";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Da
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DA );
-	Files = (gid_File_Extension_Dictionary_Da);
+    Files = (gid_File_Extension_Dictionary_Da);
     Sortkey = "540";
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "da";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    InstallOrder = "2000";
+    Spellcheckerlanguage = "da";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_De_AT
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE_AT );
     Files = (gid_File_Extension_Dictionary_De_AT);
-	InstallOrder = "2000";
+    InstallOrder = "2000";
     Sortkey = "570";
     Spellcheckerlanguage = "de-AT";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_De_CH
@@ -135,57 +146,57 @@ End
 
 Module gid_Module_Root_Extension_Dictionary_En
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_EN );
-	Files = (gid_File_Extension_Dictionary_En);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_En);
+    InstallOrder = "2000";
     Sortkey = "550";
-	Spellcheckerlanguage = "en-US";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "en";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Es
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ES );
-	Files = (gid_File_Extension_Dictionary_Es);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Es);
+    InstallOrder = "2000";
     Sortkey = "720";
-	Spellcheckerlanguage = "es";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "es";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Et
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ET );
-	Files = (gid_File_Extension_Dictionary_Et);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Et);
+    InstallOrder = "2000";
     Sortkey = "555";
-	Spellcheckerlanguage = "et";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "et";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Fr
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_FR );
-	Files = (gid_File_Extension_Dictionary_Fr);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Fr);
+    InstallOrder = "2000";
     Sortkey = "560";
-	Spellcheckerlanguage = "fr";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "fr";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Gl
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_GL );
-	Files = (gid_File_Extension_Dictionary_Gl);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Gl);
+    InstallOrder = "2000";
     Sortkey = "565";
-	Spellcheckerlanguage = "gl";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "gl";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_He
@@ -201,68 +212,79 @@ End
 
 Module gid_Module_Root_Extension_Dictionary_Hu
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_HU );
-	Files = (gid_File_Extension_Dictionary_Hu);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Hu);
+    InstallOrder = "2000";
     Sortkey = "600";
-	Spellcheckerlanguage = "hu";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "hu";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Hr
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_HR );
+    Files = (gid_File_Extension_Dictionary_Hr);
+    InstallOrder = "2000";
+    Sortkey = "605";
+    Spellcheckerlanguage = "hr";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_It
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_IT );
-	Files = (gid_File_Extension_Dictionary_It);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_It);
+    InstallOrder = "2000";
     Sortkey = "610";
-	Spellcheckerlanguage = "it";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "it";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Ku_Tr
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_KU_TR );
-	Files = (gid_File_Extension_Dictionary_Ku_Tr);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Ku_Tr);
+    InstallOrder = "2000";
     Sortkey = "620";
-	Spellcheckerlanguage = "ku-TR";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "ku-TR";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Lt
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_LT );
-	Files = (gid_File_Extension_Dictionary_Lt);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Lt);
+    InstallOrder = "2000";
     Sortkey = "630";
-	Spellcheckerlanguage = "lt";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "lt";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Ne
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_NE );
-	Files = (gid_File_Extension_Dictionary_Ne);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Ne);
+    InstallOrder = "2000";
     Sortkey = "640";
-	Spellcheckerlanguage = "ne";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "ne";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Nl
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_NL );
-	Files = (gid_File_Extension_Dictionary_Nl);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Nl);
+    InstallOrder = "2000";
     Sortkey = "545";
-	Spellcheckerlanguage = "nl";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "nl";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_No
@@ -276,26 +298,37 @@ Module gid_Module_Root_Extension_Dictionary_No
     Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Oc
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_OC );
+    Files = (gid_File_Extension_Dictionary_Oc);
+    InstallOrder = "2000";
+    Sortkey = "655";
+    Spellcheckerlanguage = "oc";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Pl
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_PL );
-	Files = (gid_File_Extension_Dictionary_Pl);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Pl);
+    InstallOrder = "2000";
     Sortkey = "660";
-	Spellcheckerlanguage = "pl";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "pl";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Pt
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_PT );
-	Files = (gid_File_Extension_Dictionary_Pt);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Pt);
+    InstallOrder = "2000";
     Sortkey = "515";
-	Spellcheckerlanguage = "pt";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "pt";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Ro
@@ -311,99 +344,110 @@ End
 
 Module gid_Module_Root_Extension_Dictionary_Ru
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_RU );
-	Files = (gid_File_Extension_Dictionary_Ru);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Ru);
+    InstallOrder = "2000";
     Sortkey = "680";
-	Spellcheckerlanguage = "ru";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "ru";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Sk
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SK );
-	Files = (gid_File_Extension_Dictionary_Sk);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Sk);
+    InstallOrder = "2000";
     Sortkey = "700";
-	Spellcheckerlanguage = "sk";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "sk";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Sl
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SL );
-	Files = (gid_File_Extension_Dictionary_Sl);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Sl);
+    InstallOrder = "2000";
     Sortkey = "710";
-	Spellcheckerlanguage = "sl";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "sl";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Sr
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SR );
-	Files = (gid_File_Extension_Dictionary_Sr);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Sr);
+    InstallOrder = "2000";
     Sortkey = "690";
-	Spellcheckerlanguage = "sr";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "sr";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Sv
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SV );
-	Files = (gid_File_Extension_Dictionary_Sv);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Sv);
+    InstallOrder = "2000";
     Sortkey = "740";
-	Spellcheckerlanguage = "sv";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "sv";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Sw
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SW );
-	Files = (gid_File_Extension_Dictionary_Sw);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Sw);
+    InstallOrder = "2000";
     Sortkey = "730";
-	Spellcheckerlanguage = "sw";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "sw";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Th
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_TH );
-	Files = (gid_File_Extension_Dictionary_Th);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Th);
+    InstallOrder = "2000";
     Sortkey = "750";
-	Spellcheckerlanguage = "th";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "th";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Uk
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_UK );
+    Files = (gid_File_Extension_Dictionary_Uk);
+    InstallOrder = "2000";
+    Sortkey = "755";
+    Spellcheckerlanguage = "uk";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Vi
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_VI );
-	Files = (gid_File_Extension_Dictionary_Vi);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Vi);
+    InstallOrder = "2000";
     Sortkey = "760";
-	Spellcheckerlanguage = "vi";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "vi";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Zu
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ZU );
-	Files = (gid_File_Extension_Dictionary_Zu);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Zu);
+    InstallOrder = "2000";
     Sortkey = "770";
-	Spellcheckerlanguage = "zu";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "zu";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index ee818ae4a82e..49219cf76422 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -55,6 +55,12 @@ en-US = "Afrikaans"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_AF]
 en-US = "Afrikaans spell checker"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_BR]
+en-US = "Breton"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_BR]
+en-US = "Breton spell checker"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_CA]
 en-US = "Catalan"
 
@@ -119,7 +125,7 @@ en-US = "French 'Classic and Reform 1990' spelling, thesaurus and hyphenation"
 en-US = "Galician"
 
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_GL]
-en-US = "Galician spellchecker dictionary for OpenOffice.org"
+en-US = "Galician spellchecker dictionary for %PRODUCTNAME"
 
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_HE]
 en-US = "Hebrew"
@@ -133,6 +139,12 @@ en-US = "Hungarian"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_HU]
 en-US = "Hungarian spelling dictionary, hyphenation patterns, and thesaurus"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_HR]
+en-US = "Croatian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_HR]
+en-US = "Croatian spelling dictionary and hyphenation patterns"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_IT]
 en-US = "Italian"
 
@@ -169,6 +181,12 @@ en-US = "Norwegian"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_NO]
 en-US = "Norwegian dictionaries (Nynorsk and Bokmal)"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_OC]
+en-US = "Occitan"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_OC]
+en-US = "Occitan spell check dictionary"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_PL]
 en-US = "Polish"
 
@@ -191,7 +209,7 @@ en-US = "Romanian Dictionaries"
 en-US = "Russian"
 
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_RU]
-en-US = "Russian hyphenation dictionary and thesaurus"
+en-US = "Russian spell check dictionary, hyphenation rules and thesaurus"
 
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_SK]
 en-US = "Slovak"
@@ -229,6 +247,12 @@ en-US = "Thai"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_TH]
 en-US = "Thai spelling dictionary"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_UK]
+en-US = "Ukrainian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_UK]
+en-US = "Ukrainian spell check dictionary, hyphenation rules and thesaurus"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_VI]
 en-US = "Vietnamese"
 
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
index 6111ab8130f9..dcdf99b1718d 100644
--- a/scp2/source/ooo/ooo_brand.scp
+++ b/scp2/source/ooo/ooo_brand.scp
@@ -33,9 +33,9 @@ Directory gid_Dir_Brand_Root
   #ifdef WNT
     HostName = "${PRODUCTNAME} ${BRANDPACKAGEVERSION}";
   #else
-    HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}";
+    HostName = ".";
   #endif
-    Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION);
+    Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION,CREATE);
 End
 #endif
 
@@ -53,7 +53,7 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
     Order = 8;
     Key = "ErrorReportServer";
   #if defined(BUILD_SPECIAL)
-    Value = "report.services.openoffice.org";
+    Value = "report.libreoffice.org";
   #else
     Value = "";
   #endif
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 59ef1673d727..6aa7c4eb8c03 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -206,7 +206,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
     ModuleID = gid_Module_Root;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
     Name = "HelpLink";
-    Value = "http://www.openoffice.org/servlets/HelpTOC";
+    Value = "http://www.libreoffice.org";
 End
 
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Modifypath
@@ -222,7 +222,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
     ModuleID = gid_Module_Root;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
     Name = "Publisher";
-    Value = "Sun Microsystems, Inc. for the OpenOffice.org-Community";
+    Value = "The The Document Foundation for the LibreOffice Community";
 End
 
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Uninstallstring
@@ -238,7 +238,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
     ModuleID = gid_Module_Root;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
     Name = "URLInfoAbout";
-    Value = "http://www.openoffice.org/";
+    Value = "http://www.libreoffice.org/";
 End
 
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Urlupdateinfo
@@ -246,12 +246,12 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
     ModuleID = gid_Module_Root;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
     Name = "URLUpdateInfo";
-    Value = "http://www.openoffice.org/dev_docs/source/download.html#newsoftware";
+    Value = "http://download.libreoffice.org";
 End
 
 RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Path
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\%PRODUCTNAME\%PRODUCTVERSION";
+    Subkey = "Software\LibreOffice\%PRODUCTNAME\%PRODUCTVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "Path";
 	Value = "<progpath>\program\soffice.exe";
@@ -277,7 +277,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "INSTALLLOCATION";
 	Value = "[INSTALLLOCATION]";
@@ -322,7 +322,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]";
@@ -349,7 +349,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]Basis\\";
@@ -358,7 +358,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]Basis\\";
@@ -385,7 +385,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]URE\\";
@@ -394,7 +394,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]URE\\";
@@ -517,14 +517,14 @@ End
 
 RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\OpenOffice.org\UNO\InstallPath";
+    Subkey = "Software\LibreOffice\UNO\InstallPath";
     ModuleID = gid_Module_Root;
     Value  = "<progpath>\program";
 End
 
 RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\OpenOffice.org\UNO\InstallPath";
+    Subkey = "Software\LibreOffice\UNO\InstallPath";
     ModuleID = gid_Module_Root;
     Name = "%PRODUCTNAME %PRODUCTVERSION";
     Value  = "<progpath>\program";
diff --git a/scp2/source/ooo/registryitem_ooo.ulf b/scp2/source/ooo/registryitem_ooo.ulf
index d37db89c113a..f8dd53c43c32 100644
--- a/scp2/source/ooo/registryitem_ooo.ulf
+++ b/scp2/source/ooo/registryitem_ooo.ulf
@@ -38,4 +38,4 @@ en-US = "%SXWFORMATNAME %SXWFORMATVERSION Configuration File"
 en-US = "StarOffice 5.0 Template"
 
 [STR_REG_VAL_APPCAPABILITY_DESCRIPTION_OOO]
-en-US = "OpenOffice.org"
+en-US = "LibreOffice"
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index b95df7d7f3ac..768460ef6065 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -27,38 +27,6 @@
 
 #include "macros.inc"
 
-ScpAction scp_Copy_License_Html
-  #ifdef UNX
-    README_TXT_ALL_LANG(Copy, LICENSE, html);
-    README_TXT_ALL_LANG(Name, LICENSE, html);
-  #else
-    README_TXT_ALL_LANG(Copy, license, html);
-    README_TXT_ALL_LANG(Name, license, html);
-  #endif
-    Styles = (SCPZIP_REPLACE);
-  #ifndef MACOSX
-    Subdir = "licenses";
-  #else
-    Subdir = "LICENSEs";
-  #endif
-End
-
-ScpAction scp_Copy_License_Txt
-  #ifdef UNX
-    README_ALL_LANG(Copy, LICENSE);
-    README_ALL_LANG(Name, LICENSE);
-  #else
-    README_TXT_ALL_LANG(Copy, license, txt);
-    README_TXT_ALL_LANG(Name, license, txt);
-  #endif
-    Styles = (SCPZIP_REPLACE);
-  #ifndef MACOSX
-    Subdir = "licenses";
-  #else
-    Subdir = "LICENSEs";
-  #endif
-End
-
 #ifdef MACOSX
 ScpAction scp_Copy_Thirdpartylicense_Readme_Html
     Copy = "THIRDPARTYLICENSEREADME.html";
@@ -67,22 +35,6 @@ ScpAction scp_Copy_Thirdpartylicense_Readme_Html
 End
 #endif
 
-ScpAction scp_Copy_Readme_Html
-  #ifdef UNX
-    README_TXT_ALL_LANG(Copy, README, html);
-    README_TXT_ALL_LANG(Name, README, html);
-  #else
-    README_TXT_ALL_LANG(Copy, readme, html);
-    README_TXT_ALL_LANG(Name, readme, html);
-  #endif
-    Styles = (SCPZIP_REPLACE);
-  #ifndef MACOSX
-    Subdir = "readmes";
-  #else
-    Subdir = "READMEs";
-  #endif
-End
-
 ScpAction scp_Copy_Readme_Txt
   #ifdef UNX
     README_ALL_LANG(Copy, README);
@@ -148,21 +100,6 @@ ScpAction scp_Copy_Xpd_Gif_Setup
     Subdir = "installdata/images";
 End
 
-// Setup license file
-ScpAction scp_Copy_Xpd_Html_License
-    README_TXT_ALL_LANG(Copy, LICENSE, html);
-    README_TXT_ALL_LANG(Name, LICENSE, html);
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Html_License_En_Us
-  	Copy = "LICENSE_en-US.html";
-    Name = "LICENSE.html";
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
 // Setup help files
 
 ScpAction scp_Copy_Xpd_Help_Html_Acceptlicense
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 19e0aba77e11..9f400afbbed0 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -33,54 +33,49 @@
 Shortcut gid_Shortcut_Lib_Icudata
     FileID = gid_File_Lib_Icudata;
     Dir = SCP2_OOO_BIN_DIR;
+#ifndef AIX
     Name = STRING(CONCAT5(libicudata,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
+#else
+    Name = "libicudata.so";
+#endif
     Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
 End
 
 Shortcut gid_Shortcut_Lib_Icui18n
     FileID = gid_File_Lib_Icui18n;
     Dir = SCP2_OOO_BIN_DIR;
+#ifndef AIX
     Name = STRING(CONCAT5(libicui18n,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
+#else
+    Name = "libicui18n.so";
+#endif
     Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
 End
 
 Shortcut gid_Shortcut_Lib_Icule
     FileID = gid_File_Lib_Icule;
     Dir = SCP2_OOO_BIN_DIR;
+#ifndef AIX
     Name = STRING(CONCAT5(libicule,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
+#else
+    Name = "libicule.so";
+#endif
     Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
 End
 
 Shortcut gid_Shortcut_Lib_Icuuc
     FileID = gid_File_Lib_Icuuc;
     Dir = SCP2_OOO_BIN_DIR;
+#ifndef AIX
     Name = STRING(CONCAT5(libicuuc,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
+#else
+    Name = "libicuuc.so";
+#endif
     Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
 End
 
 #endif
 
-Shortcut gid_Shortcut_Lib_Graphite_0
-    FileID = gid_File_Lib_Graphite;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(libgraphite,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE);
-End
-
-Shortcut gid_Shortcut_Lib_Graphite_1
-    FileID = gid_File_Lib_Graphite;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT4(libgraphite,UNXSUFFIX,.,3));
-    Styles = (NETWORK,RELATIVE);
-End
-
-Shortcut gid_Shortcut_Lib_Graphite_2
-    FileID = gid_File_Lib_Graphite;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT4(libgraphite,UNXSUFFIX,.,3.0));
-    Styles = (NETWORK,RELATIVE);
-End
-
 #endif
 
 #ifdef MACOSX
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 2d6b8858eca1..6d61daff3df0 100755..100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -170,104 +170,83 @@ End
 
 // Public Dynamic Libraries:
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcr80_Ure
-    BIN_FILE_BODY;
-    Styles = (PACKED);
+File gid_File_Dl_Cppu
+    TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
-    Name = "msvcr80.dll";
-#else
-    Name = "msvcr80d.dll";
-#endif
+    Name = SCP2_URE_DL_UNO_VER("cppu", "3");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    // CompID = "36C01AC6-BB0A-4181-A8B8-50B793ADEDB7";
 End
-#endif
-#endif
-#endif
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcp80_Ure
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Cppu
     BIN_FILE_BODY;
-    Styles = (PACKED);
     Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
-    Name = "msvcp80.dll";
-#else
-    Name = "msvcp80d.dll";
-#endif
+    Name = SCP2_URE_DL_UNO_NORMAL("cppu");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = SCP2_URE_DL_UNO_VER("cppu", "3");
 End
 #endif
-#endif
-#endif
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcm80_Ure
-    BIN_FILE_BODY;
-    Styles = (PACKED);
+File gid_File_Dl_Cppuhelper
+    TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
-    Name = "msvcm80.dll";
-#else
-    Name = "msvcm80d.dll";
-#endif
+    Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    // CompID = "D2A191E6-2023-41F5-9032-B98C50C37964";
 End
-#endif
-#endif
-#endif
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Msvcm80crt_Manifest_Ure
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Cppuhelper
     BIN_FILE_BODY;
-    Styles = (PACKED);
     Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
-    Name = "Microsoft.VC80.CRT.manifest";
-#else
-    Name = "Microsoft.VC80.DebugCRT.manifest";
-#endif
+    Name = SCP2_URE_DL_UNO_COMID_NORMAL("cppuhelper");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
 End
 #endif
-#endif
-#endif
 
-File gid_File_Dl_Cppu
+File gid_File_Dl_PurpEnvHelper
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_UNO_VER("cppu", "3");
+    Name = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "36C01AC6-BB0A-4181-A8B8-50B793ADEDB7";
+    // CompID = "C80146A8-A14C-44D1-AB9F-D9D8BF22277E";
 End
 
-File gid_File_Dl_Cppuhelper
-    TXT_FILE_BODY;
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_PurpEnvHelper
+    BIN_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
+    Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "D2A191E6-2023-41F5-9032-B98C50C37964";
+    Target = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
 End
+#endif
 
-File gid_File_Dl_PurpEnvHelper
+File gid_File_Dl_Sal
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
+    Name = SCP2_URE_DL_UNO_VER("sal", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "C80146A8-A14C-44D1-AB9F-D9D8BF22277E";
+    // CompID = "B1EF3AB6-611E-4027-958A-736583EB82E6";
 End
 
-File gid_File_Dl_Sal
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Sal
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_UNO_NORMAL("sal");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = SCP2_URE_DL_UNO_VER("sal", "3");
+End
+#endif
+
+File gid_File_Dl_Sal_TextEnc
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_UNO_VER("sal", "3");
+    Name = SCP2_URE_DL_VER("sal_textenc", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "B1EF3AB6-611E-4027-958A-736583EB82E6";
 End
 
 File gid_File_Dl_Salhelper
@@ -278,6 +257,16 @@ File gid_File_Dl_Salhelper
     // CompID = "879B80E0-F6E1-4931-8EE6-7CF867CB6AA5";
 End
 
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Salhelper
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_UNO_COMID_NORMAL("salhelper");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
+End
+#endif
+
 // Private Dynamic Libraries:
 
 File gid_File_Dl_Profile_Uno
@@ -296,6 +285,18 @@ File gid_File_Dl_Reg
     // CompID = "D5313B1F-D09F-401F-B180-891F70D489ED";
 End
 
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Reg
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_NORMAL("reg");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = SCP2_URE_DL_VER("reg", "3");
+End
+#endif
+
+
+
 File gid_File_Dl_Store
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -304,6 +305,7 @@ File gid_File_Dl_Store
     // CompID = "A5477BD7-89A3-44AF-8B42-9E28D55C8066";
 End
 
+
 File gid_File_Dl_Xmlreader
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -311,6 +313,18 @@ File gid_File_Dl_Xmlreader
     Styles = (PACKED);
 End
 
+
+
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Store
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_NORMAL("store");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = SCP2_URE_DL_VER("store", "3");
+End
+#endif
+
 File gid_File_Dl_Jvmaccess
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -319,6 +333,16 @@ File gid_File_Dl_Jvmaccess
     // CompID = "F3D6F794-DA6F-4522-B3A7-C15593C1A577";
 End
 
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Jvmaccess
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_COMID_NORMAL("jvmaccess");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = SCP2_URE_DL_COMID_VER("jvmaccess", "3");
+End
+#endif
+
 File gid_File_Dl_Jvmfwk
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -327,6 +351,16 @@ File gid_File_Dl_Jvmfwk
     // CompID = "4E128F82-FA30-4077-88DC-F745C3330093";
 End
 
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Jvmfwk
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_NORMAL("jvmfwk");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = SCP2_URE_DL_VER("jvmfwk", "3");
+End
+#endif
+
 #if defined SOLAR_JAVA
 File gid_File_Dl_Sunjavaplugin
     TXT_FILE_BODY;
@@ -427,9 +461,7 @@ File gid_File_Dl_Cli_Ure_Assembly
     Version = "${CLI_URE_NEW_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "MSIL";
-#endif
 End
 
 #endif
@@ -446,9 +478,7 @@ File gid_File_Dl_Policy_Cli_Ure_Assembly
     Version = "${CLI_URE_POLICY_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "MSIL";
-#endif
 End
 
 #endif
@@ -477,9 +507,7 @@ File gid_File_Dl_Cli_Basetypes_Assembly
     Version = "${CLI_BASETYPES_NEW_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "MSIL";
-#endif
 End
 
 #endif
@@ -496,9 +524,7 @@ File gid_File_Dl_Policy_Cli_Basetypes_Assembly
     Version = "${CLI_BASETYPES_POLICY_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "MSIL";
-#endif
 End
 
 #endif
@@ -527,9 +553,7 @@ File gid_File_Dl_Cli_Uretypes_Assembly
     Version = "${CLI_URETYPES_NEW_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "MSIL";
-#endif
 End
 
 #endif
@@ -546,9 +570,7 @@ File gid_File_Dl_Policy_Cli_Uretypes_Assembly
     Version = "${CLI_URETYPES_POLICY_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "MSIL";
-#endif
 End
 
 #endif
@@ -577,9 +599,7 @@ File gid_File_Lib_Cli_Cppuhelper_Assembly
     Version = "${CLI_CPPUHELPER_NEW_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "x86";
-#endif
 End
 
 #endif
@@ -596,9 +616,7 @@ File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly
     Version = "${CLI_CPPUHELPER_POLICY_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "x86";
-#endif
 End
 
 #endif
@@ -814,19 +832,28 @@ File gid_File_Dl_Libxml2
 End
 #endif
 
-#if !defined USE_SYSTEM_STL || \
-    (defined USE_SYSTEM_STL && defined _C52 && defined IS_LP64)
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Libxml2
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_NORMAL("xml2");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = SCP2_URE_DL_VER("xml2", "2");
+End
+#endif
+
+#if defined WITH_STLPORT
 File gid_File_Dl_Stlport
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
 #if defined _gcc3 && defined WNT
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
     Name = SCP2_URE_DL_NORMAL("libstlport_gcc_stldebug");
 #else
     Name = SCP2_URE_DL_NORMAL("libstlport_gcc");
 #endif
 #elif defined _gcc3
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
     Name = SCP2_URE_DL_NORMAL("stlport_gcc_stldebug");
 #else
     Name = SCP2_URE_DL_NORMAL("stlport_gcc");
@@ -835,43 +862,49 @@ File gid_File_Dl_Stlport
 #if defined IS_LP64
     Name = SCP2_URE_DL_VER("stlport", "1");
 #else
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
     Name = SCP2_URE_DL_NORMAL("stlport_sunpro_debug");
 #else
     Name = SCP2_URE_DL_NORMAL("stlport_sunpro");
 #endif
 #endif
-#elif defined WNT && (defined(M1310) || defined(M1400) || defined(M1500) )
-#if defined _STLP_DEBUG
+#elif defined WNT && ((_MSC_VER == 1500) || (_MSC_VER == 1600))
+#if defined _DEBUG_RUNTIME
     Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
 #else
     Name = SCP2_URE_DL_NORMAL("stlport_vc7145");
 #endif
-#else
-#error "stlport dynamic library: unsupported platform"
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "D976338D-D2A5-4D29-B765-D3AC43181C7F";
 End
 #endif
 
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
-	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
+#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
+	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
 File gid_File_Dl_GccS
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef AIX
+    Name = "libgcc_s.a";
+#else
     Name = SCP2_URE_DL_VER("gcc_s", STRING(SHORTSTDC3));
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "C601D04B-2194-4F1B-BB09-7B4930D6E1DB";
 End
 #endif
 
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
-	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
+#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
+	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
 File gid_File_Dl_Stdcpp
     Dir = SCP2_URE_DL_DIR;
     TXT_FILE_BODY;
+#ifdef AIX
+    Name = "libstdc++.a";
+#else
     Name = SCP2_URE_DL_VER("stdc++", STRING(SHORTSTDCPP3));
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "89740D6A-38EE-41AF-A6A2-A8F7ABBE4996";
 End
@@ -913,48 +946,6 @@ End
 
 #endif
 
-#ifdef WNT
-#if defined(M1310)
-File gid_File_Dl_Msvcr71
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-#if defined _STLP_DEBUG
-    Name = SCP2_URE_DL_NORMAL("msvcr71d");
-#else
-    Name = SCP2_URE_DL_NORMAL("msvcr71");
-#endif
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "074DE395-C6EB-47F7-A587-6311F89C14B4";
-End
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1310)
-File gid_File_Dl_Msvcp71
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-#if defined _STLP_DEBUG
-    Name = SCP2_URE_DL_NORMAL("msvcp71d");
-#else
-    Name = SCP2_URE_DL_NORMAL("msvcp71");
-#endif
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "1AF2708A-AAE2-4F25-ADF5-E61A549A51C2";
-End
-#endif
-#endif
-
-#if defined WNT
-File gid_File_Dl_Unicows
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("unicows");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "F05005FA-5B2C-43B1-83EF-988EFFF1D7BD";
-End
-#endif
-
 #if defined WNT
 File gid_File_Dl_Uwinapi
     TXT_FILE_BODY;
@@ -1096,20 +1087,31 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Dl_Cli_Cppuhelper_Assembly,
             gid_File_Dl_Policy_Cli_Cppuhelper_Assembly,
             gid_File_Dl_Policy_Cli_Cppuhelper_Config,
-           	gid_File_Lib_Cli_Cppuhelper_Assembly,
+            gid_File_Lib_Cli_Cppuhelper_Assembly,
             gid_File_Lib_Policy_Cli_Cppuhelper_Assembly,
-	        gid_File_Lib_Policy_Cli_Cppuhelper_Config,
+            gid_File_Lib_Policy_Cli_Cppuhelper_Config,
             gid_File_Dl_Cppu,
+            gid_Unixlink_File_Dl_Cppu,
             gid_File_Dl_Cppuhelper,
+            gid_Unixlink_File_Dl_Cppuhelper,
             gid_File_Dl_PurpEnvHelper,
+            gid_Unixlink_File_Dl_PurpEnvHelper,
             gid_File_Dl_Sal,
+            gid_Unixlink_File_Dl_Sal,
+            gid_File_Dl_Sal_TextEnc,
             gid_File_Dl_Salhelper,
+            gid_Unixlink_File_Dl_Salhelper,
             gid_File_Dl_Profile_Uno,
             gid_File_Dl_Reg,
+            gid_Unixlink_File_Dl_Reg,
+            gid_Unixlink_File_Dl_Rmcxt,
             gid_File_Dl_Store,
+            gid_Unixlink_File_Dl_Store,
             gid_File_Dl_Xmlreader,
             gid_File_Dl_Jvmaccess,
+            gid_Unixlink_File_Dl_Jvmaccess,
             gid_File_Dl_Jvmfwk,
+            gid_Unixlink_File_Dl_Jvmfwk,
             gid_File_Dl_Sunjavaplugin,
             gid_File_Dl_JrepropertiesClass,
             gid_File_Dl_Profile_Jvmfwk3rc,
@@ -1146,8 +1148,6 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Lib_Mingw_GccS_Ure,
             gid_File_Lib_Mingw_Stdcpp_Ure,
             gid_File_Lib_Mingwm10_Ure,
-            gid_File_Dl_Msvcr71,
-            gid_File_Dl_Msvcp71,
             gid_File_Dl_Unicows,
             gid_File_Dl_Uwinapi,
             gid_File_Lib_Msvcr80_Ure,
@@ -1162,7 +1162,18 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Misc_TypesRdb,
             gid_File_Misc_ServicesRdb,
             gid_File_Misc_JavavendorsXml);
-    Unixlinks = (gid_Unixlink_Ure_Bin_Urelibs);
+    Unixlinks = (gid_Unixlink_Ure_Bin_Urelibs,
+                 gid_Unixlink_File_Dl_Sal,
+                 gid_Unixlink_File_Dl_Salhelper,
+                 gid_Unixlink_File_Dl_Cppu,
+                 gid_Unixlink_File_Dl_Cppuhelper,
+                 gid_Unixlink_File_Dl_PurpEnvHelper,
+                 gid_Unixlink_File_Dl_Reg,
+                 gid_Unixlink_File_Dl_Rmcxt,
+                 gid_Unixlink_File_Dl_Store,
+                 gid_Unixlink_File_Dl_Jvmaccess,
+                 gid_Unixlink_File_Dl_Jvmfwk,
+                 gid_Unixlink_File_Dl_Libxml2);
 End
 
 // Profile version.ini
diff --git a/scp2/source/ooo/ure_into_ooo.scp b/scp2/source/ooo/ure_into_ooo.scp
index 397d8fd8f2da..397d8fd8f2da 100755..100644
--- a/scp2/source/ooo/ure_into_ooo.scp
+++ b/scp2/source/ooo/ure_into_ooo.scp
diff --git a/scp2/source/ooo/ure_standalone.scp b/scp2/source/ooo/ure_standalone.scp
index 5fad8fadcbba..8579139f95e3 100755..100644
--- a/scp2/source/ooo/ure_standalone.scp
+++ b/scp2/source/ooo/ure_standalone.scp
@@ -42,9 +42,9 @@ End
 Directory gid_Dir_Ooo_Openofficeorg
     ParentID = PREDEFINED_PROGDIR;
   #ifdef WNT
-    HostName = "OpenOffice.org";
+    HostName = "LibreOffice";
   #else
-    HostName = "openoffice.org";
+    HostName = "libreoffice";
   #endif
     Styles = (ISINSTALLLOCATION);
 End
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 2c46065db8f3..f35482e4dd39 100755..100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -54,6 +54,15 @@ WindowsCustomAction gid_Customaction_Regallmsdocdll
 	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And _IsSetupTypeMin<>\"Custom\"", "CostFinalize");
 End
 
+WindowsCustomAction gid_Customaction_Restoreregallmsdocdll
+    Name = "Restoreregallmsdocdll";
+    Typ = "65";
+    Source = "reg4allmsdoc.dll";
+    Target = "RestoreRegAllMSDoc";
+    Inbinarytable = 1;
+    Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "end");
+End
+
 WindowsCustomAction gid_Customaction_Regactivexdll1
 	Name = "Regactivexdll1";
 	Typ = "65";
@@ -450,22 +459,13 @@ WindowsCustomAction gid_Customaction_CheckVersions
 	Assignment2 = ("InstallUISequence", "NOT Installed", "NewProductFound");
 End
 
-WindowsCustomAction gid_Customaction_ShowReleaseNotes1
-	Name = "ShowReleaseNotesBefore";
-	Typ = "65";
-	Source = "relnotes.dll";
-	Target = "ShowReleaseNotesBefore";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "(Not Installed or ISPATCH) and Not REMOVE=\"ALL\"", "behind_InstallValidate");
-End
-
-WindowsCustomAction gid_Customaction_ShowReleaseNotes2
-	Name = "ShowReleaseNotesAfter";
-	Typ = "65";
-	Source = "relnotes.dll";
-	Target = "ShowReleaseNotesAfter";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "(Not Installed or ISPATCH) and Not REMOVE=\"ALL\"", "end");
+WindowsCustomAction gid_Customaction_SelectLanguage
+    Name = "SelectLanguage";
+    Typ = "321";
+    Source = "sellangmsi.dll";
+    Target = "SelectLanguage";
+    Inbinarytable = 1;
+    Assignment1 = ("ControlEvent", "SetupType", "Next", "DoAction", "SelectLanguage", "1", "1");
 End
 
 WindowsCustomAction gid_Customaction_RebaseLibrariesonproperties
@@ -478,15 +478,6 @@ WindowsCustomAction gid_Customaction_RebaseLibrariesonproperties
 	Assignment2 = ("AdminExecuteSequence", "VersionNT < 600 And Not REMOVE=\"ALL\"", "end");
 End
 
-WindowsCustomAction gid_Customaction_ShowSurvey
-	Name = "ShowSurveyAfterUninstall";
-	Typ = "65";
-	Source = "relnotes.dll";
-	Target = "ShowSurveyAfter";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and Not UPGRADINGPRODUCTCODE", "end");
-End
-
 WindowsCustomAction gid_Customaction_LookForRegisteredExtensions
 	Name = "LookForRegisteredExtensions";
 	Typ = "65";
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index c99a93407e87..2895c5c8b27e 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#ifndef DISABLE_PYUNO
+
 File gid_File_Lib_Pyuno
     TXT_FILE_BODY;
   #ifdef UNX
@@ -102,19 +104,10 @@ End
 #endif
 #endif
 
-// Scripting Framework Python script proxy
-
-File gid_File_Py_Pythonscript
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "pythonscript.py";
-    Styles = (PACKED);
-End
- 
 //Scripting Framework Python example scripts
 
 File gid_File_Scripts_Python
-    TXT_FILE_BODY; 
+    TXT_FILE_BODY;
     Styles = (ARCHIVE);
     Dir = gid_Dir_Share_Scripts;
     Name = "ScriptsPython.zip";
@@ -137,6 +130,14 @@ File gid_File_Lib_Python_So
     Name = STRING(PY_FULL_DLL_NAME);
     Styles = (PACKED);
 End
+#ifdef UNX
+Shortcut gid_Shortcut_Lib_Python_So
+    FileID = gid_File_Lib_Python_So;
+    Dir = gid_Dir_Program;
+    Name = STRING(CONCAT3(libpython,PYMAJMIN,UNXSUFFIX));
+    Styles = (NETWORK,RELATIVE);
+End
+#endif //UNX
 #else //MACOSX
 //directory entries solely to be able to create the symlinks
 Directory gid_Dir_PythonFramework
@@ -299,13 +300,19 @@ End
 
 #ifdef UNX
 
-// pyuno.so even on Mac OS X, because it is a python module
 File gid_File_Pyuno
     TXT_FILE_BODY;
+#ifdef MACOSX
+    // note: Mac OS X use .dylib, even for python modules
+    Name = "pyuno.dylib";
+#else
     Name = "pyuno.so";
+#endif
     Dir = gid_Dir_Program;
     Styles = (PACKED);
 End
 
 #endif
 
+// DISABLE_PYUNO
+#endif
diff --git a/scp2/source/python/makefile.mk b/scp2/source/python/makefile.mk
index 4e03218ff06a..f3bff44cb582 100644
--- a/scp2/source/python/makefile.mk
+++ b/scp2/source/python/makefile.mk
@@ -37,11 +37,15 @@ TARGETTYPE=CUI
 
 .INCLUDE :	settings.mk
 
+.IF "$(DISABLE_PYTHON)" == "TRUE"
+SCPDEFS+=-DDISABLE_PYUNO
+.ELSE
 .IF "$(SYSTEM_PYTHON)" == "YES"
 SCPDEFS+=-DSYSTEM_PYTHON
 .ELSE
 .INCLUDE :      pyversion.mk
 .ENDIF
+.ENDIF
 
 SCPDEFS+=\
     -DPYVERSION=$(PYVERSION) -DPYMAJMIN=$(PYMAJOR).$(PYMINOR) \
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index 3abeec2e3142..eef393917432 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -27,13 +27,17 @@
 
 #include "macros.inc"
 
+#ifndef DISABLE_PYUNO
+
 Module gid_Module_Optional_Pyuno
     PackageInfo = "packinfo_office.txt";
     MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
     ParentID = gid_Module_Optional;
     Sortkey = "750";
-    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
+    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Lib_Python_So_Brand,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
     Minimal = NO;
     Default = YES;
     Styles = ( );
 End
+
+#endif
diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp
index 15177971ba1a..53ed507acd08 100644
--- a/scp2/source/python/module_python_mailmerge.scp
+++ b/scp2/source/python/module_python_mailmerge.scp
@@ -27,9 +27,19 @@
 
 #include "macros.inc"
 
+#ifndef AIX
+#ifndef DISABLE_PYUNO
 File gid_File_Pymailmerge
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
     Name = "mailmerge.py";
     Styles = (PACKED);
 End
+File gid_File_Pymailmerge_msgbox
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Program;
+    Name = "msgbox.py";
+    Styles = (PACKED);
+End
+#endif
+#endif
diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp
index 1c4fdb077986..e0ceceead612 100644
--- a/scp2/source/python/profileitem_python.scp
+++ b/scp2/source/python/profileitem_python.scp
@@ -27,6 +27,7 @@
 
 #include "macros.inc"
 
+#ifndef DISABLE_PYUNO
 
 Profile gid_Profile_Pythonloader_Uno_Ini
     ModuleID = gid_Module_Optional_Pyuno;
@@ -92,3 +93,6 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonpath
   #endif
 #endif
 End
+
+// DISABLE_PYUNO
+#endif
diff --git a/scp2/source/quickstart/registryitem_quickstart.scp b/scp2/source/quickstart/registryitem_quickstart.scp
index 4c8b4c5ad2a5..31e0e951102d 100644
--- a/scp2/source/quickstart/registryitem_quickstart.scp
+++ b/scp2/source/quickstart/registryitem_quickstart.scp
@@ -29,7 +29,7 @@
 
 RegistryItem gid_Regitem_Software_OpenOffice_Quickstarterinstalled
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\OpenOffice.org";
+    Subkey = "Software\LibreOffice";
     ModuleID = gid_Module_Optional_Quickstart;
     Name = "QuickStarterInstalled";
     Value = "1";
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index c9319f68dfd4..a15e4c399811 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -39,11 +39,6 @@ Installation gid_Installation_Sdk
 #endif
 End
 
-DataCarrier gid_Datacarrier
-    Name = "%PRODUCTNAME %PRODUCTVERSION";
-    DiskNo = 1;
-End
-
 #ifndef MACOSX
 
 #ifdef WNT
@@ -60,7 +55,7 @@ Directory gid_Dir_Ooo_Openofficeorg_Sdk
   #ifdef WNT
     HostName = "${BASISROOTNAME}";
   #else
-    HostName = "${UNIXBASISROOTNAME}";
+    HostName = ".";
   #endif
 End
 #endif
@@ -82,8 +77,7 @@ End
 Directory gid_Dir_Basis_Sdk
 #if defined MACOSX
     ParentID = PREDEFINED_PROGDIR;
-    // DosName = "OpenOffice.org${OOOBASEVERSION}_SDK";
-    DosName = "OpenOffice.org_SDK";
+    DosName = "LibreOffice${OOOBASEVERSION}_SDK";
 #else
   #if defined WNT
     ParentID = gid_Dir_Sdkoo_Root;
@@ -94,24 +88,6 @@ Directory gid_Dir_Basis_Sdk
 #endif
 End
 
-
-#if defined MACOSX
-ScpAction scp_Copy_License_Html_Sdk
-    README_TXT_ALL_LANG(Copy, LICENSE, html);
-    README_TXT_ALL_LANG(Name, LICENSE, html);
-    Styles = (SCPZIP_REPLACE);
-    Subdir = "LICENSEs";
-End
-
-ScpAction scp_Copy_License_Txt_Sdk
-    README_ALL_LANG(Copy, LICENSE);
-    README_ALL_LANG(Name, LICENSE);
-    Styles = (SCPZIP_REPLACE);
-    Subdir = "LICENSEs";
-End
-#endif
-
-
 Directory gid_Dir_Share_Sdk
     ParentID = gid_Dir_Basis_Sdk;
     DosName = "share";
@@ -123,7 +99,7 @@ Directory gid_Dir_Share_Readme_Sdk
 End
 
 
-Module gid_Module_Root
+Module gid_Module_Root_SDK
     Name = "sdkoo";
     Description = "sdkoo";
     PackageInfo = "packinfo_sdkoo.txt";
@@ -134,22 +110,10 @@ File gid_File_Txt_License
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Readme_Sdk;
   #ifdef UNX
-    Name = "LICENSE_en-US";
+    Name = "LICENSE";
   #endif
   #ifdef WNT
-    Name = "license_en-US.txt";
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_File_Txt_License_Html
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Readme_Sdk;
-  #ifdef UNX
-    Name = "LICENSE_en-US.html";
-  #endif
-  #ifdef WNT
-    Name = "license_en-US.html";
+    Name = "license.txt";
   #endif
     Styles = (PACKED, SCPZIP_REPLACE);
 End
@@ -166,19 +130,6 @@ File gid_File_Txt_Readme
     Styles = (PACKED, SCPZIP_REPLACE);
 End
 
-File gid_File_Txt_Readme_Html
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Readme_Sdk;
-  #ifdef UNX
-    Name = "README_en-US.html";
-  #endif
-  #ifdef WNT
-    Name = "readme_en-US.html";
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-
 File gid_File_Zip_Odkexamples
     TXT_FILE_BODY;
     Dir = gid_Dir_Basis_Sdk;
diff --git a/scp2/source/templates/makefile.mk b/scp2/source/templates/makefile.mk
index 47be771c5e50..46b9ac24daa3 100755
--- a/scp2/source/templates/makefile.mk
+++ b/scp2/source/templates/makefile.mk
@@ -40,9 +40,9 @@ TARGET=templates
 COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
 .EXPORT : COMPLETELANGISO_VAR
 
-ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc
+ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_accessories_templates_root.inc $(INCCOM)$/alllangmodules_accessories_samples_root.inc $(INCCOM)$/alllangmodules_accessories_templates.inc $(INCCOM)$/alllangmodules_accessories_samples.inc $(INCCOM)$/alllangmodules_extensions_templates.inc $(INCCOM)$/alllangmodules_extensions_lightproof.inc $(INCCOM)$/allhelpmodules.inc $(INCCOM)$/allhelpmodules_root.inc
 
-.INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
+.INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk $(MISC)$/$(TARGET)_help_track.mk
 .IF "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
 PHONYTEMPL=.PHONY
 .ENDIF			# "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
@@ -50,3 +50,7 @@ $(INCCOM)$/alllangmodules%.inc $(PHONYTEMPL) : module_langpack%.sct
     @@-$(RENAME) $@ $@.tmp
     $(COMMAND_ECHO)$(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
     @echo LAST_COMPLETELANGISO_VAR=$(COMPLETELANGISO_VAR) > $(MISC)$/$(TARGET)_lang_track.mk
+$(INCCOM)$/allhelpmodules%.inc $(PHONYTEMPL) : module_helppack%.sct
+    @@-$(RENAME) $@ $@.tmp
+    $(COMMAND_ECHO)$(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
+    @echo LAST_COMPLETELANGISO_VAR=$(COMPLETELANGISO_VAR) > $(MISC)$/$(TARGET)_help_track.mk
diff --git a/stlport/systemstl/rope b/scp2/source/templates/module_helppack.sct
index 71ea13a022cf..3b80cd88dec2 100644
--- a/stlport/systemstl/rope
+++ b/scp2/source/templates/module_helppack.sct
@@ -1,5 +1,5 @@
 /*************************************************************************
- *
+*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -23,26 +23,16 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************/
-
-#ifndef SYSTEM_STL_ROPE
-#define SYSTEM_STL_ROPE
-
-#include <functional>
-#include <numeric>
-
-#ifdef GCC
+************************************************************************/
 
-#include <ext/rope>
-
-namespace std
-{
-	using __gnu_cxx::rope;
-}
+Module gid_Module_Helppack_Root_<LANGUAGE_>
+    ParentID = gid_Module_Helppack_Helproot;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_HELPPACK_<LANGUAGEBIG_>);
+#ifdef WITH_HELPPACK_INTEGRATION
+    Styles =(FORCEHELPPACK, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME, LANGUAGEMODULE);
 #else
-#error UNSUPPORTED COMPILER
-#endif
-
-
+    Styles =(HELPPACK, HIDDEN_ROOT, USELANGUAGENAME, LANGUAGEMODULE);
 #endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+End
diff --git a/stlport/systemstl/slist b/scp2/source/templates/module_helppack_root.sct
index 6535c545e50d..2ddf414e3301 100644
--- a/stlport/systemstl/slist
+++ b/scp2/source/templates/module_helppack_root.sct
@@ -1,5 +1,5 @@
 /*************************************************************************
- *
+*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -23,23 +23,15 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************/
-
-#ifndef SYSTEM_STL_SLIST
-#define SYSTEM_STL_SLIST
-
-#ifdef GCC
-
-#include <ext/slist>
-
-namespace std
-{
-	using __gnu_cxx::slist;
-}
-#else
-#error UNSUPPORTED COMPILER
-#endif
-
+************************************************************************/
 
-#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+Module gid_Module_Helppack_Help_<LANGUAGE_>
+    ParentID = gid_Module_Helppack_Root_<LANGUAGE_>;
+    Sortkey = "200";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Helppack_Help_Template;
+    Name = "gid_Module_Helppack_Help_<LANGUAGE_>";
+    Description = "gid_Module_Helppack_Help_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_help.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
diff --git a/scp2/source/templates/module_langpack_accessories_samples.sct b/scp2/source/templates/module_langpack_accessories_samples.sct
new file mode 100644
index 000000000000..5a40a3e19295
--- /dev/null
+++ b/scp2/source/templates/module_langpack_accessories_samples.sct
@@ -0,0 +1,64 @@
+/*************************************************************************
+*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: module_langpack_accessories_samples.sct,v $
+ * $Revision: 1.4 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Accessories_Adv_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Adv_Root_<LANGUAGE_>;
+    Sortkey = "300";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Optional_Accessories_Adv_Template;
+    Name = "gid_Module_Optional_Accessories_Adv_<LANGUAGE_>";
+    Description = "gid_Module_Optional_Accessories_Adv_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
+
+Module gid_Module_Optional_Accessories_Doc_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Doc_Root_<LANGUAGE_>;
+    Sortkey = "200";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Optional_Accessories_Doc_Template;
+    Name = "gid_Module_Optional_Accessories_Doc_<LANGUAGE_>";
+    Description = "gid_Module_Optional_Accessories_Doc_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
+
+Module gid_Module_Optional_Accessories_Sam_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Sam_Root_<LANGUAGE_>;
+    Sortkey = "100";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Optional_Accessories_Sam_Template;
+    Name = "gid_Module_Optional_Accessories_Sam_<LANGUAGE_>";
+    Description = "gid_Module_Optional_Accessories_Sam_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
diff --git a/scp2/source/templates/module_langpack_accessories_samples_root.sct b/scp2/source/templates/module_langpack_accessories_samples_root.sct
new file mode 100644
index 000000000000..dbe08dd0949d
--- /dev/null
+++ b/scp2/source/templates/module_langpack_accessories_samples_root.sct
@@ -0,0 +1,55 @@
+/*************************************************************************
+*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: module_langpack_accessories_root.sct,v $
+ * $Revision: 1.4 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Accessories_Adv_Root_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Advertisement;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
+    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
+End
+
+Module gid_Module_Optional_Accessories_Doc_Root_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Documentations;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
+    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
+End
+
+Module gid_Module_Optional_Accessories_Sam_Root_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Samples;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
+    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
+End
diff --git a/scp2/source/ooo/mergemodules_ooo.scp b/scp2/source/templates/module_langpack_accessories_templates.sct
index f88cce4d2314..44b519db3b2a 100755..100644
--- a/scp2/source/ooo/mergemodules_ooo.scp
+++ b/scp2/source/templates/module_langpack_accessories_templates.sct
@@ -1,11 +1,14 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
+ * $RCSfile: module_langpack_accessories_templates.sct,v $
+ * $Revision: 1.4 $
+ *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,30 +30,13 @@
 
 #include "macros.inc"
 
-#ifdef M1500
-MergeModule gid_Mergemodule_Microsoft_Vc90_Crt_X86
-#ifdef _STLP_DEBUG
-	Name = "Microsoft_VC90_DebugCRT_x86.msm";
-#else
-	Name = "Microsoft_VC90_CRT_x86.msm";
-#endif
-	Cabfilename = "openoffice.org-vc90crt.cab";
-	Feature = "gm_Root";
-	RootDir = "TARGETDIR";
-	Styles = (REMOVE_FILE_TABLE);
-End
-#endif
-
-#ifdef M1500
-MergeModule gid_Mergemodule_Policy_Microsoft_Vc90_Crt_X86
-#ifdef _STLP_DEBUG
-	Name = "policy_9_0_Microsoft_VC90_DebugCRT_x86.msm";
-#else
-	Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm";
-#endif
-	Cabfilename = "openoffice.org-policy-vc90crt.cab";
-	Feature = "gm_Root";
-	RootDir = "TARGETDIR";
-	Styles = (REMOVE_FILE_TABLE);
+Module gid_Module_Optional_Accessories_Tem_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Tem_Root_<LANGUAGE_>;
+    Sortkey = "50";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Optional_Accessories_Tem_Template;
+    Name = "gid_Module_Optional_Accessories_Tem_<LANGUAGE_>";
+    Description = "gid_Module_Optional_Accessories_Tem_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
 End
-#endif
diff --git a/stlport/systemstlguards/postextstl.h b/scp2/source/templates/module_langpack_accessories_templates_root.sct
index 81a21e25c15b..fe0da7247acc 100644
--- a/stlport/systemstlguards/postextstl.h
+++ b/scp2/source/templates/module_langpack_accessories_templates_root.sct
@@ -1,11 +1,14 @@
 /*************************************************************************
- *
+*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
+ * $RCSfile: module_langpack_accessories_root.sct,v $
+ * $Revision: 1.4 $
+ *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -23,14 +26,14 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************/
+************************************************************************/
+
+#include "macros.inc"
 
-#ifdef std_was_redefined_as_stlport
-//  put things back the way they were
-#   define std std_was_redefined_as_stlport
-#   undef _STLP_OUTERMOST_HEADER_ID
-//  force config to be re-read
-#   undef _STLP_NOTHROW_INHERENTLY
-#   undef _STLP_CONFIG_H
-#   include <stddef.h>
-#endif
+Module gid_Module_Optional_Accessories_Tem_Root_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Templates;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
+    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
+End
diff --git a/scp2/source/templates/module_langpack_extensions_lightproof.sct b/scp2/source/templates/module_langpack_extensions_lightproof.sct
new file mode 100644
index 000000000000..1cadbdea8fa4
--- /dev/null
+++ b/scp2/source/templates/module_langpack_extensions_lightproof.sct
@@ -0,0 +1,55 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: module_langpack_extensions_templates.sctp,v $
+ *
+ *  $Revision: 1.0 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2008/11/18 14:50:39 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    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
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Extensions_LightProof_Root_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Extensions_LightProof;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
+    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
+End
+
+Module gid_Module_Optional_Extensions_LightProof_M_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Extensions_LightProof_Root_<LANGUAGE_>;
+    Sortkey = "50";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Optional_Extensions_LightProof_Template;
+    Name = "gid_Module_Optional_Extensions_LightProof_<LANGUAGE_>";
+    Description = "gid_Module_Optional_Extensions_LightProof_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
diff --git a/scp2/source/templates/module_langpack_extensions_templates.sct b/scp2/source/templates/module_langpack_extensions_templates.sct
new file mode 100644
index 000000000000..f5099abdffc8
--- /dev/null
+++ b/scp2/source/templates/module_langpack_extensions_templates.sct
@@ -0,0 +1,55 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: module_langpack_extensions_templates.sctp,v $
+ *
+ *  $Revision: 1.0 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2008/11/18 14:50:39 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    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
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Extensions_Sun_T_Pack_Root_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Extensions_Sun_Template_Pack;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
+    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
+End
+
+Module gid_Module_Optional_Extensions_Sun_T_Pack_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Extensions_Sun_T_Pack_Root_<LANGUAGE_>;
+    Sortkey = "50";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Optional_Extensions_Sun_T_Pack_Template;
+    Name = "gid_Module_Optional_Extensions_Sun_T_Pack_<LANGUAGE_>";
+    Description = "gid_Module_Optional_Extensions_Sun_T_Pack_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
diff --git a/scp2/source/templates/module_langpack_root.sct b/scp2/source/templates/module_langpack_root.sct
index 0eb5a5373f55..2db4529c50aa 100755
--- a/scp2/source/templates/module_langpack_root.sct
+++ b/scp2/source/templates/module_langpack_root.sct
@@ -48,17 +48,6 @@ Module gid_Module_Langpack_Resource_<LANGUAGE_>
     Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
 End
 
-Module gid_Module_Langpack_Help_<LANGUAGE_>
-    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
-    Sortkey = "200";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Langpack_Help_Template;
-    Name = "gid_Module_Langpack_Help_<LANGUAGE_>";
-    Description = "gid_Module_Langpack_Help_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
-
 Module gid_Module_Langpack_Fonts_<LANGUAGE_>
     ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
     Sortkey = "300";
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index 50f0aa064d71..a03a55ee944d 100755..100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -87,15 +87,6 @@ End
 
 #endif
 
-#if defined M1310
-File gid_File_Lib_Shlxthdl_Msvcr71
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Shlxthdl;
-    Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG);
-    Styles = (PACKED);
-End
-#endif
-
 File gid_File_Lib_Shlxtmsi
     TXT_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk
index 21eaad714eac..435ed439987d 100755
--- a/scp2/source/winexplorerext/makefile.mk
+++ b/scp2/source/winexplorerext/makefile.mk
@@ -50,10 +50,6 @@ PARFILES= \
         registryitem_winexplorerext.par
 .ENDIF
 
-.IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4"
-SCPDEFS+=-DUSE_SYSTEM_STL
-.ENDIF
-
 ULFFILES= \
         module_winexplorerext.ulf
 
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp
index 6993ba25c1d1..f20edccc59ae 100755..100644
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -38,7 +38,6 @@ Module gid_Module_Optional_Winexplorerext
 			 gid_File_Lib_Shlxthdl64,
 			 gid_File_Lib_OOoFilt,
 			 gid_File_Lib_OOoFilt64,
-             gid_File_Lib_Shlxthdl_Msvcr71,
              gid_File_Lib_Shlxtmsi,
              gid_File_Lib_Reg64,
              gid_File_Tmp_Userinstall_Winexplorerext_Inf);    
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index e3f6c532fc0c..ea6502445a66 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -27,9 +27,9 @@
 
 #include "macros.inc"
 
-STD_LIB_FILE( gid_File_Lib_Swd , swd)
+STD_LIB_FILE(gid_File_Lib_Swd, swd)
 
-SPECIAL_LIB_FILE(gid_File_Lib_Hwpreader, hwp)
+STD_LIB_FILE(gid_File_Lib_Hwpreader, hwp)
 
 File gid_File_Exe_Swriter
     BIN_FILE_BODY;
@@ -55,7 +55,7 @@ End
 
 File gid_File_Help_Swriter_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(swriter);
     Patchfiles = ();
 End
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 0d959dd3f86b..e66214bbc71c 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -49,8 +49,10 @@ Module gid_Module_Prg_Wrt_Bin
     gid_File_Lib_Swui,
     gid_File_Lib_Msword,
     gid_File_Lib_Wpft,
-    gid_File_Lib_Writerfilter,
+    gid_File_Lib_Msworks,
     gid_File_Lib_T602Filter,
+    gid_File_Lib_Writerfilter,
+    gid_File_Lib_Wlwp,
     gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml,
     gid_File_Share_Config_Sofficecfg_Writerweb_Menubar_Xml,
     gid_File_Share_Config_Sofficecfg_Writerglobal_Menubar_Xml,
@@ -61,15 +63,6 @@ Module gid_Module_Prg_Wrt_Bin
     gid_File_Tmp_Userinstall_Wrt_Inf);
 End
 
-// Module gid_Module_Prg_Wrt_Help
-//    MOD_NAME_DESC ( MODULE_PRG_WRT_HELP );
-//    ParentID = gid_Module_Prg_Wrt;
-//    Sortkey = "200";
-//    Default = YES;
-//    Minimal = YES;
-//    Files = (gid_File_Help_Swriter_Zip);
-// End
-
 Module gid_Module_Brand_Prg_Wrt
     PackageInfo = "packinfo_brand.txt";
     Name = "gid_Module_Brand_Prg_Wrt";
@@ -88,8 +81,7 @@ Module gid_Module_Langpack_Writer_Template
     Name = "gid_Module_Langpack_Writer_Template";
     Description = "gid_Module_Langpack_Writer_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Swriter_Zip,
-             gid_File_Res_T602Filter);
+    Files = (gid_File_Res_T602Filter);
 End
 
 Module gid_Module_Prg_Wrt_MSO_Reg
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 903a48af7d44..6e3d9741430b 100755..100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 // MSOLE embedded object in SO7 file format
 RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -265,6 +267,7 @@ RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Versionind
     Value = "opendocument.WriterDocument.1";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -273,6 +276,8 @@ RegistryItem gid_Regitem_Soffice_Starwriterdocument_6
     REG_VALUE_LNG(SO60_TEXT)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -280,6 +285,8 @@ RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Clsid
     Value = "{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -761,6 +768,8 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1
     REG_VALUE_LNG(OO_WRITER)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -768,6 +777,8 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Clsid
     Value = "{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -883,6 +894,53 @@ RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1_Shell_Open_Command
     Styles = ();
 End
 
+// .fodt
+
+RegistryItem gid_Regitem_Fodt_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".fodt\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Fodt_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".fodt\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Fodt_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".fodt\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem__Fodt
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".fodt";
+    Value = "opendocument.WriterDocument.1";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodt
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Root;
+    Name = ".fodt";
+    Value = "opendocument.WriterDocument.1";
+    Styles = (PATCH);
+End
+
+RegistryItem gid_Regitem_Fodt_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".fodt";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.text";
+End
+
 // new ott file extension 
 
 RegistryItem gid_Regitem_Ott_PersistentHandler
@@ -1341,6 +1399,15 @@ RegistryItem gid_Regitem_OpenOffice_WPD_OpenWith_Writer
     Value = " ";
 End
 
+// .WPS
+RegistryItem gid_Regitem_OpenOffice_WPS_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".wps\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "opendocument.WriterDocument.1";
+    Value = " ";
+End
+
 // .HWP
 RegistryItem gid_Regitem_OpenOffice_HWP_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp
index 848b1c707ff7..788a511950a3 100644
--- a/scp2/source/xsltfilter/file_xsltfilter.scp
+++ b/scp2/source/xsltfilter/file_xsltfilter.scp
@@ -82,4 +82,3 @@ File gid_File_Xsl_Export_Xhtml_Table
     Dir = gid_Dir_Share_Xslt_Export_Xhtml;
     Name = "/xslt/export/xhtml/table.xsl";
 End
-
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index c03942844c88..ea4793aa1160 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -44,7 +44,6 @@ SCP1TARGET = setup_osl
 SCP1FILES  = installation_ooo.par          \
              scpaction_ooo.par             \
              directory_ooo.par             \
-             datacarrier_ooo.par           \
              file_ooo.par                  \
              file_extra_ooo.par            \
              file_font_ooo.par             \
@@ -55,6 +54,8 @@ SCP1FILES  = installation_ooo.par          \
              module_hidden_ooo.par         \
              module_langpack.par           \
              module_lang_template.par      \
+             module_helppack.par           \
+             module_help_template.par      \
              profile_ooo.par               \
              profileitem_ooo.par           \
              module_writer.par             \
@@ -73,6 +74,11 @@ SCP1FILES  = installation_ooo.par          \
              module_systemint.par          \
              module_graphicfilter.par      \
              file_graphicfilter.par        \
+             module_extensions.par         \
+             module_extensions_sun_templates.par         \
+             module_extensions_lightproof.par   \
+             directory_extensions.par                     \
+             file_extensions.par           \
              module_testtool.par           \
              file_testtool.par             \
              module_xsltfilter.par         \
@@ -81,6 +87,28 @@ SCP1FILES  = installation_ooo.par          \
              module_python_mailmerge.par   \
              file_python.par               \
              profileitem_python.par        \
+             module_accessories.par
+.IF "$(WITH_EXTRA_GALLERY)" != ""
+SCP1FILES +=                               \
+             module_gallery_accessories.par   \
+             file_gallery_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_SAMPLE)" != ""
+SCP1FILES +=                               \
+             module_samples_accessories.par   \
+             file_samples_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_TEMPLATE)" != ""
+SCP1FILES +=                               \
+             module_templates_accessories.par \
+             file_templates_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_FONT)" != ""
+SCP1FILES +=                               \
+             module_font_accessories.par      \
+             file_font_accessories.par
+.ENDIF
+SCP1FILES +=                               \
              ure_into_ooo.par              \
              ure.par                       \
              module_improvement.par        \
@@ -91,7 +119,7 @@ SCP1FILES  = installation_ooo.par          \
 
 .IF "$(OS)"=="MACOSX" 
 SCP1FILES +=                               \
-             directory_ooo_macosx.par      
+             directory_ooo_macosx.par
 .ENDIF
  
 .IF "$(WITH_BINFILTER)" != "NO"
@@ -163,7 +191,7 @@ SCP1FILES += \
              file_gnome.par
 .ENDIF
 
-.IF "$(ENABLE_KDE)" == "TRUE"
+.IF "$(ENABLE_KDE)" == "TRUE" || "$(ENABLE_KDE4)" == "TRUE"
 SCP1FILES += \
              module_kde.par     \
              file_kde.par
@@ -176,7 +204,8 @@ SCP1FILES += \
 .ENDIF
 
 SCP1FILES += \
-             vclcanvas.par
+             vclcanvas.par \
+             mtfrenderer.par
 
 .IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
 SCP1FILES += cairocanvas.par
@@ -200,7 +229,6 @@ SCP2TARGET = setup_osljre
 SCP2FILES  = installation_ooo.par          \
              scpaction_ooo.par             \
              directory_ooo.par             \
-             datacarrier_ooo.par           \
              file_ooo.par                  \
              file_extra_ooo.par            \
              file_font_ooo.par             \
@@ -211,6 +239,8 @@ SCP2FILES  = installation_ooo.par          \
              module_hidden_ooo.par         \
              module_langpack.par           \
              module_lang_template.par      \
+             module_helppack.par           \
+             module_help_template.par      \
              module_java.par               \
              profile_ooo.par               \
              profileitem_ooo.par           \
@@ -230,6 +260,11 @@ SCP2FILES  = installation_ooo.par          \
              module_systemint.par          \
              module_graphicfilter.par      \
              file_graphicfilter.par        \
+             module_extensions.par         \
+             module_extensions_sun_templates.par         \
+             module_extensions_lightproof.par  \
+             directory_extensions.par                     \
+             file_extensions.par           \
              module_testtool.par           \
              file_testtool.par             \
              module_xsltfilter.par         \
@@ -238,6 +273,28 @@ SCP2FILES  = installation_ooo.par          \
              module_python_mailmerge.par   \
              file_python.par               \
              profileitem_python.par        \
+             module_accessories.par
+.IF "$(WITH_EXTRA_GALLERY)" != ""
+SCP2FILES +=                               \
+             module_gallery_accessories.par   \
+             file_gallery_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_SAMPLE)" != ""
+SCP2FILES +=                               \
+             module_samples_accessories.par   \
+             file_samples_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_TEMPLATE)" != ""
+SCP2FILES +=                               \
+             module_templates_accessories.par \
+             file_templates_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_FONT)" != ""
+SCP2FILES +=                               \
+             module_font_accessories.par      \
+             file_font_accessories.par
+.ENDIF
+SCP2FILES +=                           \
              ure_into_ooo.par              \
              ure.par                       \
              module_improvement.par        \
@@ -316,7 +373,7 @@ SCP2FILES += \
              file_gnome.par
 .ENDIF
 
-.IF "$(ENABLE_KDE)" == "TRUE"
+.IF "$(ENABLE_KDE)" == "TRUE" || "$(ENABLE_KDE4)" == "TRUE"
 SCP2FILES += \
              module_kde.par     \
              file_kde.par
diff --git a/set_soenv.in b/set_soenv.in
index 52fc5f8de118..87ecc7633484 100644..100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1,16 +1,14 @@
-#!@PERL@ -w
+#!@PERL@ -w  # -*- Mode: perl; tab-width: 4; indent-tabs-mode: nil; -*-
 #
 # Program:     set_soenv.in
-# Version:     $Revision: 1.201 $
-# Date:        $Date: 2008-09-05 14:14:29 $
 # Author:      Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland.
 #
 #---------------------------------------------------------------------------
 #---------------------------------------------------------------------------
 # Description:
-# set_soenv generates a file that contains all necessary 
+# set_soenv generates a file that contains all necessary
 # environment variables for the build proces of OpenOffice
-# on Linux, NetBSD, Solaris, Windows NT and Mac OS X/Darwin.
+# on Linux, NetBSD, Solaris, Windows, Mac OS X and iOS.
 #
 # Program steps.
 #
@@ -38,30 +36,28 @@ use File::Basename;
 # IIa. Declaring variables for the system commands, etc.
 #--------------------------------------------------------
 #
-my ( $outfile, $outfile_sh, $bootfile, $newline, $comment,
-     $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps,
-     $wps, $cur_dir, $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW,
+my ( $outfile, $bootfile, $newline, $comment,
+     $compiler, $ds, $ps,
+     $wps, $cur_dir, $par_dir, $I, $L, $tmp, $MINGW,
      $USE_MINGW, $platform,
-     $cygwinver, $empty, $no_ant, $no_stl, $no_gcc_include, 
-     $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os, @mingw_lib_include_paths, $mingw_lib_include_path);
+     $cygwinver, $empty, $no_ant, $no_gcc_include,
+     $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $exportvars, $win_format_var, $perl_os, @mingw_lib_include_paths, $mingw_lib_include_path);
 #
 #-------------------------------------------------
 # IIb. Declaring environment values (constants).
 #-------------------------------------------------
 #
 # Platform independent constant values.
-my @DICTIONARIES = ("DADK", "DEDE", "ENGB", "ENUS", "HUHU", "ITIT", "RURU", "THTH", "SWTZ" );
-my ( $CALL_CDECL, $COMMON_OUTDIR, $BMP_WRITES_FLAG, 
-     $common_build, $NO_REC_RES, $SO3, $SOLAR_JAVA, 
-     $SOLAR_PLUGIN, $UPDATER, $BUILD_DELIVER, $VCL, 
+my ( $CALL_CDECL, $COMMON_OUTDIR,
+     $common_build, $NO_REC_RES, $SO3, $SOLAR_JAVA,
+     $SOLAR_PLUGIN, $UPDATER, $VCL,
      $CC, $CXX,
-     $BUILD_SOSL, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, 
-     $BUILD_SOSL_RELEASE, $RSC_ONCE );
+     $ENABLEUNICODE, $NO_BSYMBOLIC);
 #
 # Platform dependent constant values.
-my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $CVER, $GLIBC, $GUI, $GUIBASE,
+my ( $COM, $ARCH, $CPU, $CPUNAME, $GLIBC, $GUI, $GUIBASE,
       $GVER, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR,
-      $DYNAMIC_CRT, $SET_EXCEPTIONS, $use_shl_versions, $CDPATHx, $JRELIBDIR,
+      $DYNAMIC_CRT, $use_shl_versions, $JRELIBDIR,
       $JRETOOLKITDIR, $JRETHREADDIR,
       $FLIPCMD );
 #
@@ -70,27 +66,26 @@ my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $CVER, $GLIBC, $GUI, $GUIBASE,
 #-------------------------------------------
 #
 # Help variables.
-my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, 
+my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, $DEFIMGS,
      $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
      $SOLARENVINC, $USR_DT, $USR_OPENWIN, $XLIB, $XINC,
-     $CYGWIN_PATH, $language, $dict, $ASM_PATH, $NSIS_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
-     $STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH );
+     $CYGWIN_PATH, $language, @languages, $ASM_PATH, $NSIS_PATH, $PERL_PATH, $CL_X64 );
 
 # Environment variables.
 my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
-     $UPD, $WORK_STAMP, $SOURCE_ROOT_DIR , $gb_REPOS,
-     $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $WORKDIR, $OUTDIR, $SOLARENV, 
-     $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, 
+     $L10N_MODULE, $WITH_POOR_HELP_LOCALIZATIONS,
+     $UPD, $WORK_STAMP, $gb_REPOS, $BUILD_TYPE,
+     $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $WORKDIR, $OUTDIR, $SOLARENV, $SOLARDEFIMG,
      $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH,
-     $MSPDB_PATH, $MIDL_PATH, $CSC_PATH,
-     $PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, 
-     $SOLARINC, $LOCALINI, $FRAMEWORKSHOME, $COMEX, $PERL, 
-     $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME, 
+     $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $SHOWINCLUDES_PREFIX,
+     $PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, $JAVALIB,
+     $SOLARINC, $FRAMEWORKSHOME, $COMEX, $PERL,
+     $COMP_ENV, $ILIB, $JAVAHOME, $WINDOWS_SDK_HOME, $DIRECTXSDK_LIB, $DOTNET_FRAMEWORK_HOME,
      $USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR,
      $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
-     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
-	 $PROEXT, $TARFILE_LOCATION,
-     $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS);
+     $WIN_GNUCOPY, $WIN_TOUCH, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
+     $PROEXT, $TARFILE_LOCATION, $GNUMAKE,
+     $PYTHON, $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS);
 #
 #-------------------------------------------
 # IId. Declaring the aliases.
@@ -105,15 +100,10 @@ my ( $dmake, $build, $build_client, $nmake, $mkout, $deliver, $zipdep );
 #
 # $platform is needed for PathFormat()
 #
-$platform          = `./config.guess`;
-chomp( $platform );
+$platform       = '@host@';
 
 $UPD            = '@UPD@';          # the project's UPD
 $newline        = "\n";             # Perl newline character
-$unsetenv       = "unsetenv";       # c-shell command
-$setenv         = "setenv";         # c-shell command
-$unset          = "unset";          # msdos batch file command
-$set            = "set";            # msdos batch file command
 $ds             = "/";              # directory separator
 $ps             = ":";              # path separator
 $wps            = ":";              # path separator, will be set to ';' for windows later.
@@ -121,30 +111,28 @@ $cur_dir        = ".";              # current directory
 $par_dir        = "..";             # parrent directory
 $I              = " -I";            # include search path
 $L              = " -L";            # library search path
-$D              = " -D";            # define search path
 $empty          = "";               # used as argument
-$no_stl         = "NO_STLPORT4";    # possible argument
 $warnfile       = "warn";           # logfile configure warnings.
 $Warning        = "";               # container for warning messages
-$STLPORT4       = '@STLPORT4@';     # Location of STLport4
 $SYSTEM_PYTHON	= '@SYSTEM_PYTHON@';
+if ($SYSTEM_PYTHON eq "NO") {
+    $PYTHON              = "python";
+}
 $SYSTEM_MOZILLA = '@SYSTEM_MOZILLA@';
 $JDK 		= '@JDK@';
 $JAVAFLAGS 		= '@JAVAFLAGS@';
-$MINGW          = '@WITH_MINGWIN@'; # use MinGW for Windows build
+$MINGW          = '@WITH_MINGW@';    # use MinGW for Windows build
 $USE_MINGW      = '@USE_MINGW@';     # use MinGW in cygwin or pure-mingw
-if ( $MINGW eq "yes" )
-{ $CC             = '@CC@';           # C compiler
-  $CXX            = '@CXX@'; }        # C++ compiler
-else
-{ $CC             = PathFormat('@CC@');           # C compiler
-  $CXX            = PathFormat('@CXX@'); }        # C++ compiler
+$CC             = '@CC@';            # C compiler
+$CXX            = '@CXX@';           # C++ compiler
 $MOZILLA_VERSION	= '@MOZILLA_VERSION@'; # mozilla version to use to build mozilla
 $MOZILLA_TOOLKIT	= '@MOZILLA_TOOLKIT@'; # GUI toolkit to use to build mozilla
 $FLIPCMD        = "";               # Flip '/' to '\' wrapper (only for winnt)
 $GLIBC          = "";               # Whether the platform uses glibc
 $PROEXT         = "@PROEXT@";
 $EPM_FLAGS	= "";
+$CL_X64 = '@CL_X64@';
+$GNUMAKE        = "@GNUMAKE@";
 
 #
 #--------------------------------------------------------------------
@@ -155,7 +143,7 @@ $EPM_FLAGS	= "";
 # , $Warning.
 AddWarning( "configure", "" );
 #
-print ("Setting up the environment for building OpenOffice.org $newline");
+print ("Setting up the environment for building LibreOffice $newline");
 #
 #--------------------------------------------------
 # V. Setting the environment variables/values.
@@ -177,11 +165,7 @@ chomp( $oldPATH );                  # cut off new line
 # C. Setting the constant values.
 #
 # Setting platform independent constant values.
-print "Setting platform independent values... ";
-# NB: Language options now set at 'ToFile' stage. 
-$BMP_WRITES_FLAG      = "TRUE";
-$BUILD_SOSL_RELEASE   = "TRUE";
-$RSC_ONCE             = "TRUE";
+# NB: Language options now set at 'ToFile' stage.
 $CALL_CDECL           = "TRUE";
 $COMMON_OUTDIR        = "";
 $common_build         = "";
@@ -190,25 +174,22 @@ $SO3                  = "TRUE";
 $SOLAR_JAVA           = "@SOLAR_JAVA@";
 $SOLAR_PLUGIN         = "TRUE";
 $UPDATER              = "YES";
-$BUILD_DELIVER        = "true";
 $VCL                  = "TRUE";
-$BUILD_SOSL           = "true";
 $ENABLEUNICODE        = "TRUE";
-$NEW_JAR_PACK         = "TRUE";
 $NO_BSYMBOLIC         = "TRUE";
 $comment              = "#";           # UNIX script comment character
 $TARFILE_LOCATION = "@TARFILE_LOCATION@"; # where to find tarballs with external sources
 
 # Setting platform dependent constant values.
-if ( $platform =~ m/solaris/ ) 
+if ( $platform =~ m/solaris/ )
 {     print "Setting Solaris specific values... ";
    if ($platform =~ m/^i[3456]86/)
-   {  
+   {
       if ( $CC =~ "gcc") {
-         $outfile        = "SolarisX86GccEnv.Set";
+         $outfile        = "SolarisX86GccEnv.Set.sh";
          $OUTPATH        = "unxsogi";
       } else {
-         $outfile        = "SolarisX86Env.Set";
+         $outfile        = "SolarisX86Env.Set.sh";
          $OUTPATH        = "unxsoli4";
       }
       $CPU            = "I";
@@ -221,10 +202,10 @@ if ( $platform =~ m/solaris/ )
    else
    {
       if ( $CC =~ "gcc") {
-         $outfile        = "SolarisSparcGccEnv.Set"; 
+         $outfile        = "SolarisSparcGccEnv.Set.sh";
          $OUTPATH        = "unxsogs";
       } else {
-         $outfile        = "SolarisSparcEnv.Set"; 
+         $outfile        = "SolarisSparcEnv.Set.sh";
          $OUTPATH        = "unxsols4";
       }
       $CPU            = "S";
@@ -234,16 +215,8 @@ if ( $platform =~ m/solaris/ )
 	  $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
    }
 
-   if ( $CC =~ "gcc") {
-       $COM            = "GCC";
-       $CVER           = "C300";
-   } else {
-       $COM            = "C52";
-       $CVER           = "C52";
-       $COMEX          = 4;
-   }
-   $BIG_SVX        = "TRUE";
-   $COMPATH        = '@COMPATH@'; 
+   $COM            = "GCC";
+   $COMPATH        = '@COMPATH@';
    $GUI            = "UNX";
    $GUIBASE        = "unx";
    $GVER           = "VCL";
@@ -251,35 +224,37 @@ if ( $platform =~ m/solaris/ )
    $OS             = "SOLARIS";
    $PATH_SEPERATOR = $ps;
 }
-elsif ( $platform =~ m/netbsd/ ) 
+elsif ( $platform =~ m/netbsd/ )
 {
-#Set platform specific values: 
+#Set platform specific values:
    if ($platform =~ m/^i[3456]86/)
    {  print "Setting NetBSD x86 specific values... ";
-      $outfile        = "NetBSDX86Env.Set"; 
       $CPU            = "I";
       $CPUNAME        = "INTEL";
-      $OUTPATH        = "unxbsdi";
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
    }
+   elsif ($platform =~ m/^x86_64/)
+   {  print "Setting NetBSD x86-64 specific values... ";
+      $CPU            = "X";
+      $CPUNAME        = "X86_64";
+      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
+      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."client";
+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+   }
    elsif ($platform =~ m/^sparc/)
    {  print "Setting NetBSD Sparc specific values... ";
-      $outfile        = "NetBSDSparcEnv.Set"; 
       $CPU            = "S";
       $CPUNAME        = "SPARC";
-      $OUTPATH        = "unxbsds";
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."client";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
    }
    elsif ($platform =~ m/powerpc/)
    {  print "Setting NetBSD PPC specific values... ";
-      $outfile        = "NetBSDPPCEnv.Set"; 
       $CPU            = "P";
       $CPUNAME        = "POWERPC";
-      $OUTPATH        = "unxbsdppc";
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
@@ -288,27 +263,23 @@ elsif ( $platform =~ m/netbsd/ )
    { print "Unsupported NetBSD architecture: $platform \n";
      exit 1;
    }
-   #Conditional setting depending on gcc3:
-      $CVER           = "C300";
-      $OUTPATH        = $OUTPATH."2";
    # General NetBSD settings:
-      $BIG_SVX        = "TRUE";
       $COM            = "GCC";
-      $COMPATH        = '@COMPATH@'; 
+      $COMPATH        = '@COMPATH@';
       $GUI            = "UNX";
       $GUIBASE        = "unx";
       $GVER           = "VCL";
-      $INPATH         = $OUTPATH.$PROEXT;
       $OS             = "NETBSD";
       $PATH_SEPERATOR = $ps;
+      $OUTPATH        = "unxnbsd";
+      $outfile        = "NetBSDEnv.Set.sh";
+      $INPATH         = $OUTPATH.$PROEXT;
 }
-elsif ( $platform =~ m/kfreebsd/ ) 
+elsif ( $platform =~ m/kfreebsd/ )
 {
 # General GNU/kFreeBSD settings:
-      $CVER           = "C341";
-      $BIG_SVX        = "TRUE";
       $COM            = "GCC";
-      $COMPATH        = '@COMPATH@'; 
+      $COMPATH        = '@COMPATH@';
       $GLIBC          = "2REDHAT60";
       $GUI            = "UNX";
       $GUIBASE        = "unx";
@@ -316,14 +287,14 @@ elsif ( $platform =~ m/kfreebsd/ )
       $OS             = "LINUX";
       $PATH_SEPERATOR = $ps;
 
-#Set platform specific values: 
+#Set platform specific values:
    if ($platform =~ m/^i[3456]86/)
    {  print "Setting GNU/kFreeBSD x86 specific values... ";
-      $outfile        = "GNUkFreeBSDX86Env.Set"; 
+      $outfile        = "GNUkFreeBSDX86Env.Set.sh";
       $CPU            = "I";
       $CPUNAME        = "INTEL";
       $OUTPATH        = "unxkfgi6";
-      
+
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
@@ -331,7 +302,7 @@ elsif ( $platform =~ m/kfreebsd/ )
    }
    elsif ($platform =~ m/^x86_64/)
    {  print "Setting GNU/kFreeBSD x86-64 specific values... ";
-      $outfile        = "GNUkFreeBSDX86-64Env.Set";
+      $outfile        = "GNUkFreeBSDX86-64Env.Set.sh";
       $CPU            = "X";
       $CPUNAME        = "X86_64";
       $OUTPATH        = "unxkfgx6";
@@ -343,11 +314,9 @@ elsif ( $platform =~ m/kfreebsd/ )
 
    $INPATH         = $OUTPATH.$PROEXT;
 }
-elsif ( $platform =~ m/freebsd/ ) 
-{     $BIG_SVX        = "TRUE";
-      $COM            = "GCC";
-      $COMPATH        = '@COMPATH@'; 
-      $CVER           = "C300";
+elsif ( $platform =~ m/freebsd/ )
+{     $COM            = "GCC";
+      $COMPATH        = '@COMPATH@';
       $GUI            = "UNX";
       $GUIBASE        = "unx";
       $GVER           = "VCL";
@@ -357,7 +326,7 @@ elsif ( $platform =~ m/freebsd/ )
    if ($platform =~ m/^amd64/)
    {  my ( $JAVA_OS );
       print "Setting FreeBSD AMD64 specific values... ";
-      $outfile        = "FreeBSDAMDEnv.Set";
+      $outfile        = "FreeBSDAMDEnv.Set.sh";
       $CPU            = "X";
       $CPUNAME        = "X86_64";
       $OUTPATH        = "unxfbsdx";
@@ -376,7 +345,7 @@ elsif ( $platform =~ m/freebsd/ )
    }
    elsif ($platform =~ m/^i386/)
    {  print "Setting FreeBSD x86 specific values... ";
-      $outfile        = "FreeBSDX86Env.Set";
+      $outfile        = "FreeBSDX86Env.Set.sh";
       $CPU            = "I";
       $CPUNAME        = "INTEL";
       $OUTPATH        = "unxfbsdi";
@@ -388,18 +357,47 @@ elsif ( $platform =~ m/freebsd/ )
    {  print "Unsupported FreeBSD architecture: $platform \n";
          exit 1;
    }
-   if( @GCCVER@ >= 30401 ) {
-      $CVER        = "C341";
+      $INPATH         = $OUTPATH.$PROEXT;
+}
+elsif ( $platform =~ m/openbsd/ )
+{     $COM            = "GCC";
+      $COMPATH        = '@COMPATH@';
+      $GUI            = "UNX";
+      $GUIBASE        = "unx";
+      $GVER           = "VCL";
+      $OS             = "OPENBSD";
+      $PATH_SEPERATOR = $ps;
+      $OSVERSION      = '@OSVERSION@';
+      $OUTPATH        = "unxobsd";
+      $outfile        = "OpenBSDEnv.Set.sh";
+   if ($platform =~ m/^(amd64|x86_64)/)
+   {
+      print "Setting OpenBSD AMD64 specific values... ";
+      $CPU            = "X";
+      $CPUNAME        = "X86_64";
+      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
+      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+   }
+   elsif ($platform =~ m/^i386/)
+   {  print "Setting OpenBSD x86 specific values... ";
+      $CPU            = "I";
+      $CPUNAME        = "INTEL";
+      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+   }
+   else
+   {  print "Unsupported OpenBSD architecture: $platform \n";
+         exit 1;
    }
       $INPATH         = $OUTPATH.$PROEXT;
-} 
-elsif ( $platform =~ m/linux/ ) 
+}
+elsif ( $platform =~ m/linux/ )
 {
 # General Linux settings:
-      $CVER           = "C341";
-      $BIG_SVX        = "TRUE";
       $COM            = "GCC";
-      $COMPATH        = '@COMPATH@'; 
+      $COMPATH        = '@COMPATH@';
       $GLIBC          = "2REDHAT60";
       $GUI            = "UNX";
       $GUIBASE        = "unx";
@@ -407,13 +405,13 @@ elsif ( $platform =~ m/linux/ )
       $OS             = "LINUX";
       $PATH_SEPERATOR = $ps;
 
-#Set platform specific values: 
+#Set platform specific values:
    if ($platform =~ m/^i[3456]86/)
    {  print "Setting Linux x86 specific values... ";
-      $outfile        = "LinuxX86Env.Set"; 
+      $outfile        = "LinuxX86Env.Set.sh";
       $CPU            = "I";
       $CPUNAME        = "INTEL";
-      
+
       if ($JDK =~ m/^[Ii][Bb][Mm]/)
       { $JRELIBDIR     = '$JAVA_HOME'.$ds."jre".$ds."bin";
         $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
@@ -424,7 +422,7 @@ elsif ( $platform =~ m/linux/ )
         $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."jrockit";
         $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; }
 
-      else {      
+      else {
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
       # has both server and client
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
@@ -435,7 +433,7 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^x86_64/)
    {  print "Setting Linux x86-64 specific values... ";
-      $outfile        = "LinuxX86-64Env.Set";
+      $outfile        = "LinuxX86-64Env.Set.sh";
       $CPU            = "X";
       $CPUNAME        = "X86_64";
       $OUTPATH        = "unxlngx6";
@@ -447,7 +445,7 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^ia64/)
    {  print "Setting Linux ia64 specific values... ";
-      $outfile        = "LinuxIA64Env.Set";
+      $outfile        = "LinuxIA64Env.Set.sh";
       $CPU            = "A";
       $CPUNAME        = "IA64";
       $OUTPATH        = "unxlnga";
@@ -456,9 +454,9 @@ elsif ( $platform =~ m/linux/ )
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ia64".$ds."native_threads";
    }
    elsif ($platform =~ m/^sparc/)
- 
+
    {  print "Setting Linux Sparc specific values... ";
-      $outfile        = "LinuxSparcEnv.Set"; 
+      $outfile        = "LinuxSparcEnv.Set.sh";
       $CPU            = "S";
       $CPUNAME        = "SPARC";
       $OUTPATH        = "unxlngs";
@@ -470,7 +468,7 @@ elsif ( $platform =~ m/linux/ )
    {
       if (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8')) {
          print "Setting Linux PPC64 specific values... ";
-         $outfile = "LinuxPPC64Env.Set"; 
+         $outfile = "LinuxPPC64Env.Set.sh";
          $OUTPATH = "unxlngppc64";
          $CPUNAME = "POWERPC64";
 
@@ -479,10 +477,16 @@ elsif ( $platform =~ m/linux/ )
             $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."client";
             $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
          }
+	 # OpenJDK
+	 elsif ($JDK =~ m/sun/) {
+	    $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64";
+	    $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."server";
+	    $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
+	 }
       }
       else {
          print "Setting Linux PPC specific values... ";
-         $outfile = "LinuxPPCEnv.Set"; 
+         $outfile = "LinuxPPCEnv.Set.sh";
          $OUTPATH = "unxlngppc";
          $CPUNAME = "POWERPC";
 
@@ -510,14 +514,14 @@ elsif ( $platform =~ m/linux/ )
    {
       if (($platform =~ m/^s390x/) && ('@SIZEOF_LONG@' eq '8')) {
          print "Setting Linux zSeries specific values... ";
-         $outfile        = "LinuxS390XEnv.Set";
+         $outfile        = "LinuxS390XEnv.Set.sh";
          $CPUNAME        = "S390X";
 	 $ARCH           = "s390x";
          $OUTPATH        = "unxlngs390x";
       }
       else {
          print "Setting Linux S/390 specific values... ";
-         $outfile        = "LinuxS390Env.Set";
+         $outfile        = "LinuxS390Env.Set.sh";
          $CPUNAME        = "S390";
 	 $ARCH           = "s390";
          $OUTPATH        = "unxlngs390";
@@ -529,7 +533,7 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^m68k/)
    {  print "Setting Linux m68k specific values... ";
-      $outfile        = "LinuxM68KEnv.Set";
+      $outfile        = "LinuxM68KEnv.Set.sh";
       $CPU            = "6";
       $CPUNAME        = "M68K";
       $OUTPATH        = "unxlngm68k";
@@ -539,7 +543,7 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^hppa/)
    {  print "Setting Linux hppa specific values... ";
-      $outfile        = "LinuxHPPAEnv.Set";
+      $outfile        = "LinuxHPPAEnv.Set.sh";
       $CPU            = "H";
       $CPUNAME        = "HPPA";
       $OUTPATH        = "unxlnghppa";
@@ -548,9 +552,9 @@ elsif ( $platform =~ m/linux/ )
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."hppa".$ds."native_threads";
       $EPM_FLAGS      = "-a hppa";
    }
-   elsif ($platform =~ m/^alpha/) 
+   elsif ($platform =~ m/^alpha/)
    {  print "Setting Linux Alpha specific values... ";
-      $outfile        = "LinuxAlphaEnv.Set"; 
+      $outfile        = "LinuxAlphaEnv.Set.sh";
       $CPU            = "L";
       $CPUNAME        = "AXP";
       $OUTPATH        = "unxlngaxp";
@@ -560,7 +564,7 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^arm.*?l-/)
    {  print "Setting Linux ARM specific values... ";
-      $outfile        = "LinuxARMEnv.Set"; 
+      $outfile        = "LinuxARMEnv.Set.sh";
       $CPU            = "R";
       $CPUNAME        = "ARM";
       $OUTPATH        = "unxlngr";
@@ -569,9 +573,22 @@ elsif ( $platform =~ m/linux/ )
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
       $EPM_FLAGS      = "-a arm";
    }
+   elsif ($platform =~ m/^arm.*-androideabi/)
+   {  print "Setting Android ARM specific values... ";
+      $GUIBASE        = "android";
+      $OS             = "ANDROID";
+      $outfile        = "AndroidARMEnv.Set.sh";
+      $CPU            = "R";
+      $CPUNAME        = "ARM";
+      $OUTPATH        = "unxandr";
+      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm";
+      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."server";
+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
+      $EPM_FLAGS      = "-a arm";
+   }
    elsif ($platform =~ m/^mips/)
    {  print "Setting Linux MIPS specific values... ";
-      $outfile        = "LinuxMIPSEnv.Set"; 
+      $outfile        = "LinuxMIPSEnv.Set.sh";
       $CPU            = "M";
       $CPUNAME        = "GODSON";
       $OUTPATH        = "unxlngmips";
@@ -606,195 +623,166 @@ elsif ( $platform =~ m/linux/ )
       	$JRETOOLKITDIR  = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."client"; # Lemote
       } else {
       	$JRETOOLKITDIR  = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."server";
-      }  
+      }
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."native_threads";
    }
 
 
    $INPATH         = $OUTPATH.$PROEXT;
 }
-elsif ( $platform =~ m/osf1/ ) 
-{     print "Setting Tru64 specific values... ";
-      $outfile        = "Tru64AlphaEnv.Set"; 
-      $BIG_SVX        = "TRUE";
-      $COM            = "CXX";
-      $COMPATH        = '@COMPATH@'; 
-      $CPU            = "A";
-      $CPUNAME        = "ALPHA_";
-      $CVER           = "C62";
-      $GUI            = "UNX";
-      $GUIBASE        = "unx";
-      $GVER           = "VCL";
-      $OUTPATH        = "unxt64";
-      $INPATH         = $OUTPATH.$PROEXT;
-      $OS             = "TRU64";
-      $PATH_SEPERATOR = $ps;
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."client";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
-} 
-elsif ( $platform =~ m/cygwin/ ) 
+elsif ( $platform =~ m/cygwin|mingw32/ )
 {
       $MSPDB_PATH     = PathFormat('@MSPDB_PATH@');
       $MIDL_PATH      = PathFormat('@MIDL_PATH@');
       $CSC_PATH       = PathFormat('@CSC_PATH@');
-      $PSDK_HOME      = PathFormat('@PSDK_HOME@');
+      $SHOWINCLUDES_PREFIX = '@SHOWINCLUDES_PREFIX@';
+      $WINDOWS_SDK_HOME      = PathFormat('@WINDOWS_SDK_HOME@');
       $DIRECTXSDK_LIB = PathFormat('@DIRECTXSDK_LIB@');
       $USE_DIRECTX5   = "";
-      $FRAME_HOME     = PathFormat('@FRAME_HOME@');
-      $USE_NEW_SDK    = "TRUE";
+      $DOTNET_FRAMEWORK_HOME = PathFormat('@DOTNET_FRAMEWORK_HOME@');
       $CPUNAME        = "INTEL";
+      $CPUNAME        = "X86_64" if $CL_X64;
       $CPU            = "I";
+      $CPU            = "X" if $CL_X64;
       $GUI            = "WNT";
       $GUIBASE        = "WIN";
       $GVER           = "NT351";
       $OS             = "WNT";
       $DYNAMIC_CRT    = "TRUE";
-      $SET_EXCEPTIONS = "TRUE";
       $use_shl_versions = "TRUE";
-      $wps = ';'; # Windows style path seperator
+      $wps = ';' if '@build_os@' eq 'cygwin'; # Windows style path seperator
   if ( $MINGW eq "yes" )
-  {
-      print "Setting Windows NT cygwin MinGW specific values... ";
+  {   print "Setting Windows (MinGW) specific values... ";
+      # At the moment this implies the use of tcsh
+      # WTF does that mean?
       $FLIPCMD        = "slfl.pl";
       $PATH_SEPERATOR = ';';
-      $outfile        = "winmingw.set"; 
+      $PATH_SEPERATOR = ':' if '@build_os@' ne 'cygwin';
+      $outfile        = "WindowsMinGWEnv.Set.sh";
       $COMPATH        = PathFormat('@COMPATH@/bin');
       $COMPATH        =~ s/\/bin$//i;
       $COM            = "GCC";
-      $CVER           = "C341";
       $OUTPATH        = "wntgcci";
+      $OUTPATH        = "wntgccx" if $platform =~ m/^x86_64/;
       $INPATH         = $OUTPATH.$PROEXT;
-      $ATL_INCLUDE = '$SOLARVER'.$ds.'$INPATH'.$ds."inc".$ds."external".$ds."mingw".$ds."include".$ds."atl". " ".'$PSDK_HOME'.$ds."include".$ds."atl";
+      $ATL_INCLUDE = '$SOLARVER'.$ds.'$INPATH'.$ds."inc".$ds."external".$ds."mingw".$ds."include".$ds."atl". " ".'$WINDOWS_SDK_HOME'.$ds."include".$ds."atl";
   }
   else # The MSVC section starts here
-  {   $outfile        = "winenv.set";
+  {   print "Setting Windows (MSVC) specific values... ";
+      $outfile        = "WindowsMSVCEnv.Set.sh";
+      # Temporary hack: remove the old winenv.set.sh to avoid confusion... drop after a few weeks
+      unlink('winenv.set.sh');
       $COMPATH        = PathFormat('@COMPATH@');
       $COM            = "MSC";
       $OUTPATH        = "wntmsci@COMEX@";
+      $OUTPATH        = "wntmscx@COMEX@" if $CL_X64;
       $INPATH         = $OUTPATH.$PROEXT;
       $COMEX          = '@COMEX@';
-      if ( "@COMEX@" eq "10" ) { # .NET 2003 needs M1310
-          $CVER        = "M1310";
+      if ( "@DISABLE_ACTIVEX@" ) {
+          $ATL_LIB     = $WINDOWS_SDK_HOME.$ds."lib"; # Doesn't exist for VSE
+          $ATL_INCLUDE = $WINDOWS_SDK_HOME.$ds."include".$ds."atl";
+          $MFC_LIB     = $WINDOWS_SDK_HOME.$ds."lib"; # Doesn't exist for VSE
+          $MFC_INCLUDE = $WINDOWS_SDK_HOME.$ds."include".$ds."mfc";
+      } else {
           $ATL_LIB     = $COMPATH.$ds."atlmfc".$ds."lib";
           $ATL_INCLUDE = $COMPATH.$ds."atlmfc".$ds."include";
-          $MFC_LIB     = "";
-          $MFC_INCLUDE = "";
-      } elsif ( "@COMEX@" ge "11" ) { # .NET 2005 needs M1400
-	  if ( "@COMEX@" eq "11" ) {
-	      $CVER        = "M1400";
-	  } elsif ( "@COMEX@" eq "12" ) {
-	      $CVER        = "M1500";
-	  } else {                   # Unsupported
-	      die "Unsupported value for COMEX variable.\n";
-	  }
-          if ( "@DISABLE_ACTIVEX@" ) {
-              $ATL_LIB     = $PSDK_HOME.$ds."lib"; # Doesn't exist for VSE
-              $ATL_INCLUDE = $PSDK_HOME.$ds."include".$ds."atl";
-              $MFC_LIB     = $PSDK_HOME.$ds."lib"; # Doesn't exist for VSE
-              $MFC_INCLUDE = $PSDK_HOME.$ds."include".$ds."mfc";
-          } else {
-              $ATL_LIB     = $COMPATH.$ds."atlmfc".$ds."lib";
-              $ATL_INCLUDE = $COMPATH.$ds."atlmfc".$ds."include";
-              $MFC_LIB     = $COMPATH.$ds."atlmfc".$ds."lib";
-              $MFC_INCLUDE = $PSDK_HOME.$ds."include".$ds."mfc";
-          }
+          $MFC_LIB     = $COMPATH.$ds."atlmfc".$ds."lib";
+          $MFC_INCLUDE = $WINDOWS_SDK_HOME.$ds."include".$ds."mfc";
       }
-	  print "Setting W32 build with bash shell specific values... ";
-	  # No speacial treatment for CC an CXX anymore.
-	  $FLIPCMD        = "slfl.pl";
-	  $PATH_SEPERATOR = ';';
-  }
-}
-elsif ( $platform =~ m/os2/ ) 
-{ 
-      $COMPATH        = PathFormat('@COMPATH@');
-      $MSPDB_PATH     = PathFormat('@MSPDB_PATH@');
-      $MIDL_PATH      = PathFormat('@MIDL_PATH@');
-      $CSC_PATH       = PathFormat('@CSC_PATH@');
-      $PSDK_HOME      = PathFormat('@PSDK_HOME@');
-      $FRAME_HOME     = PathFormat('@FRAME_HOME@');
-      $USE_NEW_SDK    = "TRUE";
-      $CPUNAME        = "INTEL";
-      $CPU            = "I";
-      $GUI            = "OS2";
-      $GUIBASE        = "os2";
-      $GVER           = "VCL";
-      $OS             = "OS2";
-      $DYNAMIC_CRT    = "TRUE";
-      $SET_EXCEPTIONS = "TRUE";
-      $use_shl_versions = "TRUE";
-  {
-      print "Setting OS/2 gcc 3.3.5 specific values... \n";
-      $outfile        = "os2env.set";
-      $COM            = "GCC";
-      $CVER           = "C300";
-      $OUTPATH        = "os2gcci";
-      $INPATH         = $OUTPATH.$PROEXT;
-      $COMEX          = '@COMEX@';
-
-  {   print "Setting OS/2 with 4OS2 specific values... ";
-      # Change path to lower case.
-      $COMPATH        = lc $COMPATH;
+      if ($CL_X64) {
+          $ATL_LIB     .= $ds."amd64";
+          $MFC_LIB     .= $ds."amd64";
+      }
+      # No speacial treatment for CC an CXX anymore.
+      $FLIPCMD        = "slfl.pl";
       $PATH_SEPERATOR = ';';
-      $ps = ';';
-      $wps = ';'; # Windows style path seperator
-  }
-
   }
 }
-elsif ( $platform =~ m/darwin/ ) 
-{     print "Setting Mac OS X/Darwin specific values... ";
-      $BIG_SVX        = "TRUE";
-      $COM            = "GCC";
-      $COMPATH        = '@COMPATH@'; 
-      if ($platform =~ m/^i[3456]86/)
+elsif ( $platform =~ m/darwin/ )
+{     $COM            = "GCC";
+      $COMPATH        = '@COMPATH@';
+      if ($platform =~ m/^arm/)
       {
-          print "Setting values for Mac OS X/Darwin on x86... ";
-          $outfile        = "MacOSXX86Env.Set"; 
-          $CPU            = "I";
-          $CPUNAME        = "INTEL";
-          $OUTPATH        = "unxmacxi";
+          print "Setting values for iOS... ";
+          $outfile        = "iOSEnv.Set.sh";
+          $CPU            = "R";
+          $CPUNAME        = "ARM";
+          $OUTPATH        = "unxiosr";
+          $GUI            = "UNX";
+          $OS             = "IOS";
+          $GUIBASE        = "cocoatouch";
       }
       elsif ($platform =~ m/^powerpc/)
       {
           print "Setting values for Mac OS X/Darwin on PowerPC... ";
-          $outfile        = "MacOSXPPCEnv.Set"; 
+          $outfile        = "MacOSXPPCEnv.Set.sh";
           $CPU            = "P";
           $CPUNAME        = "POWERPC";
           $OUTPATH        = "unxmacxp";
+          $OS             = "MACOSX";
+          $GUI            = "UNX";
       }
-      if (@GCCVER@ >= 30401) {
-	  $CVER           = "C341";
-      } else {
-	  $CVER           = "C300";
+      else
+      {
+          print "Setting values for Mac OS X/Darwin on default x86... ";
+          $outfile        = "MacOSXX86Env.Set.sh";
+          $CPU            = "I";
+          $CPUNAME        = "INTEL";
+          $OUTPATH        = "unxmacxi";
+          $OS             = "MACOSX";
+          $GUI            = "UNX";
       }
-      $GUI            = "UNX";
       $GVER           = "VCL";
       $INPATH         = $OUTPATH.$PROEXT;
-      $OS             = "MACOSX";
       $PATH_SEPERATOR = $ps;
-      # GUIBASE is set below; may be "aqua" or "unx".
+      # GUIBASE is set below for Mac OS X; may be "aqua" or "unx".
 }
-elsif ( $platform =~ m/aix/ )
+elsif ( $platform =~ m/dragonfly/ )
 {
-   if( $platform !~ m/^powerpc/ )
-   {
-	print "\nAIX has only been ported and tested on powerpc\n";
-	AddWarning( "set_soenv", "Platform $platform has not been tested");
+   if ($platform =~ m/^i386/)
+   {  print "Setting DragonFly i386 specific values... ";
+      $CPU            = "I";
+      $CPUNAME        = "INTEL";
+      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+   }
+   elsif ($platform =~ m/^x86_64/)
+   {  print "Setting DragonFly x86-64 specific values... ";
+      $CPU            = "X";
+      $CPUNAME        = "X86_64";
+      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
+      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
    }
+   else
+   { print "Unsupported DragonFly architecture: $platform \n";
+     exit 1;
+   }
+   # General DragonFly settings:
+      $COM            = "GCC";
+      $COMPATH        = '@COMPATH@';
+      $GUI            = "UNX";
+      $GUIBASE        = "unx";
+      $GVER           = "VCL";
+      $OS             = "DRAGONFLY";
+      $PATH_SEPERATOR = $ps;
+      $OUTPATH        = "unxdfly";
+      $outfile        = "DragonFlyEnv.Set.sh";
+      $INPATH         = $OUTPATH.$PROEXT;
+}
+elsif ( $platform =~ m/aix/ )
+{
    print "Setting AIX PPC specific values... ";
-   $outfile        = "aixPPCEnv.Set"; 
+   $outfile        = "aixPPCEnv.Set.sh";
    $CPU            = "P";
    $CPUNAME        = "POWERPC";
-   $OUTPATH        = "unxlngppc";
+   $OUTPATH        = "unxaigppc";
    $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
    $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
    $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
-   $BIG_SVX        = "TRUE";
    $COM            = "GCC";
-   $CVER           = "C300";
-   $COMPATH        = '@COMPATH@'; 
+   $COMPATH        = '@COMPATH@';
    $GUI            = "UNX";
    $GUIBASE        = "unx";
    $GVER           = "VCL";
@@ -803,8 +791,7 @@ elsif ( $platform =~ m/aix/ )
    $PATH_SEPERATOR = $ps;
 }
 else {
-	print "\nset_soenv:  Cannot figure out what platform you are running\n";
-	print "For $platform.\n";
+	print "\nset_soenv:  Cannot recognize the platform you are building for: $platform.\n";
 	exit 1;
 }
 print "done\n";
@@ -813,37 +800,22 @@ print "done\n";
 # D. Gathering directory information from the user.
 #
 # If the directory does not exist something is strange.
-# 1. OpenOffice.org build home directory.
+# 1. LibreOffice build home directory.
 chomp($SRC_ROOT  = `pwd`);
 $SRC_ROOT =~ s/\/config_office//;
 $SRC_ROOT = PathFormat($SRC_ROOT);
 CheckPathExist( $SRC_ROOT );
 
 
-#-----------------------------------------------------------------------------------------------------
-# Copy top level makefile from config_office/ to $SRC_ROOT
-#-----------------------------------------------------------------------------------------------------
-if (! -e "makefile.rc")
-{  AddWarning( "set_soenv", "makefile.rc not found in config_office/. Could not copy to SRC_ROOT." );
-}
-else
-{  `cp -f makefile.rc $SRC_ROOT/makefile.mk`;
-}
-
 # 2. Java home directory.
 # JAVA_HOME as argument from autoconf.
 $JAVA_HOME = PathFormat('@JAVA_HOME@') ;
 
-if ( $platform =~ m/cygwin|os2/ ) {
+if ( $platform =~ m/cygwin/ ) {
    $JAVA_HOME =~ s/[\s\/]+$//;	# remove trailing \n or \/ if there is any.
 }
-# 3. shell path.
-$OOO_SHELL = '@SHELLPATH@'."\/bash";
-
-if ( '@STLPORT4@' eq $no_stl )
-{
-   $STLPORT4 = "$no_stl";
-}
+# 3. bash path.
+$OOO_SHELL = '@BASH@';
 
 # ml.exe assembler path for Windows users.
 if ($platform =~ m/cygwin/)
@@ -887,8 +859,7 @@ else
 #
 # E. Determining the envionment values based on the information
 #    that was gathered earlier on.
-#
-print "Setting the environment variables... ";
+
 $USR                  = $ds."usr";
 $ETC                  = $ds."etc";
 $BIN                  = $ds."bin";
@@ -896,10 +867,12 @@ $LIB                  = $ds."lib";
 $LIB64                = $ds."lib";
 $LIB64               .= "64"
 if ($platform =~ m/x86_64-.*-linux/);
-$LIB64               .= "64" 
+$LIB64               .= "64"
 if (($platform =~ m/powerpc64-.*-linux/) && ('@SIZEOF_LONG@' eq '8'));
-$LIB64               .= "64" 
+$LIB64               .= "64"
 if (($platform =~ m/s390x-.*-linux/) && ('@SIZEOF_LONG@' eq '8'));
+$LIB64               .= $ds."x64"
+if ($platform =~ m/cygwin/);
 $INC                  = $ds."inc";
 $INCLUDE              = $ds."include";
 $DEV                  = $ds."dev";
@@ -907,6 +880,7 @@ $OPT                  = $ds."opt";
 $LOCAL                = $ds."local";
 $SOLENV               = $ds."solenv";
 $SOLVER               = $ds."solver";
+$DEFIMGS              = $ds."default_images";
 $CONFIG               = $ds."config";
 $USR_BIN              = $USR.$BIN;
 $USR_LIB              = $USR.$LIB64;
@@ -916,26 +890,10 @@ $USR_OPENWIN          = $USR.$ds."openwin";
 $USR_DT               = $USR.$ds."dt";
 $COMMON_BUILD_TOOLS   = '$SRC_ROOT'.$ds."external".$ds."common";
 
-# Generate alternate output file for sh?
-$outfile_sh = $outfile.".sh";
-
-if ($STLPORT4 ne $no_stl) {
-	$ps_STLPORT_LIB		= $ps.'$STLPORT4'.$LIB64;
-	$L_STLPORT_LIB		= $L.'$STLPORT4'.$LIB64;
-	$STLPORT_stlport 	= $I.'$STLPORT4'.$ds.'stlport';
-	$STLPORT_inc_stlport	= $I.'$STLPORT4'.$ds.'include'.$ds.'stlport';
-} else {
-        $ps_STLPORT_LIB         = "";
-        $L_STLPORT_LIB          = "";
-        $STLPORT_stlport        = $I.$SRC_ROOT.$SOLVER.$ds.$UPD.$ds.$INPATH.$INC.$ds."stl";
-        $STLPORT_inc_stlport    = "";
-}
-
-
 # Windows NT only variables
 if ($platform =~ m/cygwin/)
-{  
-   if ( $JAVA_HOME ne "" )
+{
+   if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME" )
    {
       $JAVA_LIB             = $JAVA_HOME.$LIB;
    }
@@ -944,7 +902,7 @@ if ($platform =~ m/cygwin/)
    # Change $SYSTEMDRIVE to lower case.
    $SYSTEMDRIVE          = lc $SYSTEMDRIVE;
    use Env qw(SYSTEMROOT);
-   $CYGWIN_PATH          = PathFormat('@CYGWIN_PATH@'); # Windows bash path
+   $CYGWIN_PATH          = PathFormat('/usr/bin'); # Windows bash path
    $WIN_GREP             = '$CYGWIN_PATH'.$ds."grep.exe";
    $WIN_FIND             = '$CYGWIN_PATH'.$ds."find.exe";
    $WIN_LS               = '$CYGWIN_PATH'.$ds."ls.exe";
@@ -952,21 +910,21 @@ if ($platform =~ m/cygwin/)
    $WIN_TOUCH            = '$CYGWIN_PATH'.$ds."touch.exe";
 }
 
-if ( $JAVA_HOME ne "" )
+if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME" )
 {
    $JAVA_BIN             = $JAVA_HOME.$BIN;
-   $JAVA_INCLUDE         = $JAVA_HOME.$ds."include";
+   $JAVA_INCLUDE         = $JAVA_HOME.$INCLUDE;
 }
 
 
 $PERL                 = PathFormat('@PERL@'); # Perl program
-$PERL_PATH            = dirname('@PERL@'); # Perl Path 
+$PERL_PATH            = dirname('@PERL@'); # Perl Path
 $XLIB                 = PathFormat('@XLIB@'); # X11 libraries
 $XINC                 = PathFormat('@XINC@'); # X11 includes
 
 
 # Mac OS X/Darwin only variables.
-if ( $platform =~ m/darwin/ )
+if ( $platform =~ m/darwin/ && $platform !~ m/^arm/)
 {  $FRAMEWORKSHOME       = $ds."Developer".$ds."SDKs".$ds."MacOSX10.4u.sdk".$ds."System".$ds."Library".$ds."Frameworks";
    if ( $XLIB eq "no_x_libraries" ) {
       $GUIBASE  = "aqua";
@@ -979,26 +937,15 @@ if ( $platform =~ m/darwin/ )
 $WORK_STAMP            = "@SOURCEVERSION@";
 # Location of the source.
 $SOLARSRC             = '$SRC_ROOT';
-# Location of the repository.
-my @splitlist = split( /\//, $SRC_ROOT );
-pop @splitlist;
-$SOURCE_ROOT_DIR      = join("/", @splitlist);
 
 # default TARFILE_LOCATION
 if ('@TARFILE_LOCATION@' eq "DEFAULT")
-{	$TARFILE_LOCATION="$SOURCE_ROOT_DIR/ext_sources";
+{	$TARFILE_LOCATION="$SRC_ROOT/src";
 }
 
 #
 $DEVROOT              = '$SRC_ROOT';
-# Set solenv and solver to given or default values. 
-# Location of the solenv tree.
-if ('@LOCAL_SOLENV@' eq "DEFAULT")
-{  $SOLARENV          = $SRC_ROOT.$SOLENV;
-}
-else
-{  $SOLARENV          =  PathFormat('@LOCAL_SOLENV@');
-}
+$SOLARENV             = PathFormat($SRC_ROOT.$SOLENV);
 # Location of the solver tree.
 if ('@LOCAL_SOLVER@' eq "DEFAULT")
 {  $SOLARVER          = $SRC_ROOT.$SOLVER.$ds.$UPD;
@@ -1012,21 +959,12 @@ $SOLARVERSION         = '$SOLARVER';
 #Location of gnu make directories.
 $WORKDIR              = '$SOLARVER/$INPATH/workdir';
 $OUTDIR              = '$SOLARVER/$INPATH';
+#Some directories that are symlinks under rawbuild, have to use realpath on Cygwin
+$SOLARDEFIMG          = PathFormat($SRC_ROOT.$DEFIMGS);
+
 
 $SOLARENVINC          = '$SOLARENV'.$INC;
-# Location of 
-$LOCALINI             = '$SOLARENV'.$CONFIG;
-# Location of 
-$STAR_INIROOT         = '$SOLARENV'.$CONFIG;
-# Location of 
-$STAR_INIROOTOLD      = '$SOLARENV'.$CONFIG;
-# Location of 
-$STAR_STANDLST        = '$SOLARENV'.$CONFIG.$ds."stand.lst";
-# Location of 
-$STAR_SSCOMMON        = '$SOLARENV'.$CONFIG.$ds."ssolar.cmn";
-# Location of 
-$STAR_SSOLARINI       = '$SOLARENV'.$CONFIG.$ds."ssolar.ini";
-# Location of dmake resource. 
+# Location of dmake resource.
 $DMAKEROOT            = '$SOLARENVINC'.$ds."startup";
 # Location of JDK classes .zip file.
 # but in jdk 1.2 it is called rt.jar and it lives in jre/lib
@@ -1035,8 +973,28 @@ $CLASSPATH            = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$wps.'.';
 # see above for why the change
 $XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$wps.'.';
 
+# Location of the translations module
+$L10N_MODULE = PathFormat($SRC_ROOT."/translations");
+
+# Check for poor help localizations, i.e. no help translation at all...
+@languages=();
+if (opendir(DIR,$L10N_MODULE . "/source"))
+{
+    @languages = readdir(DIR);
+    closedir(DIR);
+}
+$WITH_POOR_HELP_LOCALIZATIONS = "";
+
+foreach $language (@languages)
+{
+    if ( ($language ne ".") && ($language ne "..") && (! -d $L10N_MODULE . "/source/" . $language . "/helpcontent2") )
+    {
+        $WITH_POOR_HELP_LOCALIZATIONS = $WITH_POOR_HELP_LOCALIZATIONS . " " . $language;
+    }
+}
+
 # Location used by the linker to create libraries.
-if ($platform =~ m/solaris/) 
+if ($platform =~ m/solaris/)
 {  $SOLAREXTRALIB     = $L.$par_dir.$LIB.
                         $L.'$SOLARENV'.$ds.'$OUTPATH'.$ds."lib.solaris.2.6".
                         $L.$LIB.
@@ -1045,45 +1003,42 @@ if ($platform =~ m/solaris/)
                         $L.$USR_DT.$LIB.
                         $L.$USR_OPENWIN.$LIB;
 }
-elsif ($platform =~ m/linux|netbsd|osf1|freebsd|aix/)
+elsif ($platform =~ m/linux|netbsd|freebsd|aix|openbsd|dragonfly/)
 {
    $SOLAREXTRALIB     = $L.$par_dir.$LIB64;
 }
-elsif ($platform =~ m/darwin/) 
+elsif ($platform =~ m/darwin/ && $platform !~ m/^arm/)
 {  $SOLAREXTRALIB     = $L.$LIB.
                         $L.$USR.$LIB;
 }
-elsif ($platform !~ m/cygwin|os2/ )
+elsif ($platform !~ m/cygwin/ && $platform !~ m/mingw32/ && $platform !~ m/^arm-apple/)
 {  AddWarning( "set_soenv", "$platform not configured for linkage create libraries" );
 }
 
 # Windows NT only variables
-if ($platform =~ m/cygwin|os2/)
+if ($platform =~ m/cygwin/)
 {  $COMP_ENV          = $OUTPATH;
 
    $JAVAHOME          = '$JAVA_HOME';
 
    $ILIB             = $cur_dir;
 
-   if ($STLPORT4 ne $no_stl) {
-       $ILIB      .=   $wps.$STLPORT4.$LIB64;
-   }
-
    # Mingw is different
    if ( $COM eq "MSC" )
-   {  $ILIB       .=    $wps.$SOLARVER.$ds.$INPATH.$LIB.
-                        $wps.$JAVA_HOME.$LIB.
-                        $wps.$PSDK_HOME.$LIB.
-                        $wps.$FRAME_HOME.$LIB.
-                        $wps.$COMPATH.$LIB;
+   {  $ILIB       .=    $wps.$SOLARVER.$ds.$INPATH.$LIB;
+      if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME" ) {
+          $ILIB   .= $wps.$JAVA_HOME.$LIB;
+      }
+      if ( $CL_X64 ne "TRUE" ) {
+          $ILIB   .= $wps.$COMPATH.$LIB.
+		             $wps.$WINDOWS_SDK_HOME.$LIB;
+	  } else {
+	      $ILIB   .= $wps.$COMPATH.$LIB.$ds."amd64".
+		             $wps.$WINDOWS_SDK_HOME.$LIB64;
+	  }
+      $ILIB       .= $wps.$DOTNET_FRAMEWORK_HOME.$LIB;
       if ( '@ENABLE_DIRECTX@' ne "" ) {
           $ILIB   .= $wps.$DIRECTXSDK_LIB;
-          if ( '@COMEX@' eq "10" ) {
-              # .NET2003 provides and compiles against DirectX 5 libraries and is
-              # hereby still Win9x compatible.
-              $ILIB .= $wps.'$COMPATH'.$ds.'PlatformSDK'.$LIB;
-              $USE_DIRECTX5 = "YES";
-          }
       }
       # ILIB needs to use '\' directory seperators;
       $ILIB = WinPath( $ILIB, ";" );
@@ -1100,8 +1055,8 @@ if ($platform =~ m/cygwin|os2/)
       {  $ILIB       .= $wps.$COMPATH.$LIB;
       }
       $ILIB       .= $wps.PathFormat("@MINGW_CLIB_DIR@").
-                     $wps.$PSDK_HOME.$LIB;
-      if ( '@ENABLE_DIRETX@' )
+                     $wps.$WINDOWS_SDK_HOME.$LIB;
+      if ( '@ENABLE_DIRECTX@' )
       {   $ILIB   .= $wps.PathFormat("@DIRECTXSDK_LIB@");
       }
    }
@@ -1109,9 +1064,9 @@ if ($platform =~ m/cygwin|os2/)
    $JAVAHOME          = '$JAVA_HOME';
 
 }
-     
+
 # The general environment path.
-if ($platform =~ m/linux|netbsd|odf1|freebsd|aix|solaris/)
+if ($platform =~ m/linux|netbsd|freebsd|aix|solaris|openbsd|dragonfly/)
 {  $PATH              = $cur_dir.
 #                        $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
                         $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
@@ -1124,10 +1079,10 @@ if ($platform =~ m/linux|netbsd|odf1|freebsd|aix|solaris/)
    $PATH             .= $ps.$oldPATH;
 
    my @javaBits;
-   if (( $JAVA_HOME ne "" ) && ( $JDK ne "gcj" )) {
+   if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME"  &&  $JDK ne "gcj" ) {
       @javaBits = ( '$JAVA_HOME'.$BIN, 'javac' );
    } else {
-      @javaBits = (); 
+      @javaBits = ();
    }
    $PATH              = GetCorrectPath ($PATH,
                                         $COMPATH, $CC,
@@ -1147,13 +1102,13 @@ elsif ($platform =~ m/cygwin/)
                         $ps.CygFormat($SOLARENV).$ds."bin".
                         $ps.CygFormat($SOLARENV).$ds.$OUTPATH.$BIN;
 
-   if ( $JAVA_HOME ne "" )
+   if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME" )
    {
       # hack either "hotspot" or "client" should be used, depending on the jdk version:
-      # 1.2.x   -   no such directory, unsupported 
+      # 1.2.x   -   no such directory, unsupported
       # 1.3.x   -   hotspot, client missing
       # 1.4.x   -   client, hotspot missing
-      
+
       $PATH .= $ps.CygFormat($JAVA_HOME).$BIN;
 	  if ( -d $JAVA_HOME.$ds."jre".$ds."bin".$ds."hotspot" ) {
 		  $PATH .= $ps.CygFormat($JAVA_HOME).$ds."jre".$ds."bin".$ds."hotspot";
@@ -1165,35 +1120,34 @@ elsif ($platform =~ m/cygwin/)
 
    # Add path to compiler
    $tmppath = CygFormat($COMPATH).$BIN;
+   $tmppath .= $ds."amd64" if $CL_X64;
    $tmppath =~ s/^\/\//\//;
    $PATH .= $ps.$tmppath;
 
    if ( $COM eq "MSC" ) {
        $tmppath = CygFormat($MSPDB_PATH);
-	   # for .NET to find mspdb71.dll (needed by CL.EXE C/C++ Compiler)
-	   if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
-		   $PATH .= $ps.$tmppath;
-	   }
-	   if ( ( $COMEX ge "10" ) ) {
-		   # .NET needs midl.exe
-               $tmppath = CygFormat($MIDL_PATH);
-		   if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
-			   $PATH .= $ps.$tmppath;
-		   }
-		   # .NET needs csc.exe
-               $tmppath = CygFormat($CSC_PATH);
-		   if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
-			   $PATH .= $ps.$tmppath;
-		   }
-		   # Native installer needs some files if the Windows Installer SDK
-               $tmppath = CygFormat($PSDK_HOME);
-		   if ( $PATH !~ /(?:[:]|\A)(?:$tmppath\/bin)(?:[:]|\Z)/i ) {
-			   $PATH .= $ps.$tmppath.$BIN;
-		   }
-	   }
+       # for MSVC to find mspdb71.dll
+       if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
+           $PATH .= $ps.$tmppath;
+       }
+       # need midl.exe
+       $tmppath = CygFormat($MIDL_PATH);
+       if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
+           $PATH .= $ps.$tmppath;
+       }
+       # needs csc.exe
+       $tmppath = CygFormat($CSC_PATH);
+       if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
+           $PATH .= $ps.$tmppath;
+       }
+       # Installer needs some files if the Windows Installer SDK
+       $tmppath = CygFormat($WINDOWS_SDK_HOME);
+       if ( $PATH !~ /(?:[:]|\A)(?:$tmppath\/bin)(?:[:]|\Z)/i ) {
+           $PATH .= $ps.$tmppath.$BIN;
+       }
    } else { # Mingw is different
 	   # Native installer needs some files if the Windows Installer SDK
-               $tmppath = CygFormat($PSDK_HOME);
+               $tmppath = CygFormat($WINDOWS_SDK_HOME);
 	   if ( $PATH !~ /(?:[:]|\A)(?:$tmppath\/bin)(?:[:]|\Z)/i ) {
 		   $PATH .= $ps.$tmppath.$BIN;
 	   }
@@ -1201,12 +1155,6 @@ elsif ($platform =~ m/cygwin/)
 
    if ( $ASM_PATH ne "ASM_IN_PATH" )
    {   $PATH          .= $ps.CygFormat($ASM_PATH);
-   } 
-   # zip.exe / unzip.exe path for Windows users.
-   my $zip_home_path = PathFormat('@ZIP_HOME@');
-   $tmppath = CygFormat($zip_home_path);
-   if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
-       $PATH          .= $ps.$tmppath;
    }
 
    # Possible cygwin paths must follow behind the OOo and MS paths
@@ -1222,15 +1170,14 @@ elsif ($platform =~ m/cygwin/)
    if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
       $PATH           .= $ps.$tmppath;
    }
-   $PATH              .= $ps_STLPORT_LIB;
-   # nsis path for Windows users.
+   # makensis directory
    $NSIS_PATH = PathFormat('@NSIS_PATH@');
    $tmppath = CygFormat($NSIS_PATH);
    if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
        $PATH          .= $ps.$tmppath;
    }
    # path to sn.exe (signing) for Windows users.
-   my $sn_path = PathFormat('@FRAME_HOME@/bin');
+   my $sn_path = PathFormat('@DOTNET_FRAMEWORK_HOME@/bin');
    $tmppath = CygFormat($sn_path);
    if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
        $PATH          .= $ps.$tmppath;
@@ -1270,38 +1217,23 @@ elsif ($platform =~ m/cygwin/)
    # The path now is in cygwin posix format
 
 }
-
-elsif ($platform =~ m/os2/)
-{  # The PATH variable is completely created from scratch. Everything that is not
-   # needed is appended to the end.
+elsif ($platform =~ m/mingw32/)
+{
+   my ( $tmppath );
 
    $PATH              = $cur_dir.
-#                        $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
-                        $ps.'$SOLARENV'.$ds."bin".
-                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN;
+#                        $ps.CygFormat($SOLARVER).$ds.$INPATH.$BIN.
+                        $ps.CygFormat($SOLARENV).$ds."bin".
+                        $ps.CygFormat($SOLARENV).$ds.$OUTPATH.$BIN;
 
-   if ( $JAVA_HOME ne "" )
-   {
-      # hack either "hotspot" or "client" should be used, depending on the jdk version:
-      # 1.2.x   -   no such directory, unsupported 
-      # 1.3.x   -   hotspot, client missing
-      # 1.4.x   -   client, hotspot missing
-      
-      $PATH .= $ps.$JAVA_HOME.$BIN;
-	  if ( -d $JAVA_HOME.$ds."jre".$ds."bin".$ds."hotspot" ) {
-		  $PATH .= $ps.$JAVA_HOME.$ds."jre".$ds."bin".$ds."hotspot";
-	  }
-	  if ( -d $JAVA_HOME.$ds."jre".$ds."bin".$ds."client" ) {
-		  $PATH .= $ps.$JAVA_HOME.$ds."jre".$ds."bin".$ds."client";
-	  }
+   # makensis directory
+   $NSIS_PATH = PathFormat('@NSIS_PATH@');
+   $tmppath = CygFormat($NSIS_PATH);
+   if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
+       $PATH          .= $ps.$tmppath;
    }
-
-  # Append old PATH
-  my $temp = $oldPATH;
-  $temp =~ s/\\/\//g ;
-  $PATH             .= $ps.$temp;
+   $PATH              .= $ps.$oldPATH;
 }
-
 elsif ($platform =~ m/darwin/)
 {  $PATH              = $cur_dir.
 #                        $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
@@ -1315,8 +1247,8 @@ else
 {  AddWarning( "set_soenv", "$platform not configured for general environment paths" );
 }
 
-# Linker library search directory paths. 
-if ($platform =~ m/solaris/) 
+# Linker library search directory paths.
+if ($platform =~ m/solaris/)
 {  $SOLARLIB          = $L.$par_dir.$LIB.
                         $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
                         $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
@@ -1330,34 +1262,36 @@ if ($platform =~ m/solaris/)
    $SOLARLIB         .= $L.$USR_LOCAL.$LIB.
                         $L.$USR_DT.$LIB.
                         $L.$USR_OPENWIN.$LIB.
-                        $L.'$JAVA_HOME'.$LIB.
+                        $L.$XLIB;
+
+   $JAVALIB          =  $L.'$JAVA_HOME'.$LIB.
                         $L.$JRELIBDIR.
                         $L.$JRETOOLKITDIR.
-                        $L.$JRETHREADDIR.
-                        $L_STLPORT_LIB.
-                        $L.$XLIB;
+                        $L.$JRETHREADDIR;
 }
-elsif ($platform =~ m/linux|netbasd|osf1|aix|freebsd/)
+elsif ($platform =~ m/linux|netbsd|aix|freebsd|openbsd|dragonfly/)
 {  $SOLARLIB          = $L.$par_dir.$LIB.
                         $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
                         $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-                        $L.'$JAVA_HOME'.$LIB64.
+                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB;
+   if ($platform =~ m/openbsd/) {
+      $SOLARLIB       .= $L.$USR_LOCAL.$LIB;
+   }
+   if ( $XLIB ne "/usr/lib" && $XLIB ne "/usr/lib64" ) {
+      $SOLARLIB       .= $L.$XLIB;
+   }
+   $JAVALIB           = $L.'$JAVA_HOME'.$LIB64.
                         $L.$JRELIBDIR.
                         $L.$JRETOOLKITDIR.
-                        $L.$JRETHREADDIR.
-                        $L_STLPORT_LIB.
-                        $L.$XLIB;
+                        $L.$JRETHREADDIR;
 }
-elsif ($platform =~ m/cygwin|os2/)
-{  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
-                        $L.$par_dir.$LIB.
-                        $L_STLPORT_LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB;
-} 
-elsif ($platform =~ m/darwin/) 
+elsif ($platform =~ m/cygwin|mingw32/)
+{  $SOLARLIB          = $L.$par_dir.$LIB.
+                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+                        $L.'$SOLARVER'.$ds.'$INPATH'.$LIB;
+}
+elsif ($platform =~ m/darwin/)
 {  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
-                        $L_STLPORT_LIB.
                         $L.$USR_LIB;
     # [ed] 6/15/02 Add in X11 libraries onto the library path
     if ($GUIBASE eq "unx") {
@@ -1380,40 +1314,35 @@ $SOLARINC             = $I.$cur_dir.
                         $I.'$SOLARENV'.$INC.
                         $I.'$SRC_ROOT'.$ds."res";
 
-if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd/)
+if ($platform =~ m/solaris|linux|freebsd|netbsd|aix|openbsd|dragonfly/)
 {
-$SOLARINC	     .= $STLPORT_stlport;
-if ($platform =~ m/linux|freebsd|netbsd/)
-{
-# This simply adds an include path, so even cases that break the FHS work
-$SOLARINC            .= $STLPORT_inc_stlport;
-}
 if ($platform =~ m/solaris/ && ! $CC =~ "gcc")
 {
 $SOLARINC            .= '/SC5 ';
 }
 # Platform dependent include path at the top of this list of include paths
 if ($platform =~ m/solaris/)
-{   
-    $SOLARINC         .= $I.$COMPATH.$ds."include";
-}
-if ($platform =~ m/linux/)
 {
-# This simply adds an include path, so even cases that break the FHS work
-   $SOLARINC         .= $STLPORT_inc_stlport;
+    $SOLARINC         .= $I.$COMPATH.$INCLUDE;
 }
 
+	$SOLARINC      .= $I.'$SOLARENV'.$INC.$ds."Xp31";
 
-   	$SOLARINC      .= $I.'$SOLARENV'.$INC.$ds."Xp31".
-                     $I.'$JAVA_HOME'.$INCLUDE;
+	# pickup system jpeg over java jpeg on OpenBSD
+	if ($platform =~ m/openbsd/)
+	{   $SOLARINC  .= $I.$USR_LOCAL.$INCLUDE;
+	}
+    if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME" )
+    {   $SOLARINC  .= $I.'$JAVA_HOME'.$INCLUDE;
+	}
 
 	#include system dependent Java include directory
-	if (!($JDK eq "gcj"))
+	if (!($JDK eq "gcj") && $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME")
 	{
    		if ($platform =~ m/solaris/)
    		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."solaris";
    		}
-   		elsif  ($platform =~ m/linux|osf1/)
+   		elsif  ($platform =~ m/linux/)
    		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
    		}
    		elsif ($platform =~ m/freebsd/)
@@ -1425,64 +1354,79 @@ if ($platform =~ m/linux/)
    		elsif ($platform =~ m/netbsd/)
    		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
    		}
+		elsif ( $platform =~ m/aix/ )
+		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."aix";
+		}
+		elsif ($platform =~ m/openbsd/)
+		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."openbsd";
+		}
 
    		#java threads include path
 
-   		$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include";
+        $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$INCLUDE;
 	}
     #The tail, if needed
-    if ($platform =~ m/linux|freebsd|netbsd/)
-    {  $SOLARINC  .= $I.$XINC;
-    }
-    elsif ($platform =~ m/osf1/)
-    {  $SOLARINC  .= $I.$XINC.
-                     $I.$USR.$INCLUDE;
+    if ($platform =~ m/linux|freebsd|netbsd|aix|openbsd|dragonfly/)
+    {  if ( $XINC ne "/usr/include" ) {
+            $SOLARINC  .= $I.$XINC;
+       }
     }
 }
 elsif ($platform =~ m/cygwin/)
-{  $SOLARINC         .= $STLPORT_stlport.
-                        $I.'$JAVA_HOME'.$ds."include".$ds."win32".
-                        $I.'$JAVA_HOME'.$ds."include";
+{  if ($JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME")
+   {  $SOLARINC       .= $I.'$JAVA_HOME'.$INCLUDE.$ds."win32".
+                         $I.'$JAVA_HOME'.$INCLUDE;
+   }
    # Mingw is different
    if ( $COM eq "MSC" )
-   {  $SOLARINC       .= $I.'$PSDK_HOME'.$INCLUDE.
-                         $I.'$COMPATH'.$ds."include";
+   {  $SOLARINC       .= $I.'$WINDOWS_SDK_HOME'.$INCLUDE.
+                         $I.'$COMPATH'.$INCLUDE;
       if ( '@ENABLE_DIRECTX@' ne "" ) {
           $SOLARINC   .= $I.PathFormat('@DIRECTXSDK_HOME@').$INCLUDE;
-          if ( '@COMEX@' eq "10" ) {
-              # .NET2003 provides and compiles against DirectX 5 libraries and is
-              # hereby still Win9x compatible.
-              $SOLARINC .= $I.'$COMPATH'.$ds.'PlatformSDK'.$ds."include";
-          }
       }
    }
    elsif ( $COM eq "GCC" )
-   {  $SOLARINC       .= $I.'$SOLARVER'.$ds.'$INPATH'.$INC.$ds."external".$ds."mingw".$ds."include";
+   {  $SOLARINC       .= $I.'$SOLARVER'.$ds.'$INPATH'.$INC.$ds."external".$ds."mingw".$INCLUDE;
      if ( $USE_MINGW eq "cygwin" )
-     {  $SOLARINC    .= $I.PathFormat($USR.$ds."include".$ds."mingw").
-                        $I.PathFormat($USR.$ds."include".$ds."w32api").
-                        $I.PathFormat($USR.$ds."include"); }
+     {  $SOLARINC    .= $I.PathFormat($USR.$INCLUDE.$ds."mingw").
+                        $I.PathFormat($USR.$INCLUDE.$ds."w32api").
+                        $I.PathFormat($USR.$INCLUDE); }
      else
-     {  $SOLARINC    .= $I.'$COMPATH'.$ds."include"; }
+     {  $SOLARINC    .= $I.'$COMPATH'.$INCLUDE; }
      @mingw_lib_include_paths = split( / /, "@MINGW_LIB_INCLUDE_PATH@" );
      $SOLARINC .= $I.PathFormat("@MINGW_BACKWARD_INCLUDE_PATH@");
      foreach $mingw_lib_include_path (@mingw_lib_include_paths)
        {   chomp $mingw_lib_include_path;
-           if ( $mingw_lib_include_path ne $COMPATH.$ds."include" && $mingw_lib_include_path ne "" )
+           if ( $mingw_lib_include_path ne $COMPATH.$INCLUDE && $mingw_lib_include_path ne "" )
            {
               $SOLARINC   .= $I.PathFormat($mingw_lib_include_path);
            }
        }
      $SOLARINC .= $I.PathFormat("@GXX_INCLUDE_PATH@").$I.PathFormat("@GXX_INCLUDE_PATH@".$ds."mingw32").
-                  $I.'$PSDK_HOME'.$INCLUDE;
+                  $I.'$WINDOWS_SDK_HOME'.$INCLUDE;
    }
-   if ( '@ENABLE_DIRECTX@' ne "" ) {
+   if ( $COM ne "MSC" && '@ENABLE_DIRECTX@' ne "" ) {
        $SOLARINC   .= $I.PathFormat('@DIRECTXSDK_HOME@').$INCLUDE;
    }
 }
-elsif ($platform =~ m/darwin/)
-{  $SOLARINC         .= $STLPORT_stlport.
-						$I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Versions".$ds."Current".$ds."Headers".
+elsif ($platform =~ m/mingw32/)
+{  if ($JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME")
+   {  if (  '@build_os' eq 'cygwin' )
+      {  # Using MinGW from Cygwin. Use the normal Windows JDK
+         # headers
+         $SOLARINC       .= $I.'$JAVA_HOME'.$INCLUDE.$ds."win32".
+                            $I.'$JAVA_HOME'.$INCLUDE;
+      }
+      else
+      {  # Cross-compilation. Use our fake jni_md.h
+         # and othewise the build platform JDK headers
+         $SOLARINC       .= $I.$SOLARENVINC.$ds."win32".
+                            $I.'$JAVA_HOME'.$INCLUDE;
+      }
+   }
+}
+elsif ($platform =~ m/darwin/ && $platform !~ m/^arm/)
+{  $SOLARINC         .= $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Versions".$ds."Current".$ds."Headers".
                         $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
    # [ed] 6/15/02 Add in X11 headers as appropriate for the build
    if ($GUIBASE eq "unx") {
@@ -1490,26 +1434,29 @@ elsif ($platform =~ m/darwin/)
                         $I.$XINC.$ds."freetype2";
    }
 }
+elsif ($platform =~ m/^arm-apple/)
+{
+}
 else
 {  AddWarning( "set_soenv", "$platform not configured for system dependant include dir" );
 }
 
-#
-print "done\n";
 $gb_REPOS = $SRC_ROOT;
-my $BUILD_TYPE = "@BUILD_TYPE@";
+$BUILD_TYPE = "@BUILD_TYPE@";
 
 if ('@WITH_LANG@' ne "")
 {
-    $gb_REPOS .= " ".$SOURCE_ROOT_DIR."/l10n";
-    $BUILD_TYPE = "@BUILD_TYPE@ L10N";
+    $BUILD_TYPE = "@BUILD_TYPE@ TRANSLATIONS";
+}
+else
+{
+    $BUILD_TYPE = "@BUILD_TYPE@";
 }
 
 #
 # F. Setting the different aliases.
 #
-print "Setting the aliases... ";
-# 1. alias for a full product make. 
+# 1. alias for a full product make.
 	$mkout           = '"perl $SOLARENV/bin/mkout.pl"';
 	$deliver         = '"perl $SOLARENV/bin/deliver.pl"';
 	$build           = '"perl $SOLARENV/bin/build.pl"';
@@ -1517,36 +1464,30 @@ print "Setting the aliases... ";
 	$zipdep          = '"perl $SOLARENV/bin/zipdep.pl"';
 # 3. alias for a full product make
 $nmake           = '"dmake"';
-print "done\n";
+
 #
 #--------------------------
 # VI. Open the output file.
 #--------------------------
 #
 
-# Create sh environment file
-open( OUT_SH, ">$outfile_sh" ) ||
-  die "Cannot open $outfile_sh: $!\n";
-
 #
 #------------------------------------------
 # VII. Writing the data to the output file.
 #------------------------------------------
 #
 # Write file header.
-CreateFileHeader( *OUT_SH, $UPD, $platform, "sh/bash/ksh", "#" );
+CreateFileHeader( *OUT, $UPD, $platform, "sh/bash/ksh", "#" );
 
 ToFile( "SRC_ROOT",	     $SRC_ROOT,          "e" );
 ToFile( "OOO_SHELL",         $OOO_SHELL,         "e" );
 ToFile( "JAVA_HOME",         $JAVA_HOME,         "e" );
+ToFile( "L10N_MODULE",       $L10N_MODULE,       "e" );
 ToFile( "ANT_HOME",          PathFormat("@ANT_HOME@"), "e" );
 ToFile( "ANT_LIB",           PathFormat("@ANT_LIB@"), "e" );
 ToFile( "ANT",               PathFormat("@ANT@"), "e" );
 ToFile( "JDKLIB",            $JAVA_LIB,          "e" );
-ToFile( "STLPORT4",          $STLPORT4,          "e" );
-ToFile( "STLPORT_VER",       "@STLPORT_VER@",    "e" );
 ToFile( "ASM_PATH",          $ASM_PATH,          "e" );
-ToFile( "BUILD_SOSL",        $BUILD_SOSL,        "e" );
 ToFile( "FRAMEWORKSHOME",    $FRAMEWORKSHOME,    "e" );
 ToFile( "Empty",             $empty,             "n" );
 
@@ -1554,52 +1495,24 @@ ToFile( "Empty",             $empty,             "n" );
 # Writing the platform independent constant values to file.
 # (c = comment, e = environment variable, a = alias )
 ToFile( "Platform independent constant values.", $empty, "c" );
-# dictionaries
-if ('@WITH_DICT@' =~ m/ALL,/s)
-{
-   foreach $dict (@DICTIONARIES)
-   {
-      ToFile( "DIC_$dict",     "TRUE",          "e" );
-   }
-   ToFile( "DIC_ALL",          "TRUE",          "e" );
-}
-else
-{	
-   foreach $dict (@DICTIONARIES)
-   {   if ('@WITH_DICT@' =~ m/$dict,/s)
-       {   my $val="TRUE";
-           ToFile( "DIC_$dict",     $val,          "e" );
-       }
-       else
-       {   my $val;
-           undef $val;
-           ToFile( "DIC_$dict",     $val,          "e" );
-       }
-   }
-}
 # Languages
 ToFile( "WITH_LANG",         "@WITH_LANG@",      "e" );
-ToFile( "INTRO_BITMAPS",     "@INTRO_BITMAPS@",  "e" );
-ToFile( "ABOUT_BITMAPS",     "@ABOUT_BITMAPS@",  "e" );
+ToFile( "INTRO_BITMAP",      "@INTRO_BITMAP@",   "e" );
+ToFile( "ABOUT_BITMAP",      "@ABOUT_BITMAP@",   "e" );
 ToFile( "OOO_VENDOR",        "@OOO_VENDOR@",     "e" );
 ToFile( "OOODMAKEMODE",      "YES",              "e" );
-ToFile( "WITH_POOR_HELP_LOCALIZATIONS", "@WITH_POOR_HELP_LOCALIZATIONS@", "e" );
+ToFile( "WITH_POOR_HELP_LOCALIZATIONS", $WITH_POOR_HELP_LOCALIZATIONS, "e" );
 
 ToFile( "CALL_CDECL",        $CALL_CDECL,        "e" );
 ToFile( "COMMON_OUTDIR",     $COMMON_OUTDIR,     "e" );
 ToFile( "common_build",      $common_build,      "e" );
-ToFile( "BMP_WRITES_FLAG",   $BMP_WRITES_FLAG,   "e" );
-ToFile( "BUILD_SOSL_RELEASE", $BUILD_SOSL_RELEASE, "e" );
 ToFile( "NO_REC_RES",        $NO_REC_RES,        "e" );
 ToFile( "SO3",               $SO3,               "e" );
 ToFile( "SOLAR_PLUGIN",      $SOLAR_PLUGIN,      "e" );
 ToFile( "UPDATER",           $UPDATER,           "e" );
-ToFile( "build_deliver",     $BUILD_DELIVER,     "e" );
 ToFile( "VCL",               $VCL,               "e" );
 ToFile( "ENABLEUNICODE",     $ENABLEUNICODE,     "e" );
-ToFile( "NEW_JAR_PACK",      $NEW_JAR_PACK,      "e" );
 ToFile( "NO_BSYMBOLIC",      $NO_BSYMBOLIC,      "e" );
-ToFile( "TF_FILTER",         "TRUE",             "e" );
 if ("@ENABLE_DEBUG@" eq "TRUE") {
 ToFile( "debug",             "true",             "e" );
 }
@@ -1625,20 +1538,28 @@ ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING",  "yes", "e" );
 ToFile( "ENABLE_GTK",        "@ENABLE_GTK@",       "e" );
 ToFile( "GTK_CFLAGS",        "@GTK_CFLAGS@",       "e" );
 ToFile( "GTK_LIBS",          "@GTK_LIBS@",         "e" );
-ToFile( "GTHREAD_CFLAGS",        "@GTHREAD_CFLAGS@",       "e" );
-ToFile( "GTHREAD_LIBS",          "@GTHREAD_LIBS@",         "e" );
+ToFile( "ENABLE_GTK3",       "@ENABLE_GTK3@",      "e" );
+ToFile( "GTK3_CFLAGS",       "@GTK3_CFLAGS@",      "e" );
+ToFile( "GTK3_LIBS",         "@GTK3_LIBS@",        "e" );
+ToFile( "GTHREAD_CFLAGS",    "@GTHREAD_CFLAGS@",   "e" );
+ToFile( "GTHREAD_LIBS",      "@GTHREAD_LIBS@",     "e" );
 ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
 ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
-ToFile( "ENABLE_GSTREAMER",  "@ENABLE_GSTREAMER@", "e" );
 ToFile( "ENABLE_CAIRO",      "@ENABLE_CAIRO@",     "e" );
 ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@",     "e" );
 ToFile( "ENABLE_OPENGL",     "@ENABLE_OPENGL@",    "e" );
 ToFile( "ENABLE_PDFIMPORT",  "@ENABLE_PDFIMPORT@", "e" );
-ToFile( "ENABLE_PRESENTER_EXTRA_UI","@ENABLE_PRESENTER_EXTRA_UI@","e" );
 ToFile( "ENABLE_MINIMIZER",   "@ENABLE_MINIMIZER@","e" );
 ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" );
 ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
+ToFile( "ENABLE_SCRIPTING_BEANSHELL","@ENABLE_SCRIPTING_BEANSHELL@","e" );
+ToFile( "ENABLE_SCRIPTING_JAVASCRIPT","@ENABLE_SCRIPTING_JAVASCRIPT@","e" );
+ToFile( "ENABLE_SCRIPTING_PYTHON","@ENABLE_SCRIPTING_PYTHON@","e" );
+ToFile( "ENABLE_QUICKSTART_LIBPNG", "@ENABLE_QUICKSTART_LIBPNG@", "e" );
 ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
+ToFile( "WITH_THEMES",       "@WITH_THEMES@",      "e");
+ToFile( "WITH_HELPPACK_INTEGRATION",       "@WITH_HELPPACK_INTEGRATION@",      "e");
+ToFile( "WITH_EXTENSION_INTEGRATION",       "@WITH_EXTENSION_INTEGRATION@",      "e");
 ToFile( "OOO_JUNIT_JAR",     "@OOO_JUNIT_JAR@",    "e" );
 ToFile( "SAC_JAR",           "@SAC_JAR@",          "e" );
 ToFile( "LIBXML_JAR",        "@LIBXML_JAR@",       "e" );
@@ -1662,6 +1583,7 @@ ToFile( "SERVLETAPI_JAR",    "@SERVLETAPI_JAR@",   "e" );
 ToFile( "ENABLE_DBUS",       "@ENABLE_DBUS@",      "e" );
 ToFile( "ENABLE_GCONF",      "@ENABLE_GCONF@",     "e" );
 ToFile( "ENABLE_GNOMEVFS",   "@ENABLE_GNOMEVFS@",  "e" );
+ToFile( "ENABLE_GSTREAMER",  "@ENABLE_GSTREAMER@", "e" );
 ToFile( "ENABLE_GIO",        "@ENABLE_GIO@",       "e" );
 ToFile( "ENABLE_KDE",        "@ENABLE_KDE@",       "e" );
 ToFile( "KDE_CFLAGS",        "@KDE_CFLAGS@",       "e" );
@@ -1671,23 +1593,26 @@ ToFile( "ENABLE_KDE4",       "@ENABLE_KDE4@",      "e" );
 ToFile( "KDE4_CFLAGS",       "@KDE4_CFLAGS@",      "e" );
 ToFile( "KDE4_LIBS",         "@KDE4_LIBS@",        "e" );
 ToFile( "MOC4",              "@MOC4@",             "e" );
+ToFile( "KDE_GLIB_CFLAGS",   "@KDE_GLIB_CFLAGS@",  "e" );
+ToFile( "KDE_GLIB_LIBS",     "@KDE_GLIB_LIBS@",    "e" );
+ToFile( "KDE_HAVE_GLIB",     "@KDE_HAVE_GLIB@",    "e" );
 ToFile( "ENABLE_KAB",        "@ENABLE_KAB@",       "e" );
 ToFile( "PSPRINT",           "TRUE",             "e" );
 ToFile( "MKDEPENDSOLVER",    "TRUE",             "e" );
 ToFile( "nodep",             "@nodep@",          "e" );
 ToFile( "TARFILE_LOCATION",  $TARFILE_LOCATION,  "e" );
-ToFile( "DO_FETCH_TARBALLS", "@DO_FETCH_TARBALLS@",  "e" );
+ToFile( "GIT_LINK_SRC", "@GIT_LINK_SRC@",  "e" );
+ToFile( "GIT_REPO_NAMES", "@GIT_REPO_NAMES@",  "e" );
+
 #
 # Writing the platform dependent constant values to file.
 # (c = comment, e = environment variable, a = alias )
 ToFile( "Platform dependent constant values.", $empty, "c" );
 ToFile( "SOLAR_JAVA",        $SOLAR_JAVA,        "e" );
-ToFile( "BIG_SVX",           $BIG_SVX,           "e" );
 ToFile( "COM",               $COM,               "e" );
 ToFile( "COMPATH",           $COMPATH,           "e" );
 ToFile( "CPU",               $CPU,               "e" );
 ToFile( "CPUNAME",           $CPUNAME,           "e" );
-ToFile( "CVER",              $CVER,              "e" );
 ToFile( "GUI",               $GUI,               "e" );
 ToFile( "GLIBC",             $GLIBC,             "e" );
 ToFile( "GUIBASE",           $GUIBASE,           "e" );
@@ -1700,12 +1625,10 @@ ToFile( "OUTPATH",           $OUTPATH,           "e" );
 ToFile( "INPATH",            $INPATH,            "e" );
 ToFile( "PATH_SEPERATOR",    $PATH_SEPERATOR,    "e" );
 ToFile( "COMEX",             $COMEX,             "e" );
-ToFile( "CDPATHx",           $CDPATHx,           "e" );
 ToFile( "DYNAMIC_CRT",       $DYNAMIC_CRT,       "e" );
-ToFile( "SET_EXCEPTIONS",    $SET_EXCEPTIONS,    "e" );
 ToFile( "use_shl_versions",  $use_shl_versions,  "e" );
 ToFile( "FLIPCMD",           $FLIPCMD,           "e" );
-if ( $platform =~ m/darwin/ )
+if ( $platform =~ m/darwin/ && $platform !~ m/^arm/)
 {
 # MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build,
 # build can assume functions/libraries of that version to be available
@@ -1721,11 +1644,10 @@ if ( $platform =~ m/darwin/ )
 ToFile( "Variable values.",  $empty,             "c" );
 if ( $platform =~ m/cygwin/ )
 {  ToFile( "CYGWIN_PATH",       $CYGWIN_PATH,       "e" );
-   ToFile( "PSDK_HOME",         $PSDK_HOME,         "e" );
-   ToFile( "WINDOWS_VISTA_PSDK","@WINDOWS_VISTA_PSDK@","e" );
+   ToFile( "WINDOWS_SDK_HOME",  $WINDOWS_SDK_HOME,  "e" );
    ToFile( "DIRECTXSDK_LIB",    $DIRECTXSDK_LIB,    "e" );
    ToFile( "USE_DIRECTX5",      $USE_DIRECTX5,      "e" );
-   ToFile( "ATL_LIB",           $ATL_LIB,         "e" );
+   ToFile( "ATL_LIB",           $ATL_LIB,           "e" );
    if ( $MINGW ne "yes" )
    {  ToFile( "ATL_INCLUDE",       $ATL_INCLUDE,       "e" );
    }
@@ -1734,12 +1656,34 @@ if ( $platform =~ m/cygwin/ )
    ToFile( "NSIS_PATH",         $NSIS_PATH,         "e" );
    ToFile( "DISABLE_ACTIVEX",   "@DISABLE_ACTIVEX@","e" );
    ToFile( "DISABLE_ATL",   "@DISABLE_ATL@","e" );
-   ToFile( "USE_NEW_SDK",       $USE_NEW_SDK,       "e" );
+   # Variables used when building the parts that needs to be available
+   # also as 64-bit versions in a 32-bit LibreOffice build, like
+   # the Explorer extension. If the configure script hasn't
+   # found the 64-bit (cross-)compiler, then @BUILD_X64@ will be empty.
+   ToFile( "BUILD_X64",         "@BUILD_X64@",      "e" );
+   if ( "@BUILD_X64@" eq "TRUE" ) {
+       ToFile( "CC_X64_BINARY", "@CC_X64_BINARY@",  "e" );
+       ToFile( "CXX_X64_BINARY","@CXX_X64_BINARY@", "e" );
+       ToFile( "LINK_X64_BINARY","@LINK_X64_BINARY@","e" );
+       ToFile( "LIBMGR_X64_BINARY","@LIBMGR_X64_BINARY@","e" );
+   }
 
    # Hack around dmake's mktmp not generating DOS paths.
    my $tmpdir = qx{cygpath -m "/tmp"};
    chomp($tmpdir);
    ToFile( "TMPDIR",     $tmpdir,            "e" );
+   if ( !defined $ENV{"TMP"} || $ENV{"TMP"} eq "" ) {
+      ToFile( "TMP", $tmpdir, "e" );
+   } else {
+      ToFile( "TMP", "$ENV{'TMP'}", "e" );
+   }
+}
+elsif ( $platform =~ m/mingw32/ )
+{  ToFile( "NSIS_PATH",         $NSIS_PATH,         "e" );
+}
+
+if ("@WITH_VC_REDIST@" eq "TRUE") {
+ToFile( "WITH_VC_REDIST", "TRUE",  "e" );
 }
 ToFile( "PERL",              $PERL,              "e" );
 ToFile( "RPM",               "@RPM@",            "e" );
@@ -1754,17 +1698,13 @@ ToFile( "SOLARVERSION",      $SOLARVERSION,      "e" );
 ToFile( "WORKDIR",           $WORKDIR,           "e" );
 ToFile( "OUTDIR",            $OUTDIR,            "e" );
 ToFile( "SOLARENV",          $SOLARENV,          "e" );
+ToFile( "SOLARDEFIMG",       $SOLARDEFIMG,       "e" );
 ToFile( "SOLARENVINC",       $SOLARENVINC,       "e" );
-ToFile( "LOCALINI",          $LOCALINI,          "e" );
-ToFile( "STAR_INIROOT",      $STAR_INIROOT,      "e" );
-ToFile( "STAR_INIROOTOLD",   $STAR_INIROOTOLD,   "e" );
-ToFile( "STAR_STANDLST",     $STAR_STANDLST,     "e" );
-ToFile( "STAR_SSCOMMON",     $STAR_SSCOMMON,     "e" );
-ToFile( "STAR_SSOLARINI",    $STAR_SSOLARINI,    "e" );
 ToFile( "DMAKEROOT",         $DMAKEROOT,         "e" );
 if ( $JDK ne "gcj" ) {
    ToFile( "CLASSPATH",         $CLASSPATH,         "e" );
    ToFile( "XCLASSPATH",        $XCLASSPATH,        "e" );
+   ToFile( "JAVACISKAFFE",     '@JAVACISKAFFE@',    "e" );
 }
 else {
    ToFile( "JAVACISGCJ",       '@JAVACISGCJ@',      "e" );
@@ -1773,34 +1713,111 @@ if ( $GUI eq "UNX" ) {
    ToFile( "AWTLIB",           '@AWTLIB@',          "e" );
 }
 if ( '@JDK@' ne '' )
-{ 
+{
    ToFile( "JDK",             "@JDK@",           "e" );
    ToFile( "JAVAFLAGS",             "@JAVAFLAGS@",           "e" );
+   ToFile( "JAVA_SOURCE_VER", "@JAVA_SOURCE_VER@","e" );
+   ToFile( "JAVA_TARGET_VER", "@JAVA_TARGET_VER@","e" );
    ToFile( "JAVAINTERPRETER", PathFormat("@JAVAINTERPRETER@"), "e" );
    ToFile( "JAVAIFLAGS",      "@JAVAIFLAGS@",    "e" );
    ToFile( "JAVACOMPILER",    PathFormat("@JAVACOMPILER@"), "e" );
-   ToFile( "JAVAAOTCOMPILER", PathFormat("@JAVAAOTCOMPILER@"), "e" );
    ToFile( "JAVADOC",         PathFormat("@JAVADOC@"), "e" );
+   ToFile( "JVM_ONE_PATH_CHECK", "@JVM_ONE_PATH_CHECK@", "e" );
 }
 ToFile( "SCPDEFS",           '@SCPDEFS@',        "e" );
 ToFile( "SOLAREXTRAINC",     $SOLAREXTRAINC,     "e" );
 ToFile( "SOLAREXTRALIB",     $SOLAREXTRALIB,     "e" );
-ToFile( "PATH",              $PATH,              "e" );
+if ( '@CROSS_COMPILING@' eq 'YES' )
+{
+   # Obviously we shouldn't set PATH to contain host binaries
+   ToFile( "PATH",           "@PATH_FOR_BUILD@", "e" );
+}
+else
+{
+   ToFile( "PATH",           $PATH,              "e" );
+}
 ToFile( "SOLARLIB",          $SOLARLIB,          "e" );
+ToFile( "JAVALIB",           $JAVALIB,           "e" );
 ToFile( "SOLARINC",          $SOLARINC,          "e" );
 ToFile( "COMP_ENV",          $COMP_ENV,          "e" );
 ToFile( "JAVAHOME",          $JAVAHOME,          "e" );
 ToFile( "CC",                $CC,                "e" );
+ToFile( "SYSBASE",           "$ENV{SYSBASE}",    "e" ) if defined $ENV{SYSBASE};
+ToFile( "CROSS_COMPILING",   "@CROSS_COMPILING@","e" );
+ToFile( "AR",                "@AR@",             "e" );
+ToFile( "DLLTOOL",           "@DLLTOOL@",        "e" );
+ToFile( "NM",                "@NM@",             "e" );
+ToFile( "OBJDUMP",           "@OBJDUMP@",        "e" );
+ToFile( "PKG_CONFIG",        "@PKG_CONFIG@",     "e" );
+ToFile( "RANLIB",            "@RANLIB@",         "e" );
+ToFile( "STRIP",             "@STRIP@",          "e" );
+ToFile( "WINDRES",           "@WINDRES@",        "e" );
+ToFile( "BUILD_PLATFORM",    "@build@",          "e" );
+ToFile( "HOST_PLATFORM",     "@host@",           "e" );
+if ( '@CROSS_COMPILING@' eq 'YES' )
+{
+   ToFile( "COM_FOR_BUILD",     "@COM_FOR_BUILD@",  "e" );
+   ToFile( "GUI_FOR_BUILD",     "@GUI_FOR_BUILD@",  "e" );
+   ToFile( "GUIBASE_FOR_BUILD", "@GUIBASE_FOR_BUILD@", "e" );
+   ToFile( "OS_FOR_BUILD",      "@OS_FOR_BUILD@",   "e" );
+   ToFile( "CPU_FOR_BUILD",     "@CPU_FOR_BUILD@",  "e" );
+   ToFile( "CPUNAME_FOR_BUILD", "@CPUNAME_FOR_BUILD@", "e" );
+   ToFile( "CC_FOR_BUILD",      "@CC_FOR_BUILD@",   "e" );
+   ToFile( "CXX_FOR_BUILD",     "@CXX_FOR_BUILD@",  "e" );
+   ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", "@GXX_INCLUDE_PATH_FOR_BUILD@", "e" );
+   ToFile( "INPATH_FOR_BUILD",  "@INPATH_FOR_BUILD@", "e" );
+   ToFile( "OUTPATH_FOR_BUILD", "@OUTPATH_FOR_BUILD@", "e" );
+   ToFile( "MACOSX_DEPLOYMENT_TARGET_FOR_BUILD", "@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@", "e" );
+   ToFile( "SYSTEM_LIBXSLT_FOR_BUILD", "@SYSTEM_LIBXSLT_FOR_BUILD@", "e" );
+   ToFile( "OUTDIR_FOR_BUILD",  "@OUTDIR_FOR_BUILD@", "e");
+   ToFile( "SOLARINC_FOR_BUILD", "@SOLARINC_FOR_BUILD@", "e");
+   ToFile( "SOLARLIB_FOR_BUILD", "@SOLARLIB_FOR_BUILD@", "e");
+   ToFile( "WORKDIR_FOR_BUILD", "@WORKDIR_FOR_BUILD@", "e");
+}
+else
+{
+   ToFile( "COM_FOR_BUILD",     $COM,            "e" );
+   ToFile( "GUI_FOR_BUILD",     $GUI,            "e" );
+   ToFile( "GUIBASE_FOR_BUILD", $GUIBASE,        "e" );
+   ToFile( "OS_FOR_BUILD",      $OS,             "e" );
+   ToFile( "CPU_FOR_BUILD",     $CPU,            "e" );
+   ToFile( "CPUNAME_FOR_BUILD", $CPUNAME,        "e" );
+   ToFile( "CC_FOR_BUILD",      $CC,             "e" );
+   ToFile( "CXX_FOR_BUILD",     $CXX,            "e" );
+   ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", PathFormat("@GXX_INCLUDE_PATH@"), "e" );
+   ToFile( "INPATH_FOR_BUILD",  $INPATH,         "e" );
+   ToFile( "OUTPATH_FOR_BUILD", $OUTPATH,        "e" );
+   ToFile( "SYSTEM_LIBXSLT_FOR_BUILD", "@SYSTEM_LIBXSLT@", "e" );
+   ToFile( "OUTDIR_FOR_BUILD",  $OUTDIR,         "e" );
+   ToFile( "PATH_FOR_BUILD",    $PATH,           "e" );
+   ToFile( "SOLARINC_FOR_BUILD", $SOLARINC,      "e" );
+   ToFile( "SOLARLIB_FOR_BUILD", $SOLARLIB,      "e" );
+   ToFile( "WORKDIR_FOR_BUILD", $WORKDIR,        "e" );
+}
+ToFile( "SIZEOF_SHORT",         "@SIZEOF_SHORT@", "e" );
+ToFile( "SIZEOF_INT",           "@SIZEOF_INT@",  "e" );
+ToFile( "SIZEOF_LONG",          "@SIZEOF_LONG@", "e" );
+ToFile( "SIZEOF_LONGLONG",      "@SIZEOF_LONGLONG@", "e" );
+ToFile( "SIZEOF_DOUBLE",        "@SIZEOF_DOUBLE@", "e" );
+ToFile( "SIZEOF_POINTER",       "@SIZEOF_POINTER@", "e" );
+ToFile( "ALIGNOF_SHORT",        "@ALIGNOF_SHORT@", "e" );
+ToFile( "ALIGNOF_INT",          "@ALIGNOF_INT@", "e" );
+ToFile( "ALIGNOF_LONG",         "@ALIGNOF_LONG@", "e" );
+ToFile( "ALIGNOF_DOUBLE",       "@ALIGNOF_DOUBLE@", "e" );
 ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
 		"@HAVE_GCC_VISIBILITY_FEATURE@", "e" );
+ToFile( "HAVE_GCC_VISIBILITY_BROKEN",
+        "@HAVE_GCC_VISIBILITY_BROKEN@", "e" );
 ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
+ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" );
 ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
 		"@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
+ToFile( "HAVE_CXX0X",        "@HAVE_CXX0X@",     "e" );
 ToFile( "CXX",               $CXX,               "e" );
 ToFile( "USE_CCACHE",        "@USE_CCACHE@",     "e" );
 ToFile( "MINGWCXX",          "@MINGWCXX@",       "e" );
 ToFile( "MINGWSTRIP",        "@MINGWSTRIP@",     "e" );
-ToFile( "USE_SYSTEM_STL",    "@USE_SYSTEM_STL@", "e" );
+ToFile( "WITH_STLPORT",      "@WITH_STLPORT@", "e" );
 ToFile( "ALLOC",             "@ALLOC@",          "e" );
 ToFile( "ENABLE_SYMBOLS",    "@ENABLE_SYMBOLS@",    "e" );
 ToFile( "DISABLE_STRIP",     "@DISABLE_STRIP@",     "e" );
@@ -1816,7 +1833,7 @@ ToFile( "ENABLE_GRAPHITE",   "@ENABLE_GRAPHITE@",   "e");
 ToFile( "SYSTEM_GRAPHITE",   "@SYSTEM_GRAPHITE@",   "e");
 ToFile( "GRAPHITE_LIBS",     "@GRAPHITE_LIBS@",     "e");
 ToFile( "GRAPHITE_CFLAGS",   "@GRAPHITE_CFLAGS@",   "e");
-ToFile( "VC_STANDARD",       "@VC_STANDARD@",      "e" );
+ToFile( "CL_X64",            "@CL_X64@",            "e");
 ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e");
 ToFile( "SYSTEM_DICTS",      "@SYSTEM_DICTS@",     "e");
 ToFile( "DICT_SYSTEM_DIR",   "@DICT_SYSTEM_DIR@",  "e");
@@ -1835,14 +1852,43 @@ ToFile( "MOZ_LIB",           "@MOZ_LIB@",          "e" );
 ToFile( "MOZ_LIB_XPCOM",     "@MOZ_LIB_XPCOM@",    "e" );
 ToFile( "MOZ_NSPR_CFLAGS",   "@MOZ_NSPR_CFLAGS@",  "e" );
 ToFile( "MOZ_NSS_CFLAGS",    "@MOZ_NSS_CFLAGS@",   "e" );
+ToFile( "MOZ_NSS_LIBS",      "@MOZ_NSS_LIBS@",     "e" );
 ToFile( "MOZ_LDAP_CFLAGS",   "@MOZ_LDAP_CFLAGS@",  "e" );
+ToFile( "OOOP_GALLERY_PACK", "@OOOP_GALLERY_PACK@","e" );
+ToFile( "OOOP_TEMPLATES_PACK", "@OOOP_TEMPLATES_PACK@","e" );
+ToFile( "OOOP_FONTS_PACK",   "@OOOP_FONTS_PACK@","e" );
+ToFile( "OOOP_SAMPLES_PACK", "@OOOP_SAMPLES_PACK@","e" );
+ToFile( "CT2N_EXTENSION_PACK", "@CT2N_EXTENSION_PACK@","e" );
+ToFile( "BARCODE_EXTENSION_PACK", "@BARCODE_EXTENSION_PACK@","e" );
+ToFile( "DIAGRAM_EXTENSION_PACK", "@DIAGRAM_EXTENSION_PACK@","e" );
+ToFile( "VALIDATOR_EXTENSION_PACK", "@VALIDATOR_EXTENSION_PACK@","e" );
+ToFile( "WATCH_WINDOW_EXTENSION_PACK", "@WATCH_WINDOW_EXTENSION_PACK@","e" );
+ToFile( "NUMBERTEXT_EXTENSION_PACK", "@NUMBERTEXT_EXTENSION_PACK@","e" );
+ToFile( "HUNART_EXTENSION_PACK", "@HUNART_EXTENSION_PACK@","e" );
+ToFile( "TYPO_EXTENSION_PACK", "@TYPO_EXTENSION_PACK@","e" );
+ToFile( "GOOGLE_DOCS_EXTENSION_PACK", "@GOOGLE_DOCS_EXTENSION_PACK@","e" );
+ToFile( "OOOBLOGGER_EXTENSION_PACK", "@OOOBLOGGER_EXTENSION_PACK@","e" );
+ToFile( "SUNTEMPLATES_LANG", "@SUNTEMPLATES_LANG@","e" );
+ToFile( "SUNTEMPLATES_DE_PACK", "@SUNTEMPLATES_DE_PACK@","e" );
+ToFile( "SUNTEMPLATES_EN_US_PACK", "@SUNTEMPLATES_EN_US_PACK@","e" );
+ToFile( "SUNTEMPLATES_ES_PACK", "@SUNTEMPLATES_ES_PACK@","e" );
+ToFile( "SUNTEMPLATES_FR_PACK", "@SUNTEMPLATES_FR_PACK@","e" );
+ToFile( "SUNTEMPLATES_HU_PACK", "@SUNTEMPLATES_HU_PACK@","e" );
+ToFile( "SUNTEMPLATES_IT_PACK", "@SUNTEMPLATES_IT_PACK@","e" );
+ToFile( "LIGHTPROOF_EN_US_PACK", "@LIGHTPROOF_EN_US_PACK@","e" );
+ToFile( "LIGHTPROOF_HU_PACK", "@LIGHTPROOF_HU_PACK@","e" );
+ToFile( "LIGHTPROOF_LANG",   "@LIGHTPROOF_LANG@",  "e" );
 ToFile( "WITH_FONTS",        "@WITH_FONTS@",       "e" );
+ToFile( "WITH_AGFA_MONOTYPE_FONTS",  "@WITH_AGFA_MONOTYPE_FONTS@", "e" );
 ToFile( "WITHOUT_AFMS",      "@WITHOUT_AFMS@",     "e" );
 ToFile( "WITHOUT_PPDS",      "@WITHOUT_PPDS@",     "e" );
 ToFile( "WITH_BINFILTER",    "@WITH_BINFILTER@",   "e" );
 ToFile( "BUILD_TYPE",        "$BUILD_TYPE",       "e" );
 ToFile( "VERBOSE",           "@VERBOSE@",          "e" );
+ToFile( "ENABLE_ZENITY",           "@ENABLE_ZENITY@",          "e" );
 ToFile( "ENABLE_EVOAB2",     "@ENABLE_EVOAB2@",    "e" );
+ToFile( "ENABLE_UGLY",       "@ENABLE_UGLY@",      "e" );
+ToFile( "ENABLE_RELEASE_BUILD", "@ENABLE_RELEASE_BUILD@", "e" );
 ToFile( "GOBJECT_CFLAGS",    "@GOBJECT_CFLAGS@",   "e" );
 ToFile( "GOBJECT_LIBS",      "@GOBJECT_LIBS@",     "e" );
 if ( '@ENABLE_RPATH@' eq "no" ) {
@@ -1851,18 +1897,18 @@ if ( '@ENABLE_RPATH@' eq "no" ) {
 ToFile( "EPM",               "@EPM@",              "e" );
 ToFile( "EPM_FLAGS",         $EPM_FLAGS,           "e" );
 ToFile( "BUILD_EPM",         "@BUILD_EPM@",        "e" );
+ToFile( "GPERF",             "@GPERF@",            "e" );
 ToFile( "PKGFORMAT",         "@PKGFORMAT@",        "e" );
 ToFile( "SYSTEM_STDLIBS",    "@SYSTEM_STDLIBS@",   "e" );
 ToFile( "SYSTEM_ZLIB",       "@SYSTEM_ZLIB@",      "e" );
 ToFile( "SYSTEM_OPENSSL",    "@SYSTEM_OPENSSL@",   "e" );
 ToFile( "OPENSSL_CFLAGS",    "@OPENSSL_CFLAGS@",   "e" );
 ToFile( "OPENSSL_LIBS",      "@OPENSSL_LIBS@",     "e" );
+ToFile( "DISABLE_PYTHON",    "@DISABLE_PYTHON@",   "e" );
 ToFile( "SYSTEM_PYTHON",     "@SYSTEM_PYTHON@",    "e" );
+ToFile( "PYTHON",            "@PYTHON@",           "e" );
 ToFile( "PYTHON_CFLAGS",     "@PYTHON_CFLAGS@",    "e" );
 ToFile( "PYTHON_LIBS",       "@PYTHON_LIBS@",      "e" );
-if ($SYSTEM_PYTHON eq "NO") {
-ToFile( "HOME",              "@HOME@",             "e" );
-}
 ToFile( "SYSTEM_ICU",        "@SYSTEM_ICU@",       "e" );
 ToFile( "ICU_MAJOR",         "@ICU_MAJOR@",        "e" );
 ToFile( "ICU_MINOR",         "@ICU_MINOR@",        "e" );
@@ -1885,9 +1931,20 @@ ToFile( "CAIRO_LIBS",        "@CAIRO_LIBS@",       "e" );
 ToFile( "XRANDR_CFLAGS",     "@XRANDR_CFLAGS@",    "e" );
 ToFile( "XRANDR_LIBS",       "@XRANDR_LIBS@",      "e" );
 ToFile( "XRANDR_DLOPEN",     "@XRANDR_DLOPEN@",    "e" );
+ToFile( "LIBPNG_CFLAGS",     "@LIBPNG_CFLAGS@",    "e" );
+ToFile( "LIBPNG_LIBS",       "@LIBPNG_LIBS@",      "e" );
 ToFile( "SYSTEM_LIBWPD",     "@SYSTEM_LIBWPD@",    "e" );
 ToFile( "LIBWPD_CFLAGS",     "@LIBWPD_CFLAGS@",    "e" );
 ToFile( "LIBWPD_LIBS",       "@LIBWPD_LIBS@",      "e" );
+ToFile( "SYSTEM_LIBWPS",     "@SYSTEM_LIBWPS@",    "e" );
+ToFile( "LIBWPS_CFLAGS",     "@LIBWPS_CFLAGS@",    "e" );
+ToFile( "LIBWPS_LIBS",       "@LIBWPS_LIBS@",      "e" );
+ToFile( "SYSTEM_LIBWPG",     "@SYSTEM_LIBWPG@",    "e" );
+ToFile( "LIBWPG_CFLAGS",     "@LIBWPG_CFLAGS@",    "e" );
+ToFile( "LIBWPG_LIBS",       "@LIBWPG_LIBS@",      "e" );
+ToFile( "SYSTEM_LIBVISIO",   "@SYSTEM_LIBVISIO@",  "e" );
+ToFile( "LIBVISIO_CFLAGS",   "@LIBVISIO_CFLAGS@",  "e" );
+ToFile( "LIBVISIO_LIBS",     "@LIBVISIO_LIBS@",    "e" );
 ToFile( "SYSTEM_CPPUNIT",    "@SYSTEM_CPPUNIT@",   "e" );
 ToFile( "CPPUNIT_CFLAGS",    "@CPPUNIT_CFLAGS@",   "e" );
 ToFile( "CPPUNIT_LIBS",      "@CPPUNIT_LIBS@",     "e" );
@@ -1896,10 +1953,17 @@ ToFile( "USE_FT_EMBOLDEN",   "@USE_FT_EMBOLDEN@",  "e" );
 ToFile( "LIBXML_CFLAGS",     "@LIBXML_CFLAGS@",    "e" );
 ToFile( "LIBXML_LIBS",       "@LIBXML_LIBS@",      "e" );
 ToFile( "SYSTEM_EXPAT",      "@SYSTEM_EXPAT@",     "e" );
+ToFile( "WITH_EXTRA_GALLERY",       "@WITH_EXTRA_GALLERY@",      "e" );
+ToFile( "WITH_EXTRA_TEMPLATE",       "@WITH_EXTRA_TEMPLATE@",      "e" );
+ToFile( "WITH_EXTRA_SAMPLE",       "@WITH_EXTRA_SAMPLE@",      "e" );
+ToFile( "WITH_EXTRA_FONT",       "@WITH_EXTRA_FONT@",      "e" );
+ToFile( "SYSTEM_TRANSLATE_TOOLKIT", "@SYSTEM_TRANSLATE_TOOLKIT@",        "e" );
 ToFile( "SYSTEM_DB",         "@SYSTEM_DB@",        "e" );
-ToFile( "DB_VERSION",        "@DB_VERSION@",       "e" );
-ToFile( "DB_INCLUDES",       "@DB_INCLUDES@",      "e" );
+ToFile( "SYSTEM_DB_CFLAGS",  "@SYSTEM_DB_CFLAGS@", "e" );
+ToFile( "DB_LIB",            "@DB_LIB@",           "e" );
+ToFile( "DB_CPPLIB",         "@DB_CPPLIB@",        "e" );
 ToFile( "ENABLE_MYSQLC",     "@ENABLE_MYSQLC@",    "e" );
+ToFile( "ENABLE_LOMENUBAR",  "@ENABLE_LOMENUBAR@", "e" );
 ToFile( "SYSTEM_MYSQL",      "@SYSTEM_MYSQL@",     "e" );
 ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" );
 ToFile( "MYSQL_INC",         "@MYSQL_INC@",        "e" );
@@ -1919,15 +1983,19 @@ ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );
 ToFile( "SYSTEM_LIBXSLT",    "@SYSTEM_LIBXSLT@",   "e" );
 ToFile( "LIBXSLT_CFLAGS",    "@LIBXSLT_CFLAGS@",   "e" );
 ToFile( "LIBXSLT_LIBS",      "@LIBXSLT_LIBS@",     "e" );
+ToFile( "XSLTPROC",          "@XSLTPROC@",         "e" );
 ToFile( "SYSTEM_SANE_HEADER","@SYSTEM_SANE_HEADER@","e" );
 ToFile( "SYSTEM_XRENDER_HEADERS","@SYSTEM_XRENDER_HEADERS@","e" );
+ToFile( "SYSTEM_MESA_HEADERS","@SYSTEM_MESA_HEADERS@","e" );
 ToFile( "SYSTEM_CURL",       "@SYSTEM_CURL@",      "e" );
 ToFile( "CURL_CFLAGS",       "@CURL_CFLAGS@",      "e" );
 ToFile( "CURL_LIBS",         "@CURL_LIBS@",        "e" );
 ToFile( "SYSTEM_BOOST",      "@SYSTEM_BOOST@",     "e" );
+ToFile( "MDDS_CPPFLAGS",     "@MDDS_CPPFLAGS@",     "e" );
 ToFile( "SYSTEM_MDDS",       "@SYSTEM_MDDS@",      "e" );
 ToFile( "SYSTEM_VIGRA",      "@SYSTEM_VIGRA@",     "e" );
 ToFile( "SYSTEM_NEON",       "@SYSTEM_NEON@",      "e" );
+ToFile( "ENABLE_LIBRSVG",    "@ENABLE_LIBRSVG@",   "e" );
 ToFile( "SYSTEM_LIBRSVG",    "@SYSTEM_LIBRSVG@",   "e" );
 ToFile( "SYSTEM_GDKPIXBUF",  "@SYSTEM_GDKPIXBUF@",   "e" );
 ToFile( "SYSTEM_GLIB",       "@SYSTEM_GLIB@",   "e" );
@@ -1941,10 +2009,6 @@ ToFile( "NEON_VERSION",      "@NEON_VERSION@",     "e" );
 ToFile( "NEON_LIBS",         "@NEON_LIBS@",        "e" );
 ToFile( "NEON_CFLAGS",       "@NEON_CFLAGS@",      "e" );
 ToFile( "DISABLE_NEON",      "@DISABLE_NEON@",     "e" );
-ToFile( "DISABLE_XAW",       "@DISABLE_XAW@",      "e" );
-ToFile( "ENABLE_AGG",        "@ENABLE_AGG@",       "e" );
-ToFile( "SYSTEM_AGG",	     "@SYSTEM_AGG@",       "e" );
-ToFile( "AGG_VERSION",	     "@AGG_VERSION@",      "e" );
 ToFile( "BUILD_DMAKE",       "@BUILD_DMAKE@",      "e" );
 ToFile( "BUILD_STAX",        "@BUILD_STAX@",       "e" );
 ToFile( "BUILD_UNOWINREG",   "@BUILD_UNOWINREG@",  "e" );
@@ -1967,22 +2031,18 @@ ToFile( "MYTHES_CFLAGS",     "@MYTHES_CFLAGS@",    "e" );
 ToFile( "MYTHES_LIBS",       "@MYTHES_LIBS@",      "e" );
 ToFile( "SYSTEM_LIBTEXTCAT", "@SYSTEM_LIBTEXTCAT@","e" );
 ToFile( "SYSTEM_LIBTEXTCAT_DATA","@SYSTEM_LIBTEXTCAT_DATA@","e" );
-ToFile( "PAM",               "@PAM@",              "e" );
-ToFile( "NEW_SHADOW_API",    "@NEW_SHADOW_API@",   "e" );
-ToFile( "PAM_LINK",          "@PAM_LINK@",         "e" );
-ToFile( "CRYPT_LINK",        "@CRYPT_LINK@",       "e" );
 ToFile( "XAU_LIBS",          "@XAU_LIBS@",         "e" );
 ToFile( "GXX_INCLUDE_PATH",  PathFormat("@GXX_INCLUDE_PATH@"), "e" );
 ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS,  "e" );
-if ($platform !~ m/cygwin|os2/) {
-   if ( $ENV{"TMPDIR"} eq "" ) {
+
+if ($platform !~ m/cygwin/) {
+   if ( !defined $ENV{"TMPDIR"} || $ENV{"TMPDIR"} eq "" ) {
       ToFile( "TMPDIR",      "/tmp",               "e" );
    } else {
       ToFile( "TMPDIR",      "$ENV{'TMPDIR'}",     "e" );
    }
 }
 ToFile( "SOLARSRC",           $SOLARSRC,           "e" );
-ToFile( "SOURCE_ROOT_DIR",    $SOURCE_ROOT_DIR,    "e" );
 ToFile( "gb_REPOS",           $gb_REPOS,           "e" );
 
 if ( $platform =~ m/cygwin/ )
@@ -2007,26 +2067,10 @@ if ( $platform =~ m/cygwin/ )
    ToFile( "GNUCOPY",           $WIN_GNUCOPY,       "e" );
    ToFile( "TOUCH",             $WIN_TOUCH,         "e" );
 }
-if ( $platform =~ m/os2/ )
-{
-   #ToFile( "ILIB",              $ILIB,              "e" );
-   
-   ToFile( "GREP",              "grep.exe",         "e" );
-   ToFile( "FIND",              "find.exe",         "e" );
-   ToFile( "LS",                "ls.exe",           "e" );
-   ToFile( "GNUCOPY",           "cp.exe",           "e" );
-   ToFile( "TOUCH",             "touch",            "e" );
-}
 
-# $perlpre is only used for the following three variables
-# and only set for OS2.
-my $perlpre = "";
-if (( $platform =~ m/os2/ )) {
-   $perlpre = "perl ".${SOLARENV}.${BIN}.${ds};
-}
-ToFile( "DELIVER",       $perlpre."deliver.pl",     "e" );
-ToFile( "MKOUT",         $perlpre."mkout.pl",       "e" );
-ToFile( "ZIPDEP",        $perlpre."zipdep.pl",      "e" );
+ToFile( "DELIVER",       "deliver.pl",     "e" );
+ToFile( "MKOUT",         "mkout.pl",       "e" );
+ToFile( "ZIPDEP",        "zipdep.pl",      "e" );
 
 #
 # Writing the aliases to file.
@@ -2040,9 +2084,6 @@ ToFile( "alias zipdep",      $zipdep,            "a" );
 if ( $platform !~ m/cygwin/ )
 {  ToFile( "alias nmake",       $nmake,             "a" );
 }
-if ( $platform =~ m/os2/ )
-{  ToFile( "alias gunzip",       "gzip -d",         "a" );
-}
 
 
 # on Solaris, MacOSX and FreeBSD, set GNUCOPY and GNUPATCH
@@ -2051,28 +2092,20 @@ if ($platform =~ m/solaris|darwin|freebsd/)
   ToFile( "GNUPATCH",   "@GNUPATCH@",	"e");
 }
 ToFile( "GNUCOPY",	"@GNUCP@",	"e");
-# OS/2 define .pl as executable for 4os2
-# use - as switch char for dmake (os2/switchar.c)
-if ($platform =~ m/os2/)
-{
-  ToFile( ".pl",   	"perl",	"e");
-  ToFile( "SWITCHAR",   "-",	"e");
-}
 ToFile( "SAL_ENABLE_FILE_LOCKING",	"1",	"e");
+
+ToFile( "ENV_SCRIPT", "$outfile", "e" );
 #
 # Writing unset variables you might not need to file.
-# 
-print OUT_SH "export $exportvars$newline";
-print OUT_SH "unset $unsetvarssh$newline";
-
+#
+print OUT "export $exportvars$newline";
+print OUT "unset $unsetvars$newline";
 
 #
 #---------------------------
 # VIII. Closing output file.
 #---------------------------
 #
-close( OUT_SH ) || print "Can't close $outfile_sh: $!";
-
 #
 #------------------------------
 # IX. Sourcing the output file.
@@ -2091,43 +2124,29 @@ if (rename( $outfile, $tmp ) ne 1)
 {  `mv -f $outfile $tmp`;
 }
 
-$tmp = $SRC_ROOT.$ds.$outfile_sh;
-if (rename( $outfile_sh, $tmp ) ne 1)
-{  `mv -f $outfile_sh $tmp`;
-}
-
 #
 #--------------------------------------------------------
 # XII. Message at the end.
 #--------------------------------------------------------
 #
 #
+print "$newline";
 print "*********************************************************".
-      "******************* $newline"."*"."$newline";
-print "* OpenOffice.org $UPD configuration. $newline";
-for ( $tmp = 0; $tmp < 2; $tmp++ ) 
-{  print "* $newline";
-}
-print "* Configuration part of OpenOffice.org $UPD build is finished. $newline* $newline";
-print "* NB! Be aware that you might not be able to build OpenOffice.org if you $newline".
-      "* ignore any warning message that were generated during this configuration $newline".
-      "* process. $newline* $newline";
+      "*******************$newline*$newline";
+print "* LibreOffice configuration finished. $newline*$newline";
 
-if ( $Warning ne "" ) 
-{  print "$Warning*"; 
-   print "$newline";
+if ( $Warning ne "" )
+{  print "$Warning*$newline";
 }
 
-print "*$newline* USAGE: $newline";
-print "* Source $outfile.sh (in sh)";
-print "$newline";
-print "* in order to set up the build-environment variables.$newline";
-for ( $tmp = 0; $tmp < 2; $tmp++ ) 
-{  print "* $newline";
-}
 print "*********************************************************".
       "******************* $newline";
 
+print "To build, issue:\n$GNUMAKE\n\n";
+print "To install when the build is finished, issue:\n$GNUMAKE install\n\n";
+print "If you want to develop LibreOffice, you might prefer:\n$GNUMAKE dev-install\n\n";
+print "If you want to run the smoketest, issue:\n$GNUMAKE check\n\n";
+
 $bootfile = "bootstrap";
 open( OUT, ">$bootfile" ) ||
 die "Cannot open $bootfile: $!\n";
@@ -2147,8 +2166,6 @@ if (rename( $bootfile, $tmp ) ne 1)
 {  `mv -f $bootfile $tmp`;
 }
 
-print "Configure completed\n";
-print "You may now run ./bootstrap in $SRC_ROOT\n";
 if ( $Warning ne "" ) {
 	print "***** WARNINGS ISSUED *****\n";
 }
@@ -2159,7 +2176,7 @@ if ( $Warning ne "" ) {
 #-----------------
 #
 #-------------------------------------------------------------
-# Function name: CheckPathName 
+# Function name: CheckPathName
 # Description:   chops off the '/' character if it's the last
 #                character in a pathname. also adds the '/'
 #                character if it's not the first character
@@ -2167,11 +2184,11 @@ if ( $Warning ne "" ) {
 # Arguments:     1. Path (string)
 # Return value:  Path (string)
 #-------------------------------------------------------------
-sub CheckPathName 
+sub CheckPathName
 {  my $retrn = $_[ 0 ];
    if ($platform =~ m/cygwin/)
    {  # Check if the first character is not a '/'.
-      if ( !( $_[ 0 ] =~ /^\// ) ) 
+      if ( !( $_[ 0 ] =~ /^\// ) )
       {  $retrn = $ds.$_[ 0 ];
       }
    }
@@ -2181,13 +2198,13 @@ sub CheckPathName
    return( $retrn );
 }
 #-------------------------------------------------------------
-# Function name: CheckPathExist 
+# Function name: CheckPathExist
 # Description:   Checks whether the directory that is given
 #                as an argument exists. If not abort.
 # Arguments:     1. Path (string)
 # Return value:  void
 #-------------------------------------------------------------
-sub CheckPathExist 
+sub CheckPathExist
 {  my $dir = $_[ 0 ];
    if ( !( -d $dir ) and $^O ne 'MSWin32' )
    {  print ( "The directory $_[ 0 ] does not exist. Please create first.\n" );
@@ -2200,7 +2217,7 @@ sub CheckPathExist
    }
 }
 #------------------------------------------------------------
-# Function name: CreateFileHeader 
+# Function name: CreateFileHeader
 # Description:   Creates a header for the outfile.
 # Arguments:     1. File to write to
 #                2. UPD (string)
@@ -2209,19 +2226,19 @@ sub CheckPathExist
 #                5. comment to use for this file
 # Return value:  void
 #------------------------------------------------------------
-sub CreateFileHeader 
+sub CreateFileHeader
 {  my $timestamp = `date`;
    chomp( $timestamp );
    my $filehandle = $_[0];
    my $comment = $_[4];
-   print { $filehandle } "$comment #################################################################"; 
+   print { $filehandle } "$comment #################################################################";
    print { $filehandle } $newline;
-   print { $filehandle } "$comment OpenOffice.org $_[ 1 ] build environment file for: $_[ 2 ]. $newline"; 
-   print { $filehandle } "$comment Generated on: $timestamp $newline"; 
-   print { $filehandle } "$comment Source this file to set up the build environment. $newline"; 
-   print { $filehandle } "$comment 1. exec $_[3] $newline"; 
-   print { $filehandle } "$comment 2. source $outfile $newline"; 
-   print { $filehandle } "$comment #################################################################"; 
+   print { $filehandle } "$comment LibreOffice $_[ 1 ] build environment file for: $_[ 2 ]. $newline";
+   print { $filehandle } "$comment Generated on: $timestamp $newline";
+   print { $filehandle } "$comment Source this file to set up the build environment. $newline";
+   print { $filehandle } "$comment 1. exec $_[3] $newline";
+   print { $filehandle } "$comment 2. source $outfile $newline";
+   print { $filehandle } "$comment #################################################################";
    print { $filehandle } $newline;
 }
 #---------------------------------------------------------
@@ -2234,7 +2251,7 @@ sub CreateFileHeader
 #                   a - alias
 #                   c - comment
 #                   n - newline
-#                   z - raw, write as is to OUT_SH
+#                   z - raw, write as is to OUT
 # Return value:  void
 #---------------------------------------------------------
 sub ToFile {
@@ -2242,46 +2259,39 @@ sub ToFile {
       # Write an environment variable to file.
       if (defined $_[ 1 ] && $_[ 1 ] ne "" ) {
          my $envvar = $_[ 1 ];
-         my $envvarbash = $envvar;
 
          # Tcsh/bash needs backslashes quoted
          $envvar =~ s/\\/\\\\/g;
-         $envvarbash = $envvar;
 
-         printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $envvar);
-         print OUT_SH "$_[ 0 ]=\"$envvarbash\"$newline";   # to sh file
+         printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $envvar) if ( '@VERBOSE@' eq 'TRUE' );
          $exportvars .= " $_[ 0 ]";                        # add to export list for sh file
 
       } else {
-         printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", "unset") ; # to stdout
-         $unsetvars .= "$unsetenv $_[ 0 ] >& /dev/null$newline"; # for tcsh file
-         $unsetvarssh .= " $_[ 0 ]";                             # for sh file
+         printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", "unset") if ( '@VERBOSE@' eq 'TRUE' );
+         $unsetvars .= " $_[ 0 ]";                             # for sh file
       }
    }
-   elsif ( $_[ 2 ] eq "a" ) 
+   elsif ( $_[ 2 ] eq "a" )
    {  # Write an alias to file.
-      print "The $_[ 0 ] is set to: $_[ 1 ]\n";    # to stdout
-      print OUT_SH "$_[ 0 ]=$_[ 1 ]$newline";      # to sh file
+      print "The $_[ 0 ] is set to: $_[ 1 ]\n" if ( '@VERBOSE@' eq 'TRUE' );    # to stdout
    }
-   elsif ( $_[ 2 ] eq "c" ) 
+   elsif ( $_[ 2 ] eq "c" )
    {  # Write a comment to file.
-      print "$newline";
-      print "$comment$newline";
-      print "$comment $_[ 0 ]$newline";
-      print "$comment$newline";
-      print OUT_SH "$newline";
-      print OUT_SH "$comment$newline";
-      print OUT_SH "$comment $_[ 0 ]$newline";
-      print OUT_SH "$comment$newline";
+      if ( '@VERBOSE@' eq 'TRUE' )
+      {
+         print "$newline";
+         print "$comment$newline";
+         print "$comment $_[ 0 ]$newline";
+         print "$comment$newline";
+      }
    }
    elsif ( $_[ 2 ] eq "n" )
    {  #Write a newline to a file
-      print OUT_SH "$newline";
    }
    elsif ( $_[ 2 ] eq "z" )
    {
       #Write first argument as is, and nothing else
-      print OUT_SH "$_[ 0 ]$newline";
+      print OUT "$_[ 0 ]$newline";
    }
    else
    {  print "Unknown type!$newline";
@@ -2314,6 +2324,7 @@ sub PathFormat
        # Replace absolute paths or DOS paths with ...
        if ( ( $variable =~ m/^\// ) or ( $variable =~ m/:/ ) ) {
            # mixed mode paths
+           chomp( $variable = qx{realpath "$variable"} ) unless ($variable =~ m/:/);
            chomp( $variable = qx{cygpath -m "$variable"} );
        }
    }
@@ -2330,7 +2341,7 @@ sub CygFormat
 {  my ( $variable, $d1, $d2 );
    $variable = $_[ 0 ];
    # ToDo: Do the replacement only if Windows and var contains "\" and ":"
-   if ( $platform =~ m/cygwin|os2/ )
+   if ( $platform =~ m/cygwin/ )
    {
        # Complain if PosixPath is used on a PATH-like string
        if ( $variable =~ m/;/ ) {
@@ -2448,7 +2459,7 @@ sub WinPath
 
 #--------------------------------------------------------
 # Function name: GetCorrectPath
-# Description:   Creates the build environment. 
+# Description:   Creates the build environment.
 # Arguments:     1.   existing / original path
 #                2... pairs of <path, executable>
 # Return value:  String - Correct Path
@@ -2474,7 +2485,7 @@ sub GetCorrectPath
 		my $haystack = shift;
 		if ($needle eq $haystack) {
 		    return 1;
-		} 
+		}
 	    }
 	    return 0;
 	}	
@@ -2546,7 +2557,7 @@ sub GetCorrectPath
 }
 
 #------------------------------------------------------------
-# Function name: AddWarning 
+# Function name: AddWarning
 # Description:   Adds any kind of warning for the user.
 #                The warning will be shown at the end
 #                of this script.
@@ -2555,23 +2566,22 @@ sub GetCorrectPath
 #                2. Warning (string).
 # Return value:  void
 #------------------------------------------------------------
-sub AddWarning 
-{  if ( $_[ 0 ] eq "configure" ) 
+sub AddWarning
+{  if ( $_[ 0 ] eq "configure" )
    {  open( IN, $warnfile );
-      while ( <IN> ) 
+      while ( <IN> )
       {  $Warning = $Warning."* - ".$_;
       }
       close( IN );
       # Remove the temporary warning file.
       # unlink ( $warnfile );
    }
-   elsif ( $_[ 0 ] eq "set_soenv" ) 
+   elsif ( $_[ 0 ] eq "set_soenv" )
    {  my ( $arg1 );
       $arg1 = $_[ 1 ];
-      chomp( $arg1 );                            # cut off new line      
-      $Warning = $Warning."* - set_soenv: warning: $arg1 $newline";  # add the warning  
+      chomp( $arg1 );                            # cut off new line
+      $Warning = $Warning."* - set_soenv: warning: $arg1 $newline";  # add the warning
    }
 }
-#-------------------
-# That's all folks!
-#-------------------
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab: #
diff --git a/soldep/bootstrp/appdef.cxx b/soldep/bootstrp/appdef.cxx
deleted file mode 100644
index ac167d508027..000000000000
--- a/soldep/bootstrp/appdef.cxx
+++ /dev/null
@@ -1,165 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <soldep/appdef.hxx>
-
-const char* GetDefStandList()
-{
-    char* pRet;
-    char* pEnv = getenv("STAR_STANDLST");
-    if ( pEnv )
-    {
-        int nLen = strlen( pEnv );
-        pRet = ( char *) malloc( nLen + 1 );
-        (void) strcpy( pRet, pEnv );
-    }
-    else
-    {
-        int nLen = strlen( _DEF_STAND_LIST );
-        pRet = ( char *) malloc( nLen + 1 );
-        (void) strcpy( pRet, _DEF_STAND_LIST );
-    }
-    return pRet;
-}
-
-
-const char* GetIniRoot()
-{
-    char* pRet;
-    char* pEnv = getenv("STAR_INIROOT");
-    if ( pEnv )
-    {
-        int nLen = strlen( pEnv );
-        pRet = ( char *) malloc( nLen + 1 );
-        (void) strcpy( pRet, pEnv );
-    }
-    else
-    {
-        int nLen = strlen( _INIROOT );
-        pRet = ( char *) malloc( nLen + 1 );
-        (void) strcpy( pRet, _INIROOT );
-    }
-    return pRet;
-}
-
-const char* GetIniRootOld()
-{
-    char* pRet;
-    char* pEnv = getenv("STAR_INIROOTOLD");
-    if ( pEnv )
-    {
-        int nLen = strlen( pEnv );
-        pRet = ( char *) malloc( nLen + 1 );
-        (void) strcpy( pRet, pEnv );
-    }
-    else
-    {
-        int nLen = strlen( _INIROOT_OLD );
-        pRet = ( char *) malloc( nLen + 1 );
-        (void) strcpy( pRet, _INIROOT_OLD );
-    }
-    return pRet;
-}
-
-const char* GetSSolarIni()
-{
-    char* pRet;
-    char* pEnv = getenv("STAR_SSOLARINI");
-    if ( pEnv )
-    {
-        int nLen = strlen( pEnv );
-        pRet = ( char *) malloc( nLen + 1 );
-        (void) strcpy( pRet, pEnv );
-    }
-    else
-    {
-        int nLen = strlen( _DEF_SSOLARINI );
-        pRet = ( char *) malloc( nLen + 1 );
-        (void) strcpy( pRet, _DEF_SSOLARINI );
-    }
-    return pRet;
-}
-
-
-const char* GetSSCommon()
-{
-    char* pRet;
-    char* pEnv = getenv("STAR_SSCOMMON");
-    if ( pEnv )
-    {
-        int nLen = strlen( pEnv );
-        pRet = ( char *) malloc( nLen + 1 );
-        (void) strcpy( pRet, pEnv );
-    }
-    else
-    {
-        int nLen = strlen( _DEF_SSCOMMON );
-        pRet = ( char *) malloc( nLen + 1 );
-        (void) strcpy( pRet, _DEF_SSCOMMON );
-    }
-    return pRet;
-}
-
-
-const char* GetBServerRoot()
-{
-    char* pRet;
-    char* pEnv = getenv("STAR_BSERVERROOT");
-    if ( pEnv )
-    {
-        int nLen = strlen( pEnv );
-        pRet = ( char *) malloc( nLen + 1 );
-        (void) strcpy( pRet, pEnv );
-    }
-    else
-    {
-        int nLen = strlen( B_SERVER_ROOT );
-        pRet = ( char *) malloc( nLen + 1 );
-        (void) strcpy( pRet, B_SERVER_ROOT );
-    }
-    return pRet;
-}
-
-const char* GetEnv( const char *pVar )
-{
-    char *pRet = getenv( pVar );
-    if ( !pRet )
-        pRet = "";
-    return pRet;
-}
-
-const char* GetEnv( const char *pVar, const char *pDefault )
-{
-    char *pRet = getenv( pVar );
-    if ( !pRet )
-        return pDefault;
-    return pRet;
-}
diff --git a/soldep/bootstrp/build_list_converter.pl b/soldep/bootstrp/build_list_converter.pl
deleted file mode 100644
index 3887eca03a12..000000000000
--- a/soldep/bootstrp/build_list_converter.pl
+++ /dev/null
@@ -1,892 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#*****************************************************************************************
-# ASCII parser for the changeover of the current build.lst files to XML files            *
-# programmer: Pascal Junck, Sun Microsystems GmbH                                        *
-#*****************************************************************************************
-
-# this is the first step for the changeover of the current 'build.lst' files to the new
-# 'build.xlist'(XML) files
-# before we create the new ones we have to parse all important informations from the old files
-# important parameters are:
-# 1. 'module name'
-# 2. 'module dependency names'
-# 3. 'dependency type'
-# 4. 'job dir'
-# 5. 'depending directories'
-# 6. 'job platform'(only: 'w', 'u', 'm' and 'all')
-# 7. 'job'(only: 'nmake' means 'make')
-# 8. 'build requirements'(here called: 'restrictions')
-
-
-#################################  begin of main   #######################################
-
-use strict;
-use lib ("/home/vg119683/work/modules");
-
-use XMLBuildListParser;
-
-# get and work with each argument(build.lst files) of the commando line
-# e.g. if the user wants to parse the build.lst file(s):
-#   user input (on unix) for all modules    : 'perl -w ascii_parser.pl /so/ws/SRC680/src.m42/*/prj/build.lst'
-#   user input (on windows) for one module  : 'perl -w ascii_parser.pl O:/SRC680/src.m42/[module]/prj/build.lst'
-# get all arguments (build.lst files) of the commando line in this global variable '@buildlist_files'
-my @buildlist_files = @ARGV;
-# global variable for each file name that we want to parse in ASCII
-my $parse_file = "";
-# set the global variable '$debug' (= 1) to see all results on the terminal,
-# else (= 0) it shows nothing of the working output!
-my $debug = 0;
-
-# open the filehandle 'ERROR_LOG' for all errors
-open (ERROR_LOG, ">>ascii_parse.log")
-  or die "Error. Open the file <ascii_parse.log> wasn't successful!\n\n";
-
-# reference of the instance of a new object
-my $XMLTree;
-
-foreach (@buildlist_files)
-{
-   # get each element (= module) in '$parse_file'
-   $parse_file = $_;
-
-   # open the filehandle 'PARSE_ASCII' for each module/file that we want to parse
-   open (PARSE_ASCII, $parse_file)
-     or die "Error. Open the module <$parse_file> wasn't successful!\n\n";
-
-   # create a new object
-   $XMLTree = XMLBuildListParser->new();
-
-   # invoking of the main subroutine
-   reading_file();
-
-   # is the file name 'build.lst' in the path on the command line?
-   # if not, we can not parse and create the new 'build.xlist' file
-   if ($parse_file =~ /build(\w+)?\.lst\S*$/)
-   {
-      my $path = $parse_file;
-
-      $path =~ s/build(\w+)?\.lst\S*$/build\.xlist/;
-
-      $XMLTree->saveXMLFile($path);
-   }
-   else
-   {
-      add_errorlog_no_buildlst_file_found_statement($parse_file);
-   }
-
-   # close the current $parse_file
-   close(PARSE_ASCII);
-
-}
-# after all files were read close the errorlog file
-close(ERROR_LOG);
-
-
-###########################  begin of subroutines  #####################################
-#
-#                       global used variable: $parse_file
-#
-########################################################################################
-
-
-########################################################################################
-#       sub: reading_file
-#      gets: $_ (current file)
-#   returns: -
-########################################################################################
-sub reading_file
-{
-   # variable for the name of the current module
-   my $module_name = "";
-
-   # hashes for the infos beginning at the second line of the build.lst files
-   my %dir_of_job_platform = ();
-   my %dir_of_alias = ();
-
-   # control variable for the module dependency line of the file
-   #   like line 1 of module 'sal' (dependencies means the colon(s)) (SRC680/src.m42)
-   #   "sa      sal     :       xml2cmp NULL"
-   my $module_dependency_line_exists = 0;
-   my $module_dependency_line_was_read = 0;
-
-   # this line variables are for checking that all lines will be read
-   # counts each line
-   my $line_number = 0;
-   # for the sum of the informative lines (='module dependency line' and 'nmake' lines of the file)
-   my $info_line_sum = 0;
-   # for the sum of the no-info lines, like:
-   # job lines: 'usr1', 'get', ... and comment lines: '# ...' or empty lines
-   my $no_info_line_sum = 0;
-
-   # read all lines of the file to resolve the first alias
-   # with the matching dir to know all aliases and directories
-   # at the later second file reading
-   while (<PARSE_ASCII>)
-   {
-      # the variable for each line of a file
-      my $line = $_;
-
-      # count each line for more exact error descriptions in the log file
-      $line_number += 1;
-
-      # remember it, if this line exists
-      if ( (is_module_dependency_line($line)) && ($module_dependency_line_exists == 0) )
-      {
-         $module_dependency_line_exists = 1;
-
-         # get the name of the current module
-         $module_name = get_module_name($line);
-      }
-
-      # skip all lines, that hasn't the job 'nmake'
-      next if (!(is_nmake_line($line)));
-
-      # check that the infos (job directory, job platform and alias) exist
-      if (my ($job_dir, $job_platform, $alias) = get_alias_resolving_infos($line))
-      {
-         # prove that it's a valid job_platform
-         # and that each first alias and matching job platform exists only once
-         check_alias_and_job_platform($job_dir, $job_platform, $alias, \%dir_of_job_platform,
-                                      \%dir_of_alias, $module_name, $line_number);
-      }
-      else
-      {
-         chomp;
-         add_errorlog_unknown_format_statement($line, $module_name, $line_number);
-         next;
-      }
-   }
-   # reset the $line_number, because we count it again
-   $line_number = 0;
-
-   # read the same file again
-   seek (PARSE_ASCII,0,0);
-
-   # read each line of the file for all other informations
-   # e.g. line 8 of module 'sal'
-   # "sa  sal\systools\win32\guistdio  nmake  -     n          sa_guistdio     sa_uwinapi.n          NULL"
-   #             $job_dir              $job     $job_platform   1.$alias   2.$alias + alias platform
-   while (<PARSE_ASCII>)
-   {
-      # the variable for each line of a file
-      my $line = $_;
-
-      # count each line to check at the end of the file that all lines were read
-      # and for more exact error descriptions in the log file
-      $line_number += 1;
-
-      # is it a 'nmake' or a 'module dependency' line?
-      # if not: print this line to STDOUT,
-      #         count one to the no-info lines,
-      #         try to get the information about the module name from this line
-      #         and skip the line
-      if ( (!(is_nmake_line($line))) && (!(is_module_dependency_line($line))) )
-      {
-         my $no_info_line = show_no_info_line($line, $line_number);
-
-         $no_info_line_sum += $no_info_line;
-
-         # if no module dependency line exists get the name of the current module from another line
-         $module_name = get_module_name($line) if (!($module_name));
-
-         # skip the no-info line
-         next;
-      }
-
-      # only if the module dependency line exists and it wasn't read get the infos about it
-      if ( ($module_dependency_line_exists) && (!($module_dependency_line_was_read)) )
-      {
-         ($module_dependency_line_was_read, $info_line_sum) = get_module_dependency_line_infos
-                                                              ($line, $module_name, $line_number);
-      }
-
-      # get all 'nmake' line infos
-      my $info_line = get_nmake_line_infos($line, \%dir_of_alias, \%dir_of_job_platform,
-                                           $module_name, $line_number);
-
-      # count the info lines;
-      $info_line_sum += $info_line;
-   }
-
-   if ($debug == 1)
-   {
-      # show the sums of the info and no-info lines
-      lines_sums_output($module_name, $line_number, $info_line_sum, $no_info_line_sum);
-   }
-}
-
-########################################################################################
-#       sub: is_module_dependency_line
-#      gets: $line
-#   returns: 1 (true) or 0 (false)
-########################################################################################
-sub is_module_dependency_line
-{
-   my $line = shift;
-
-   # if the module dpendency line exists return 1, otherwise 0
-   ($line =~ /^\w+\s+\S+\s+:+\s+/)
-   ? return 1
-   : return 0;
-}
-
-########################################################################################
-#       sub: is_nmake_line
-#      gets: $line
-#   returns: '1' (true) or '0' (false)
-########################################################################################
-sub is_nmake_line
-{
-   my $line = shift;
-
-   # these lines are NO nmake lines:
-   # 1. a empty line
-   # 2. a comment line (perhaps with the job 'nmake')
-   #    like line 20 of module 'bridges' (SRC680/src.m42)
-   #    "#br  bridges\source\cli_uno  nmake  -  w,vc7  br_cli_uno br_unotypes NULL========= "
-   # 3. the module dependency line
-   #    like line 1 of module 'sal' (dependencies means the colon(s)) (SRC680/src.m42)
-   #    "sa      sal     :       xml2cmp N                                    ULL"
-   # 4. a 'p' job platform line (for OS2)
-   # 5. a line with a job, which is not 'nmake'
-   ($line =~ (/^[^\s+\#]/) && (!(/\s+:+\s+/)) && (!(/\s+p\s+/)) && (/\bnmake\b/) )
-   ? return 1
-   : return 0;
-}
-
-########################################################################################
-#       sub: get_alias_resolving_infos
-#      gets: $line
-#   returns: $job_dir, $job_platform, $alias
-########################################################################################
-sub get_alias_resolving_infos
-{
-   my $line = shift;
-
-   if ($line =~ /^\w+\s+(\S+)\s+\w+\s+\-\s+(\w+)\,?(\w+)?\s+(\S+)\s+/)
-   {
-      # get the current work directory
-      my $temp_job_dir = $1;
-
-      my $job_dir = change_job_directory($temp_job_dir);
-
-      # get the job platform of the current job
-      # if it is a 'n' job platform transform it to 'w'
-      # because 'n' can be used now as 'w' (both means windows)
-      my $job_platform = $2;
-      $job_platform = "w" if($job_platform eq "n");
-
-      # get the first alias in each line
-      my $alias = $4;
-
-      return ($job_dir, $job_platform, $alias);
-   }
-   return (undef, undef, undef);
-}
-
-########################################################################################
-#       sub: change_job_directory
-#      gets: $job_dir
-#   returns: $changed_job_dir
-########################################################################################
-# we don't need the module name and the first '\' in the current directory
-sub change_job_directory
-{
-   my $changed_job_dir = shift;
-
-   # ignore the module name
-   $changed_job_dir =~ s/^\w+//;
-   # change all other '\' against the '/' of the current dir
-   $changed_job_dir =~ s/\\/\//g;
-
-   # get only a "/" if we are in the root directory
-   $changed_job_dir = "/" if ($changed_job_dir eq "");
-
-   return $changed_job_dir;
-}
-
-########################################################################################
-#       sub: check_alias_and_job_platform
-#      gets: $job_dir, $job_platform, $alias, $dir_of_job_platform_ref,
-#            $dir_of_alias_ref, $module_name, $line_number
-#   returns: -
-########################################################################################
-# get it in the hash only if it is a valid job platform,
-# like 'w', 'u', 'm' and 'n'
-# 'all' is also valid but it doesn't exist in an alias platform(!)
-sub check_alias_and_job_platform
-{
-   my ($job_dir, $job_platform, $alias, $dir_of_job_platform_ref,
-       $dir_of_alias_ref, $module_name, $line_number) = @_;
-
-   # is it a valid job_platform?
-   if ($job_platform =~ /(w|u|m|n|all)/)
-   {
-      # get only the 'w', 'u', 'm' and 'n' based job platforms
-      if ($job_platform =~ /[wumn]/)
-      {
-         # doesn't the key already exist?
-         (!(exists $$dir_of_job_platform_ref{$job_platform.$alias}))
-           # get the first alias with the matching job platform in the hash
-         ? get_alias_and_job_platform($job_platform, $alias, $dir_of_job_platform_ref)
-           # this is a line with a redundant alias and job platform
-         : add_errorlog_alias_redundancy_statement($module_name, $alias, $job_platform, $line_number);
-      }
-      if (!(exists $$dir_of_alias_ref{$alias}))
-      {
-         # get each first alias with the matching job platform
-         get_alias_and_matching_directory($dir_of_alias_ref, $alias, $job_dir);
-      }
-   }
-   # it's not a valid job platform
-   else
-   {
-      add_errorlog_invalid_platform_statement($module_name, $job_platform, $line_number);
-   }
-}
-
-########################################################################################
-#       sub: get_alias_and_job_platform
-#      gets: $job_platform, $alias, $dir_of_job_platform_ref
-#   returns: -
-########################################################################################
-# get the the job platform and the first alias as a unique key
-# and the job platform as value of the hash
-# it's for checking later that the alias platform is equal to the job platform
-#   e.g.: line 6 + 7 of the module 'gtk' (SRC680/src.m42)
-#   "gt  gtk\pkgconfig  nmake  -  u   gt_pkg   NULL"
-#   "gt  gtk\glib       nmake  -  u   gt_glib gt_pkg.u NULL"
-#   the alias 'gt_pkg' has the directory 'gtk\pkgconfig' (we need only 'pkgconfig')
-#   and it has the job platform 'u' - compare it with the alias platform 'gt_pkg.u'
-sub get_alias_and_job_platform
-{
-   my ($job_platform, $alias, $dir_of_job_platform_ref) = @_;
-
-   # key = 'job platform' and 'first alias'   =>   value = 'job platform'
-   $$dir_of_job_platform_ref{$job_platform.$alias} = $job_platform;
-}
-
-########################################################################################
-#       sub: get_alias_and_matching_directory
-#      gets: $dir_of_alias_ref, $alias, $job_dir
-#   returns: -
-########################################################################################
-# fill the hash with the first alias and the matching directory
-#   e.g. line 14 of module 'setup2' (SRC680/src.m42)
-#   "se  setup2\win\source\unloader   nmake   -   w   se_wulo se_unotypes NULL"
-#   key = 'se_wulo'     =>    value = 'win/source/unloader'
-sub get_alias_and_matching_directory
-{
-   my ($dir_of_alias_ref, $alias, $job_dir) = @_;
-
-   #     key = 'first alias'  => value = 'job directory'
-   $$dir_of_alias_ref{$alias} = $job_dir;
-}
-
-########################################################################################
-#       sub: show_no_info_line
-#      gets: $line, $line_number
-#   returns: $no_info_line
-########################################################################################
-sub show_no_info_line
-{
-   my ($line, $line_number) = @_;
-   my $no_info_line += 1;
-
-   chomp($line);
-
-   print"Ignore line <$line_number>:\n\"$line\"\n\n" if ($debug);
-
-   return $no_info_line;
-}
-
-########################################################################################
-#       sub: get_module_name
-#      gets: $line
-#   returns: $module_name
-########################################################################################
-sub get_module_name
-{
-   my $line = shift;
-   my $module_name = "";
-
-   if ($line =~ /^\w+\s+([\w\.\-]+)\\?/)
-   {
-      $module_name = $1;
-   }
-
-   # set the 'module name' in the data structure tree
-   $XMLTree->setModuleName($module_name);
-
-   return $module_name;
-}
-
-########################################################################################
-#       sub: get_module_dependency_line_infos
-#      gets: $line, $module_name, $line_number
-#   returns: $module_dependency_line_was_read, $info_line_sum
-########################################################################################
-# get the informations about the module dependency line
-# like line 1 of module 'sal' (SRC680/src.m42)
-#    "sa     sal              :                       xml2cmp             NULL"
-#        $module_name   $module_dependency    @module_dependency_names
-sub get_module_dependency_line_infos
-{
-   my ($line, $module_name, $line_number) = @_;
-   my $module_dependency = "";
-   my @module_dependency_names = ();
-   my %dep_modules_and_products = ();
-   my $product = "";
-
-   my $module_dependency_line_was_read = 1;
-   my $info_line_sum = 1;
-
-   if ($debug)
-   {
-      print"\nline number               : <$line_number>\n";
-      print"module-name               : <$module_name>\n";
-   }
-
-   # get the dependencies
-   if ($line =~ /\s+(:+)\s+/)
-   {
-      $module_dependency = $1;
-      print"module-dependency         : <$module_dependency>\n" if ($debug);
-
-      # transform the dependency type to the corresponding tag name
-      if ($module_dependency eq ":")
-      {
-         $module_dependency = "md-simple";
-      }
-      elsif ($module_dependency eq "::")
-      {
-         $module_dependency = "md-always";
-      }
-      elsif ($module_dependency eq ":::")
-      {
-         $module_dependency = "md-force";
-      }
-   }
-
-   # get a list of all depending module names
-   if ($line =~ /:+\s+([\S\s]+)\s+NULL/)
-   {
-      @module_dependency_names = split(/\s+/, $1);
-
-      foreach my $module (@module_dependency_names)
-      {
-         # check whether that there is another product (as "all") of a module
-         if ($module =~ /(\S+):+(\S+)/)
-         {
-            $dep_modules_and_products{$2} = $1;
-         }
-         else
-         {
-            $dep_modules_and_products{$module} = "all";
-         }
-      }
-   }
-
-   # add the dependency module names, the module dependency type and the product to the data structure
-   foreach my $module (sort keys %dep_modules_and_products)
-   {
-      print"module-dependency-name(s) : key <$module>  value <".$dep_modules_and_products{$module}.">\n" if ($debug);
-
-      $XMLTree->addModuleDependencies($module, $module_dependency, $dep_modules_and_products{$module});
-   }
-
-   return ($module_dependency_line_was_read, $info_line_sum);
-}
-
-########################################################################################
-#       sub: get_nmake_line_infos
-#      gets: $line, \%dir_of_alias, \%dir_of_job_platform, $module_name, $line_number
-#   returns: $info_line
-########################################################################################
-# get all infos about the 'nmake' lines
-# e.g. line 8 of module 'sal'
-# "sa  sal\systools\win32\guistdio  nmake  -     n         sa_guistdio     sa_uwinapi.n          NULL"
-#             $job_dir              $job     $job_platform  1.$alias   2.$alias + alias platform
-sub get_nmake_line_infos
-{
-   my ($line, $dir_of_alias_ref, $dir_of_job_platform_ref, $module_name, $line_number) = @_;
-   my $directories_ref = "";
-   my $info_line = 0;
-
-   # get the infos about the 'nmake' lines
-   if ($line =~ /^\w+\s+(\S+)\s+(\w+)\s+\-\s+(\w+)\,?(\S+)?/)
-   {
-      # get the current working directory
-      my $temp_job_dir = $1;
-      my $job_dir = change_job_directory($temp_job_dir);
-
-      # get the job
-      my $job = $2;
-      $job = "make" if ($job eq "nmake");
-
-      # get the job platform of the current job
-      # if it is a 'n' job platform transform it to 'wnt'
-      # available values are: 'wnt', 'unx', 'mac' or 'all'
-      my $job_platform = $3;
-      $job_platform = change_job_platform_name($job_platform);
-
-      # get the first alias in each line
-      my $restriction = $4;
-      my %build_req = ( "$restriction" => "$job_platform") if ($restriction && $job_platform);
-
-
-      # get all aliases (but not the first) in an array
-      my $aliases_ref = get_aliases($line);
-
-      # filter the list of aliases, which has a 'p' job platform
-      # and transform a 'n' ending alias platform to a 'w' ending alias platform
-      filter_aliases($aliases_ref);
-
-      # resolve all aliases (alias[.job platform] => matching directory)
-      $directories_ref = resolve_aliases($aliases_ref, $dir_of_alias_ref,
-                                         $dir_of_job_platform_ref, $module_name, $line_number);
-
-      # count the informative lines
-      $info_line = 1;
-
-      $XMLTree->addJob($job_dir, $job, $job_platform, $directories_ref, \%build_req);
-
-      # show the infos, that we know about each line
-      if ($debug == 1)
-      {
-         show_line_infos($line_number, $job_dir, $job, $job_platform, $restriction, $aliases_ref, $directories_ref);
-      }
-   }
-   return $info_line;
-}
-
-########################################################################################
-#       sub: change_job_platform_name
-#      gets: $job_platform
-#   returns: $job_platform
-########################################################################################
-sub change_job_platform_name
-{
-   my $job_platform = shift;
-
-   $job_platform = "wnt" if($job_platform eq "n" || $job_platform eq "w");
-   $job_platform = "unx" if($job_platform eq "u");
-   $job_platform = "mac" if($job_platform eq "m");
-
-   return $job_platform;
-}
-
-########################################################################################
-#       sub: get_aliases
-#      gets: $_ (current line)
-#   returns: \@aliases
-########################################################################################
-# get all aliases of the line in an array
-sub get_aliases
-{
-   my $line = shift;
-   my @aliases = ();
-
-   # get all aliases in an array (but cut out the first alias)
-   if ($line =~ /\-\s+[\w+\,]+\s+([\S\s]+)\s+NULL$/)
-   {
-      print"\nall job aliases           : <$1>\n" if ($debug);
-
-      @aliases = split /\s+/, $1;
-
-      # we don't need the first alias (it stands for the current job directory)
-      shift @aliases;
-   }
-   return \@aliases;
-}
-
-########################################################################################
-#       sub: filter_aliases
-#      gets: $aliases_ref
-#   returns: -
-########################################################################################
-# filter all aliases, because we only need the 'w', 'u' and 'm' job platform based aliases
-sub filter_aliases
-{
-   my $aliases_ref = shift;
-
-   # get the highest index of the array (number of elements of the array - 1)
-   # also works: my $index = scalar(@$aliases_ref)-1;
-   my $index = $#{@{$aliases_ref}};
-
-   for (; $index >= 0; $index--)
-   {
-      # filter the 'p' job platform based aliases from '@aliases'
-      splice(@$aliases_ref, $index, 1) if ($$aliases_ref[$index] =~ /\.p$/);
-
-      # transform a '.n' ending alias platform to '.w' ending alias platform
-      if ($$aliases_ref[$index] =~ /\.n$/)
-      {
-         $$aliases_ref[$index] =~ s/\.n$/\.w/;
-         splice(@$aliases_ref, $index, 1, $$aliases_ref[$index]);
-      }
-   }
-}
-
-########################################################################################
-#       sub: resolve_aliases
-#      gets: $aliases_ref, $dir_of_alias_ref, $dir_of_job_platform_ref,
-#            $module_name, $line_number
-#   returns: \@directories
-########################################################################################
-# here we get each alias with the matching job directory
-sub resolve_aliases
-{
-   my ($aliases_ref, $dir_of_alias_ref, $dir_of_job_platform_ref, $module_name, $line_number) = @_;
-
-   my @directories = ();
-   my ($alias_platform, $alias, $temp_alias) = "";
-
-   # resolving all directory aliases
-   foreach $temp_alias (@$aliases_ref)
-   {
-      ($alias, $alias_platform) = compare_job_platform_with_alias_platform
-                                  ($temp_alias, $dir_of_job_platform_ref, $module_name, $line_number);
-
-      # does the alias exist?
-      if (exists $$dir_of_alias_ref{$alias})
-      {
-         # then get the matching directory in the array
-         push (@directories, $$dir_of_alias_ref{$alias});
-      }
-      else
-      {
-         add_errorlog_no_directory_of_alias_statement($module_name, $alias, $line_number);
-      }
-   }
-   return \@directories;
-}
-
-########################################################################################
-#       sub: compare_job_platform_with_alias_platform
-#      gets: $alias, $dir_of_job_platform_ref, $module_name, $line_number
-#   returns: $alias
-########################################################################################
-sub compare_job_platform_with_alias_platform
-{
-   my ($alias, $dir_of_job_platform_ref, $module_name, $line_number) = @_;
-
-   my $alias_platform = "";
-
-   # compare the alias platform (with a dot and an ending letter, like "al_alib.u")
-   # with the job platform of the line in which this alias was resolved
-   if ($alias =~ /\.([wum])$/)
-   {
-      $alias_platform = $1;
-
-      # don't memorize the ending dot and letter
-      $alias =~ s/\.\w$//;
-
-      # if the value(= job platform) of the hash or the alias platform has no value
-      # set it to "no valid value"
-      if (!(exists $$dir_of_job_platform_ref{$alias_platform.$alias}))
-      {
-         $$dir_of_job_platform_ref{$alias_platform.$alias} = "no valid value";
-      }
-      $alias_platform = "no valid value" if (!($alias_platform));
-
-      # are the job platform and the alias platform equal?
-      if ($$dir_of_job_platform_ref{$alias_platform.$alias} ne $alias_platform)
-      {
-         add_errorlog_not_equal_platforms_statement
-         ($module_name, $alias, $alias_platform, $dir_of_job_platform_ref, $line_number);
-      }
-   }
-   return ($alias, $alias_platform);
-}
-
-########################################################################################
-#       sub: show_line_infos
-#      gets: $line_number, $job_dir, $job, $job_platform, $restriction,
-#            $aliases_ref, $directories_ref
-#   returns: -
-########################################################################################
-# print the infos about each line
-sub show_line_infos
-{
-   my ($line_number, $job_dir, $job, $job_platform, $restriction, $aliases_ref, $directories_ref) = @_;
-
-   print"line number               : <$line_number>\n";
-   print"job directory             : <$job_dir>\n";
-   print"job                       : <$job>\n";
-   print"job platform              : <$job_platform>\n" if ($job_platform =~ /(w|u|m|all)/);
-   print"restriction               : <$restriction>\n" if ($restriction);
-   print"alias dependencies        : <@$aliases_ref>\n";
-   print"directory dependencies    : <@$directories_ref>\n\n";
-}
-
-########################################################################################
-#       sub: lines_sums_output
-#      gets: $module_name, $line_number, $info_line_sum, $no_info_line_sum
-#   returns: -
-########################################################################################
-sub lines_sums_output
-{
-   # this line variables are for checking that all lines will be read:
-   my ($module_name, $line_number, $info_line_sum, $no_info_line_sum) = @_;
-   my $lines_sum = 0;
-
-   add_errorlog_no_module_name_statement() if (!($module_name));
-
-   # were all lines read? and is the checksum okay?
-   $lines_sum = $info_line_sum + $no_info_line_sum;
-   if ($lines_sum == $line_number)
-   {
-      print"All $line_number line(s) of module <$module_name> were read and checked!\n\n";
-   }
-   else
-   {
-      add_errorlog_different_lines_sums_statement($module_name);
-   }
-
-   print"module: <$module_name>\n".
-        "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n".
-        "   info line(s) sum    =  $info_line_sum\n".
-        "no-info line(s) sum    =  $no_info_line_sum\n".
-        "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n".
-        "  total line(s) sum    =  $line_number\n\n\n";
-}
-
-
-############################ ERROR_LOG subroutines #####################################
-
-
-########################################################################################
-#       sub: add_errorlog_invalid_job_platform_statement
-#      gets: $module_name, $platform, $line_number
-#   returns: -
-########################################################################################
-sub add_errorlog_invalid_job_platform_statement
-{
-   my ($module_name, $job_platform, $line_number) = @_;
-
-   print ERROR_LOG "Error in module <$module_name> of dir/file <$parse_file> line <$line_number>.\n".
-                   "The job platform <$job_platform> is not valid.\n\n";
-}
-
-########################################################################################
-#       sub: add_errorlog_not_equal_platforms_statement
-#      gets: $module_name, $alias, $alias_platform, $dir_of_job_platform_ref, $line_number
-#   returns: -
-########################################################################################
-sub add_errorlog_not_equal_platforms_statement
-{
-   my ($module_name, $alias, $alias_platform, $dir_of_job_platform_ref, $line_number) = @_;
-
-   print ERROR_LOG "Error in module <$module_name> of dir/file <$parse_file> line <$line_number>.\n".
-                   "The alias platform <$alias.$alias_platform> is not equal ".
-                   "with the job platform <$$dir_of_job_platform_ref{$alias_platform.$alias}>.\n\n";
-}
-
-########################################################################################
-#       sub: add_errorlog_no_directory_of_alias_statement
-#      gets: $module_name, $alias, $line_number
-#   returns: -
-########################################################################################
-sub add_errorlog_no_directory_of_alias_statement
-{
-   my ($module_name, $alias, $line_number) = @_;
-
-   print ERROR_LOG "Error in module <$module_name> of dir/file <$parse_file> line <$line_number>.\n".
-                   "The directory of the alias <$alias> doesn't exist!\n\n";
-}
-
-########################################################################################
-#       sub: add_errorlog_no_module_name_statement
-#      gets: -
-#   returns: -
-########################################################################################
-sub add_errorlog_no_module_name_statement
-{
-   print ERROR_LOG "Error. No module name found in dir/file <$parse_file>.\n\n";
-}
-
-########################################################################################
-#       sub: add_errorlog_alias_redundancy_statement
-#      gets: $module_name, $alias, $job_platform, $line_number
-#   returns: -
-########################################################################################
-sub add_errorlog_alias_redundancy_statement
-{
-   my ($module_name, $alias, $job_platform, $line_number)= @_;
-
-   print ERROR_LOG "Error in module <$module_name> of dir/file <$parse_file> line <$line_number>.\n".
-                   "The alias <$alias> with the job platform <$job_platform> is redundant.\n\n";
-}
-
-########################################################################################
-#       sub: add_errorlog_unknown_format_statement
-#      gets: $module_name, $line_number
-#   returns: -
-########################################################################################
-sub add_errorlog_unknown_format_statement
-{
-   my ($line, $module_name, $line_number) = @_;
-
-   print ERROR_LOG "Error in module <$module_name> of dir/file <$parse_file> line <$line_number>.".
-                   "\nUnknown format:\n\"$line\"\n\n";
-}
-
-########################################################################################
-#       sub: add_errorlog_different_lines_sums_statement
-#      gets: $module_name
-#   returns: -
-########################################################################################
-sub add_errorlog_different_lines_sums_statement
-{
-   my $module_name = shift;
-
-   print ERROR_LOG "Error in module <$module_name> of dir/file <$parse_file>.\n".
-                   "The sums of all info and no-info lines are not correct!\n\n";
-}
-
-########################################################################################
-#       sub: add_errorlog_no_buildlst_file_found_statement
-#      gets: $parse_file
-#   returns: -
-########################################################################################
-sub add_errorlog_no_buildlst_file_found_statement
-{
-   my $parse_file = shift;
-
-   print ERROR_LOG "Error in command line argument <$parse_file>.\n".
-                   "File 'build.lst' not found!\n";
-}
-
-############################# end of the subroutines ###################################
diff --git a/soldep/bootstrp/command.cxx b/soldep/bootstrp/command.cxx
index 39a10093c12b..ed5ff4c0be14 100644
--- a/soldep/bootstrp/command.cxx
+++ b/soldep/bootstrp/command.cxx
@@ -52,7 +52,7 @@
 
 //#define MH_TEST2  1           // fuers direkte Testen
 
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
 #ifdef _MSC_VER
 #pragma warning (push,1)
 #endif
@@ -74,10 +74,10 @@
 #endif
 
 #if defined WNT
-#include <tools/svwin.h>
+#include <windows.h>
 #endif
 
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
 #define     cPathSeperator ';'
 #endif
 #ifdef UNX
@@ -436,8 +436,6 @@ CCommand::operator int()
     int nRet;
 #if defined WNT
     nRet = _spawnv( P_WAIT, ppArgv[0], (const char **) ppArgv );
-#elif defined OS2
-    nRet = _spawnv( P_WAIT, ppArgv[0], ppArgv );
 #elif defined UNX
     //fprintf( stderr, "CComand : operator (int) not implemented\n");
     // **** Unix Implementierung ***************
diff --git a/soldep/bootstrp/dep.cxx b/soldep/bootstrp/dep.cxx
deleted file mode 100644
index 1178e1d09475..000000000000
--- a/soldep/bootstrp/dep.cxx
+++ /dev/null
@@ -1,116 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "dep.hxx"
-
-// class SByteExtStringList
-
-/*****************************************************************************/
-SByteExtStringList::~SByteExtStringList()
-/*****************************************************************************/
-{
-    if (bDeleteStrings)
-        while( Count()) {
-            delete GetObject((sal_uIntPtr)0);
-            Remove((sal_uIntPtr)0);
-        }
-}
-
-// class VersionDepInfo
-
-/*****************************************************************************/
-VersionDepInfo::~VersionDepInfo()
-/*****************************************************************************/
-{
-    if (pVersion)
-        delete pVersion;
-}
-
-/*****************************************************************************/
-void VersionDepInfo::Clear()
-/*****************************************************************************/
-{
-    while( Count()) {
-        delete GetObject((sal_uIntPtr)0);
-        Remove((sal_uIntPtr)0);
-    }
-}
-
-// class VersionDepInfoList
-
-/*****************************************************************************/
-VersionDepInfo* VersionDepInfoList::GetVersion (ByteString& rVersion)
-/*****************************************************************************/
-{
-    VersionDepInfo* pInfo = First();
-    while (pInfo)
-    {
-        const ByteString* pStr = pInfo->GetVersion();
-        if (*pStr == rVersion)
-            return pInfo;
-        pInfo = Next();
-    }
-    return NULL;
-}
-
-/*****************************************************************************/
-void VersionDepInfoList::RemoveVersion (ByteString& rVersion)
-/*****************************************************************************/
-{
-    VersionDepInfo* pInfo = First();
-    while (pInfo)
-    {
-        const ByteString* pStr = pInfo->GetVersion();
-        if (*pStr == rVersion)
-        {
-            Remove (pInfo);
-            delete pInfo;
-            return;
-        }
-        pInfo = Next();
-    }
-}
-
-/*****************************************************************************/
-VersionDepInfo* VersionDepInfoList::InsertVersion (ByteString& rVersion)
-/*****************************************************************************/
-{
-    VersionDepInfo* pInfo = First();
-    while (pInfo)
-    {
-        const ByteString* pStr = pInfo->GetVersion();
-        if (*pStr == rVersion)
-        {
-            pInfo->Clear();
-            return pInfo;
-        }
-        pInfo = Next();
-    }
-    pInfo = new VersionDepInfo (rVersion);
-    Insert (pInfo, LIST_APPEND);
-    return pInfo;
-}
diff --git a/soldep/bootstrp/hashtbl.cxx b/soldep/bootstrp/hashtbl.cxx
deleted file mode 100644
index e9455e75f454..000000000000
--- a/soldep/bootstrp/hashtbl.cxx
+++ /dev/null
@@ -1,511 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <tools/gen.hxx>
-#include <tools/debug.hxx>
-#include <soldep/hashtbl.hxx>
-
-// -------------------------------------------------------------
-// class HashItem
-//
-class HashItem
-{
-    enum ETag { TAG_EMPTY, TAG_USED, TAG_DELETED };
-
-    void*   m_pObject;
-    ETag    m_Tag;
-    ByteString  m_Key;
-
-public:
-    HashItem() { m_Tag = TAG_EMPTY; m_pObject = NULL; }
-
-    sal_Bool IsDeleted() const
-    {   return m_Tag == TAG_DELETED; }
-
-    sal_Bool IsEmpty() const
-    {   return m_Tag == TAG_DELETED || m_Tag == TAG_EMPTY; }
-
-    sal_Bool IsFree() const
-    {   return m_Tag == TAG_EMPTY; }
-
-    sal_Bool IsUsed() const
-    {   return m_Tag == TAG_USED; }
-
-    void Delete()
-    { m_Tag = TAG_DELETED; m_Key = ""; m_pObject = NULL; }
-
-    ByteString const& GetKey() const
-    { return m_Key; }
-
-    void* GetObject() const
-    { return m_pObject; }
-
-    void SetObject(ByteString const Key, void *pObject)
-    { m_Tag = TAG_USED; m_Key = Key; m_pObject = pObject; }
-};
-
-#define MIN(a,b) (a)<(b)?(a):(b)
-#define MAX(a,b) (a)>(b)?(a):(b)
-
-// -------------------------------------------------------------
-// class HashTable
-//
-
-/*static*/ double HashTable::m_defMaxLoadFactor = 0.8;
-/*static*/ double HashTable::m_defDefGrowFactor = 2.0;
-
-HashTable::HashTable(sal_uIntPtr lSize, sal_Bool bOwner, double dMaxLoadFactor, double dGrowFactor)
-{
-    m_lSize          = lSize;
-    m_bOwner         = bOwner;
-    m_lElem          = 0;
-    m_dMaxLoadFactor = MAX(0.5,MIN(1.0,dMaxLoadFactor));  // 0.5 ... 1.0
-    m_dGrowFactor    = MAX(1.3,MIN(5.0,dGrowFactor));     // 1.3 ... 5.0
-    m_pData          = new HashItem [lSize];
-
-// Statistik
-#ifdef DBG_UTIL
-    m_aStatistic.m_lSingleHash = 0;
-    m_aStatistic.m_lDoubleHash = 0;
-    m_aStatistic.m_lProbe      = 0;
-#endif
-}
-
-HashTable::~HashTable()
-{
-    // Wenn die HashTable der Owner der Objecte ist,
-    // m�ssen die Destruktoren separat gerufen werden.
-    // Dies geschieht �ber die virtuelle Methode OnDeleteObject()
-    //
-    // Problem: Virtuelle Funktionen sind im Destructor nicht virtuell!!
-    //          Der Code mu� deshalb ins Macro
-
-    /*
-    if (m_bOwner)
-    {
-        for (sal_uIntPtr i=0; i<GetSize(); i++)
-        {
-            void *pObject = GetObjectAt(i);
-
-            if (pObject != NULL)
-                OnDeleteObject(pObject());
-        }
-    }
-    */
-
-    // Speicher f�r HashItems freigeben
-    delete [] m_pData;
-}
-
-void* HashTable::GetObjectAt(sal_uIntPtr lPos) const
-// Gibt Objekt zur�ck, wenn es eines gibt, sonst NULL;
-{
-    DBG_ASSERT(lPos<m_lSize, "HashTable::GetObjectAt()");
-
-    HashItem *pItem = &m_pData[lPos];
-
-    return pItem->IsUsed() ? pItem->GetObject() : NULL;
-}
-
-void HashTable::OnDeleteObject(void*)
-{
-    DBG_ERROR("HashTable::OnDeleteObject(void*) nicht �berladen");
-}
-
-sal_uIntPtr HashTable::Hash(ByteString const& Key) const
-{
-    /*
-    sal_uIntPtr lHash = 0;
-    sal_uIntPtr i,n;
-
-    for (i=0,n=Key.Len(); i<n; i++)
-    {
-        lHash *= 256L;
-        lHash += (sal_uIntPtr)(sal_uInt16)Key.GetStr()[i];
-        lHash %= m_lSize;
-    }
-    return lHash;
-    */
-
-    // Hashfunktion von P.J. Weinberger
-    // aus dem "Drachenbuch" von Aho/Sethi/Ullman
-    sal_uIntPtr i,n;
-    sal_uIntPtr h = 0;
-    sal_uIntPtr g = 0;
-
-    for (i=0,n=Key.Len(); i<n; i++)
-    {
-        h = (h<<4) + (sal_uIntPtr)(sal_uInt16)Key.GetBuffer()[i];
-        g = h & 0xf0000000;
-
-        if (g != 0)
-        {
-            h = h ^ (g >> 24);
-            h = h ^ g;
-        }
-    }
-
-    return h % m_lSize;
-}
-
-sal_uIntPtr HashTable::DHash(ByteString const& Key, sal_uIntPtr lOldHash) const
-{
-    sal_uIntPtr lHash = lOldHash;
-    sal_uIntPtr i,n;
-
-    for (i=0,n=Key.Len(); i<n; i++)
-    {
-        lHash *= 256L;
-        lHash += (sal_uIntPtr)(sal_uInt16)Key.GetBuffer()[i];
-        lHash %= m_lSize;
-    }
-    return lHash;
-
-/*    return
-        (
-            lHash
-        +   (char)Key.GetStr()[0] * 256
-        +   (char)Key.GetStr()[Key.Len()-1]
-        +   1
-        )
-        % m_lSize;
-*/
-}
-
-sal_uIntPtr HashTable::Probe(sal_uIntPtr lPos) const
-// gibt den Folgewert von lPos zur�ck
-{
-    lPos++; if (lPos==m_lSize) lPos=0;
-    return lPos;
-}
-
-sal_Bool HashTable::IsFull() const
-{
-    return m_lElem>=m_lSize;
-}
-
-sal_Bool HashTable::Insert(ByteString const& Key, void* pObject)
-// pre:  Key ist nicht im Dictionary enthalten, sonst return FALSE
-//       Dictionary ist nicht voll, sonst return FALSE
-// post: pObject ist unter Key im Dictionary; m_nElem wurde erh�ht
-{
-    SmartGrow();
-
-    if (IsFull())
-    {
-        DBG_ERROR("HashTable::Insert() is full");
-        return sal_False;
-    }
-
-    if (FindPos(Key) != NULL )
-        return sal_False;
-
-    sal_uIntPtr     lPos  = Hash(Key);
-    HashItem *pItem = &m_pData[lPos];
-
-    // first hashing
-    //
-    if (pItem->IsEmpty())
-    {
-        pItem->SetObject(Key, pObject);
-        m_lElem++;
-
-        #ifdef DBG_UTIL
-        m_aStatistic.m_lSingleHash++;
-        #endif
-
-        return sal_True;
-    }
-
-    // double hashing
-    //
-    lPos  = DHash(Key,lPos);
-    pItem = &m_pData[lPos];
-
-    if (pItem->IsEmpty())
-    {
-        pItem->SetObject(Key, pObject);
-        m_lElem++;
-
-        #ifdef DBG_UTIL
-        m_aStatistic.m_lDoubleHash++;
-        #endif
-
-        return sal_True;
-    }
-
-    // linear probing
-    //
-    do
-    {
-        #ifdef DBG_UTIL
-        m_aStatistic.m_lProbe++;
-        #endif
-
-        lPos  = Probe(lPos);
-        pItem = &m_pData[lPos];
-    }
-    while(!pItem->IsEmpty());
-
-    pItem->SetObject(Key, pObject);
-    m_lElem++;
-    return sal_True;
-}
-
-HashItem* HashTable::FindPos(ByteString const& Key) const
-// sucht den Key; gibt Refrenz auf den Eintrag (gefunden)
-// oder NULL (nicht gefunden) zur�ck
-//
-// pre:  -
-// post: -
-{
-    // first hashing
-    //
-    sal_uIntPtr     lPos  = Hash(Key);
-    HashItem *pItem = &m_pData[lPos];
-
-    if (pItem->IsUsed()
-    &&  pItem->GetKey() == Key)
-    {
-        return pItem;
-    }
-
-    // double hashing
-    //
-    if (pItem->IsDeleted() || pItem->IsUsed())
-    {
-        lPos  = DHash(Key,lPos);
-        pItem = &m_pData[lPos];
-
-        if (pItem->IsUsed()
-        &&  pItem->GetKey() == Key)
-        {
-            return pItem;
-        }
-
-        // linear probing
-        //
-        if (pItem->IsDeleted() || pItem->IsUsed())
-        {
-            sal_uIntPtr n      = 0;
-            sal_Bool  bFound = sal_False;
-            sal_Bool  bEnd   = sal_False;
-
-            do
-            {
-                n++;
-                lPos   = Probe(lPos);
-                pItem  = &m_pData[lPos];
-
-                bFound =  pItem->IsUsed()
-                       && pItem->GetKey() == Key;
-
-                bEnd = !(n<m_lSize || pItem->IsFree());
-            }
-            while(!bFound && !bEnd);
-
-            return bFound ? pItem : NULL;
-        }
-    }
-
-    // nicht gefunden
-    //
-    return NULL;
-}
-
-void* HashTable::Find(ByteString const& Key) const
-// Gibt Verweis des Objektes zur�ck, das unter Key abgespeichert ist,
-// oder NULL wenn nicht vorhanden.
-//
-// pre:  -
-// post: -
-{
-    HashItem *pItem = FindPos(Key);
-
-    if (pItem != NULL
-    &&  pItem->GetKey() == Key)
-        return pItem->GetObject();
-    else
-        return NULL;
-}
-
-void* HashTable::Delete(ByteString const& Key)
-// L�scht Objekt, das unter Key abgespeichert ist und gibt Verweis
-// darauf zur�ck.
-// Gibt NULL zur�ck, wenn Key nicht vorhanden ist.
-//
-// pre:  -
-// post: Objekt ist nicht mehr enthalten; m_lElem dekrementiert
-//       Wenn die HashTable der Owner ist, wurde das Object gel�scht
-{
-    HashItem *pItem = FindPos(Key);
-
-    if (pItem != NULL
-    &&  pItem->GetKey() == Key)
-    {
-        void* pObject = pItem->GetObject();
-
-        if (m_bOwner)
-            OnDeleteObject(pObject);
-
-        pItem->Delete();
-        m_lElem--;
-        return pObject;
-    }
-    else
-    {
-        return NULL;
-    }
-}
-
-double HashTable::CalcLoadFactor() const
-// prozentuale Belegung der Hashtabelle berechnen
-{
-    return double(m_lElem) / double(m_lSize);
-}
-
-void HashTable::SmartGrow()
-// Achtung: da die Objekte umkopiert werden, darf die OnDeleteObject-Methode
-//          nicht gerufen werden
-{
-    double dLoadFactor = CalcLoadFactor();
-
-    if (dLoadFactor <= m_dMaxLoadFactor)
-        return; // nothing to grow
-
-    sal_uIntPtr     lOldSize = m_lSize;              // alte Daten sichern
-    HashItem* pOldData = m_pData;
-
-    m_lSize = sal_uIntPtr (m_dGrowFactor * m_lSize); // neue Gr��e
-    m_pData = new HashItem[m_lSize];           // neue Daten holen
-
-    // kein Speicher:
-    // Zustand "Tabelle voll" wird in Insert abgefangen
-    //
-    if (m_pData == NULL)
-    {
-        m_lSize = lOldSize;
-        m_pData = pOldData;
-        return;
-    }
-
-    m_lElem = 0;                               // noch keine neuen Daten
-
-    // Umkopieren der Daten
-    //
-    for (sal_uIntPtr i=0; i<lOldSize; i++)
-    {
-        HashItem *pItem = &pOldData[i];
-
-        if (pItem->IsUsed())
-            Insert(pItem->GetKey(),pItem->GetObject());
-    }
-
-    delete [] pOldData;
-}
-
-// Iterator ---------------------------------------------------------
-//
-
-HashTableIterator::HashTableIterator(HashTable const& aTable)
-: m_aTable(aTable)
-{
-    m_lAt = 0;
-}
-
-void* HashTableIterator::GetFirst()
-{
-    m_lAt = 0;
-    return FindValidObject(sal_True /* forward */);
-}
-
-void* HashTableIterator::GetLast()
-{
-    m_lAt = m_aTable.GetSize() -1;
-    return FindValidObject(sal_False /* backward */);
-}
-
-void* HashTableIterator::GetNext()
-{
-    if (m_lAt+1 >= m_aTable.GetSize())
-        return NULL;
-
-    m_lAt++;
-    return FindValidObject(sal_True /* forward */);
-}
-
-void* HashTableIterator::GetPrev()
-{
-    if (m_lAt <= 0)
-        return NULL;
-
-    m_lAt--;
-    return FindValidObject(sal_False /* backward */);
-}
-
-void* HashTableIterator::FindValidObject(sal_Bool bForward)
-// Sucht nach einem vorhandenen Objekt ab der aktuellen
-// Position.
-//
-// pre:  ab inkl. m_lAt soll die Suche beginnen
-// post: if not found then
-//          if bForward == sal_True then
-//              m_lAt == m_aTable.GetSize() -1
-//          else
-//              m_lAt == 0
-//       else
-//          m_lAt ist die gefundene Position
-{
-    void *pObject = m_aTable.GetObjectAt(m_lAt);
-
-    if (pObject != NULL)
-        return pObject;
-
-    while (pObject == NULL
-       && (bForward ? ((m_lAt+1) < m_aTable.GetSize())
-                    :   m_lAt    > 0))
-    {
-        if (bForward)
-            m_lAt++;
-        else
-            m_lAt--;
-
-        pObject = m_aTable.GetObjectAt(m_lAt);
-    }
-
-#ifdef DBG_UTIL
-
-    if (pObject == NULL)
-    {
-        DBG_ASSERT(bForward ? m_lAt == m_aTable.GetSize() -1 : m_lAt == 0,
-            "HashTableIterator::FindValidObject()");
-    }
-
-#endif
-
-    return pObject;
-}
diff --git a/soldep/bootstrp/makefile.mk b/soldep/bootstrp/makefile.mk
deleted file mode 100644
index b27f79734673..000000000000
--- a/soldep/bootstrp/makefile.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=soldep
-TARGET=bootstrpdt
-ENABLE_EXCEPTIONS=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# fixme, code is not yet 64 bit clean
-.IF "$(OS)$(CPU)"=="LINUXX" || ("$(COM)"=="C52" && "$(CPU)"=="U")
-all:
-    @echo nothing to do
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES= \
-                  $(SLO)$/prj.obj
-
-SLOFILES=\
-          $(SLO)$/command.obj \
-          $(SLO)$/dep.obj \
-          $(SLO)$/minormk.obj \
-          $(SLO)$/prodmap.obj \
-          $(SLO)$/appdef.obj \
-           $(SLO)$/hashtbl.obj		\
-           $(SLO)$/sstring.obj		\
-          $(SLO)$/prj.obj
-
-
-SHL1TARGET	=$(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB	=$(TARGET)
-SHL1LIBS	=$(SLB)$/$(TARGET).lib
-SHL1DEF		=$(MISC)$/$(SHL1TARGET).def
-SHL1DEPN	=$(SHL1LIBS)
-SHL1STDLIBS=\
-            $(TOOLSLIB) \
-            $(VOSLIB)			\
-            $(SALLIB)   
-
-DEF1NAME    =$(SHL1TARGET)
-DEF1DEPN	=$(MISC)$/$(SHL1TARGET).flt
-DEFLIB1NAME	=$(TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-    @echo ------------------------------
-    @echo Making: $@
-    @echo WEP > $@
-    @echo LIBMAIN >> $@
-    @echo LibMain >> $@
-    @echo __CT >> $@
diff --git a/soldep/bootstrp/minormk.cxx b/soldep/bootstrp/minormk.cxx
deleted file mode 100644
index 489472b9f87a..000000000000
--- a/soldep/bootstrp/minormk.cxx
+++ /dev/null
@@ -1,187 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "minormk.hxx"
-#include "prodmap.hxx"
-#include <soldep/appdef.hxx>
-#include <tools/fsys.hxx>
-#include <tools/geninfo.hxx>
-
-//
-// class MinorMk
-//
-
-/*****************************************************************************/
-MinorMk::MinorMk(
-    GenericInformationList *pList,
-    const ByteString &rVersion,
-    const ByteString &rWorkStamp,
-    const ByteString &rEnvironment,
-    const ByteString &rMinor
-)
-/*****************************************************************************/
-{
-    String sRoot( ProductMapper::GetVersionRoot( pList, rVersion ));
-    if ( sRoot.Len()) {
-        ByteString sPath( sRoot, RTL_TEXTENCODING_ASCII_US );
-        sPath += "/";
-        sPath += rEnvironment;
-        sPath += "/";
-        sPath += "inc";
-        if ( rMinor.Len()) {
-            sPath += ".";
-            sPath += rMinor;
-        }
-#ifdef UNX
-        sPath.SearchAndReplaceAll( "\\", "/" );
-        while( sPath.SearchAndReplace( "//", "/" ) != STRING_NOTFOUND ) {};
-#else
-        sPath.SearchAndReplaceAll( "/", "\\" );
-        while( sPath.SearchAndReplace( "\\\\", "\\" ) != STRING_NOTFOUND ) {};
-#endif
-        DirEntry aPath( String( sPath, RTL_TEXTENCODING_ASCII_US ));
-
-        ByteString sFile( rWorkStamp );
-        sFile += "minor.mk";
-
-        DirEntry aFile( aPath );
-        aFile += DirEntry( String( sFile, RTL_TEXTENCODING_ASCII_US ));
-        if ( !aFile.Exists()) {
-            sFile = sFile.Copy( 3 );
-            aFile = aPath;
-            aFile += DirEntry( String( sFile, RTL_TEXTENCODING_ASCII_US ));
-        }
-        ReadMinorMk( aFile.GetFull());
-    }
-}
-
-/*****************************************************************************/
-MinorMk::MinorMk( GenericInformationList *pList, const ByteString rVersion )
-/*****************************************************************************/
-{
-    String sRoot( ProductMapper::GetVersionRoot( pList, rVersion ));
-    if ( sRoot.Len()) {
-        ByteString sPath( sRoot, RTL_TEXTENCODING_ASCII_US );
-        sPath += "/src/solenv/inc";
-#ifdef UNX
-        sPath.SearchAndReplaceAll( "\\", "/" );
-        while( sPath.SearchAndReplace( "//", "/" ) != STRING_NOTFOUND ) {};
-#else
-        sPath.SearchAndReplaceAll( "/", "\\" );
-        while( sPath.SearchAndReplace( "\\\\", "\\" ) != STRING_NOTFOUND ) {};
-#endif
-        DirEntry aPath( String( sPath, RTL_TEXTENCODING_ASCII_US ));
-
-         ByteString sFile( "minor.mk" );
-
-        DirEntry aFile( aPath );
-        aFile += DirEntry( String( sFile, RTL_TEXTENCODING_ASCII_US ));
-
-        ReadMinorMk( aFile.GetFull());
-    }
-}
-
-/*****************************************************************************/
-MinorMk::MinorMk( const ByteString &rMinor, const ByteString &rEnvironment )
-/*****************************************************************************/
-                : bExists( sal_False )
-{
-    ByteString sDelimiter( DirEntry::GetAccessDelimiter(), RTL_TEXTENCODING_ASCII_US );
-
-
-    ByteString sSolver( GetEnv( "SOLARVERSION" ));
-    sal_Bool bNewEnv = sal_True;
-    if ( !sSolver.Len()) {
-        sSolver = GetEnv( "SOLARVER" );
-        bNewEnv = sal_False;
-    }
-    ByteString sUPD( GetEnv( "UPD" ));
-
-    ByteString sMinorMk( sSolver );
-    sMinorMk += sDelimiter;
-    if ( !bNewEnv ) {
-        sMinorMk += sUPD;
-        sMinorMk += sDelimiter;
-    }
-
-    if ( rEnvironment.Len()) {
-        sMinorMk += rEnvironment;
-        sMinorMk += sDelimiter;
-        sMinorMk += "inc";
-        if( rMinor.Len()) {
-            sMinorMk += ".";
-            sMinorMk += rMinor;
-        }
-        sMinorMk += sDelimiter;
-    }
-
-    sMinorMk += sUPD;
-    sMinorMk += "minor.mk";
-
-    String sFile( sMinorMk, RTL_TEXTENCODING_ASCII_US );
-
-    ReadMinorMk( sFile );
-}
-
-/*****************************************************************************/
-void MinorMk::ReadMinorMk( const String &rFileName )
-/*****************************************************************************/
-{
-    if ( DirEntry( rFileName ).Exists()) {
-        bExists = sal_True;
-        SvFileStream aStream( rFileName, STREAM_STD_READ );
-        while ( !aStream.IsOpen())
-            aStream.Open( rFileName, STREAM_STD_READ );
-
-        ByteString sLine;
-        while ( !aStream.IsEof()) {
-            aStream.ReadLine( sLine );
-
-            if ( sLine.GetToken( 0, '=' ) == "RSCVERSION" )
-                sRSCVERSION = sLine.GetToken( 1, '=' );
-            else if ( sLine.GetToken( 0, '=' ) == "RSCREVISION" )
-                sRSCREVISION = sLine.GetToken( 1, '=' );
-            else if ( sLine.GetToken( 0, '=' ) == "BUILD" )
-                sBUILD = sLine.GetToken( 1, '=' );
-            else if ( sLine.GetToken( 0, '=' ) == "LAST_MINOR" )
-                sLAST_MINOR = sLine.GetToken( 1, '=' );
-        }
-        aStream.Close();
-
-        sRSCVERSION.EraseTrailingChars();
-        sRSCREVISION.EraseTrailingChars();
-        sBUILD.EraseTrailingChars();
-        sLAST_MINOR.EraseTrailingChars();
-    }
-}
-
-/*****************************************************************************/
-MinorMk::~MinorMk()
-/*****************************************************************************/
-{
-}
-
diff --git a/soldep/bootstrp/prj.cxx b/soldep/bootstrp/prj.cxx
deleted file mode 100644
index 793f50e860aa..000000000000
--- a/soldep/bootstrp/prj.cxx
+++ /dev/null
@@ -1,2862 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include <stdlib.h>
-#include <stdio.h>
-#include <soldep/sstring.hxx>
-#include <vos/mutex.hxx>
-
-#define ENABLE_BYTESTRING_STREAM_OPERATORS
-#include <tools/stream.hxx>
-#include <tools/geninfo.hxx>
-#include <soldep/prj.hxx>
-//#include <bootstrp/inimgr.hxx>
-
-#ifndef MACOSX
-#pragma hdrstop
-#endif
-
-//#define TEST  1
-
-#if defined(WNT) || defined(OS2)
-#define LIST_DELIMETER ';'
-#else
-#ifdef UNX
-#define LIST_DELIMETER ':'
-#else
-#endif
-#endif
-
-#if defined(WNT) || defined(OS2)
-#define PATH_DELIMETER '\\'
-#else
-#ifdef UNX
-#define PATH_DELIMETER '/'
-#else
-#endif
-#endif
-
-//static const char * XML_ALL  =    "all";
-
-//
-//  class SimpleConfig
-//
-
-/*****************************************************************************/
-SimpleConfig::SimpleConfig( String aSimpleConfigFileName )
-/*****************************************************************************/
-{
-    nLine = 0;
-    aFileName = aSimpleConfigFileName;
-    aFileStream.Open ( aFileName, STREAM_READ );
-}
-
-/*****************************************************************************/
-SimpleConfig::SimpleConfig( DirEntry& rDirEntry )
-/*****************************************************************************/
-{
-    nLine = 0;
-    aFileName = rDirEntry.GetFull();
-    aFileStream.Open ( aFileName, STREAM_READ );
-}
-
-/*****************************************************************************/
-SimpleConfig::~SimpleConfig()
-/*****************************************************************************/
-{
-    aFileStream.Close ();
-}
-
-/*****************************************************************************/
-ByteString SimpleConfig::GetNext()
-/*****************************************************************************/
-{
-    ByteString aString;
-
-    if ( aStringBuffer =="" )
-      while ((aStringBuffer = GetNextLine()) == "\t"); //solange bis != "\t"
-    if ( aStringBuffer =="" )
-        return ByteString();
-
-    aString = aStringBuffer.GetToken(0,'\t');
-    aStringBuffer.Erase(0, aString.Len()+1);
-
-    aStringBuffer.EraseLeadingChars( '\t' );
-
-    return aString;
-}
-
-/*****************************************************************************/
-ByteString  SimpleConfig::GetNextLine()
-/*****************************************************************************/
-{
-    ByteString aSecStr;
-    sal_Bool bStreamOk;
-//  sal_uInt16 iret = 0;
-    nLine++;
-
-    bStreamOk = aFileStream.ReadLine ( aTmpStr );
-    if ( (aTmpStr.Search( "#" ) == 0) )
-        return "\t";
-    aTmpStr = aTmpStr.EraseLeadingChars();
-    aTmpStr = aTmpStr.EraseTrailingChars();
-    while ( aTmpStr.SearchAndReplace(ByteString(' '),ByteString('\t') ) != STRING_NOTFOUND );
-    int nLength = aTmpStr.Len();
-    if ( bStreamOk && (nLength == 0) )
-        return "\t";
-//  sal_uInt16 nPos = 0;
-    sal_Bool bFound = sal_False;
-    ByteString aEraseString;
-    for ( sal_uInt16 i = 0; i<= nLength; i++)
-    {
-        if ( aTmpStr.GetChar( i ) == 0x20  && !bFound )
-            aTmpStr.SetChar( i, 0x09 );
-    }
-    return aTmpStr;
-}
-
-/*****************************************************************************/
-ByteString SimpleConfig::GetCleanedNextLine( sal_Bool bReadComments )
-/*****************************************************************************/
-{
-    sal_Bool bStreamOk;
-    sal_Bool bReadNextLine = sal_True;
-    while (bReadNextLine)
-    {
-        bStreamOk = aFileStream.ReadLine ( aTmpStr );
-        if (!bStreamOk)
-            return ByteString();
-
-        ByteString sTab = "\t";
-        ByteString sDoubleTab = "\t\t";
-        ByteString sSpace = " ";
-        xub_StrLen nIndex = 0;
-
-        aTmpStr.SearchAndReplaceAll(sSpace, sTab);
-        while ( (nIndex = aTmpStr.SearchAndReplace(sDoubleTab, sTab, nIndex )) != STRING_NOTFOUND );
-
-        aTmpStr = aTmpStr.EraseLeadingAndTrailingChars('\t'); // remove tabs
-
-        if ( aTmpStr.Search( "#" ) == 0 )
-        {
-            if (bReadComments )
-                return aTmpStr;
-        }
-        else if (aTmpStr != ByteString::EmptyString())
-            bReadNextLine = sal_False;
-    }
-
-    return aTmpStr;
-}
-
-
-//
-//  class CommandData
-//
-
-/*****************************************************************************/
-CommandData::CommandData()
-/*****************************************************************************/
-{
-    nOSType = 0;
-    nCommand = 0;
-    pDepList = 0;
-    pCommandList = 0;
-}
-
-/*****************************************************************************/
-CommandData::~CommandData()
-/*****************************************************************************/
-{
-    if ( pDepList )
-    {
-        ByteString *pString = pDepList->First();
-        while ( pString )
-        {
-            delete pString;
-            pString = pDepList->Next();
-        }
-        delete pDepList;
-
-        pDepList = NULL;
-    }
-    if ( pCommandList )
-    {
-        ByteString *pString = pCommandList->First();
-        while ( pString )
-        {
-            delete pString;
-            pString = pCommandList->Next();
-        }
-        delete pCommandList;
-
-        pCommandList = NULL;
-    }
-}
-
-/*****************************************************************************/
-ByteString CommandData::GetOSTypeString()
-/*****************************************************************************/
-{
-    ByteString aRetStr;
-
-    switch (nOSType)
-    {
-        case OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX | OS_MAC :
-            aRetStr = "all";
-            break;
-        case OS_WIN32 | OS_WIN16 :
-            aRetStr = "w";
-            break;
-        case OS_OS2 :
-            aRetStr = "p";
-            break;
-        case OS_UNX :
-            aRetStr = "u";
-            break;
-        case OS_WIN16 :
-            aRetStr = "d";
-            break;
-        case OS_WIN32 :
-            aRetStr = "n";
-            break;
-        case OS_MAC :
-            aRetStr = "m";
-            break;
-        default :
-            aRetStr = "none";
-    }
-
-    return aRetStr;
-}
-
-/*****************************************************************************/
-ByteString CommandData::GetCommandTypeString()
-/*****************************************************************************/
-{
-    ByteString aRetStr;
-
-    switch (nCommand)
-    {
-        case COMMAND_NMAKE :
-            aRetStr = "nmake";
-            break;
-        case COMMAND_GET :
-            aRetStr = "get";
-            break;
-        default :
-            aRetStr = "usr";
-            aRetStr += ByteString::CreateFromInt64( nCommand + 1 - COMMAND_USER_START );
-
-    }
-
-    return aRetStr;
-}
-
-/*****************************************************************************/
-void CommandData::AddCommand(ByteString* pCommand)
-/*****************************************************************************/
-{
-    if (!pCommandList)
-        pCommandList = new SByteStringList();
-    pCommandList->Insert(pCommand, LIST_APPEND);
-}
-
-/*****************************************************************************/
-CommandData& CommandData::operator>>  ( SvStream& rStream )
-/*****************************************************************************/
-{
-    rStream << aPrj;
-    rStream << aLogFileName;
-    rStream << aInpath;
-    rStream << aUpd;
-    rStream << aUpdMinor;
-    rStream << aProduct;
-    rStream << aCommand;
-    rStream << aPath;
-    rStream << aPrePath;
-    rStream << aPreFix;
-    rStream << aCommandPara;
-    rStream << aComment;
-    rStream << sClientRestriction;
-
-    rStream << nOSType;
-    rStream << nCommand;
-    rStream << nDepth;
-
-    if (pDepList)
-    {
-        rStream << sal_True;
-        *pDepList >> rStream;
-    }
-    else
-        rStream << sal_False;
-
-    if (pCommandList)
-    {
-        rStream << sal_True;
-        *pCommandList >> rStream;
-    }
-    else
-        rStream << sal_False;
-
-    return *this;
-}
-
-/*****************************************************************************/
-CommandData& CommandData::operator<<  ( SvStream& rStream )
-/*****************************************************************************/
-{
-    rStream >> aPrj;
-    rStream >> aLogFileName;
-    rStream >> aInpath;
-    rStream >> aUpd;
-    rStream >> aUpdMinor;
-    rStream >> aProduct;
-    rStream >> aCommand;
-    rStream >> aPath;
-    rStream >> aPrePath;
-    rStream >> aPreFix;
-    rStream >> aCommandPara;
-    rStream >> aComment;
-    rStream >> sClientRestriction;
-
-    rStream >> nOSType;
-    rStream >> nCommand;
-    rStream >> nDepth;
-
-    sal_Bool bDepList;
-    rStream >> bDepList;
-    if (pDepList)
-        pDepList->CleanUp();
-    if (bDepList)
-    {
-        if (!pDepList)
-            pDepList = new SByteStringList();
-        *pDepList << rStream;
-    }
-    else
-    {
-        if (pDepList)
-        DELETEZ (pDepList);
-    }
-
-    sal_Bool bCommandList;
-    rStream >> bCommandList;
-    if (pCommandList)
-        pCommandList->CleanUp();
-    if (bCommandList)
-    {
-        if (!pCommandList)
-            pCommandList = new SByteStringList();
-        *pCommandList << rStream;
-    }
-    else
-    {
-        if (pCommandList)
-            DELETEZ (pCommandList);
-    }
-
-    return *this;
-}
-
-
-
-//
-// class DepInfo
-//
-
-/*****************************************************************************/
-DepInfo::~DepInfo()
-/*****************************************************************************/
-{
-    RemoveProject();
-
-    if ( pModeList )
-    {
-        ByteString *pString = pModeList->First();
-        while ( pString )
-        {
-            delete pString;
-            pString = pModeList->Next();
-        }
-        delete pModeList;
-
-        pModeList = NULL;
-    }
-}
-
-/*****************************************************************************/
-void DepInfo::SetProject (ByteString* pStr)
-/*****************************************************************************/
-{
-    RemoveProject();
-    pProject = pStr;
-}
-
-/*****************************************************************************/
-void DepInfo::RemoveProject ()
-/*****************************************************************************/
-{
-    if (pProject)
-    {
-        delete pProject;
-        pProject = NULL;
-    }
-}
-
-/*****************************************************************************/
-DepInfo& DepInfo::operator<<  ( SvStream& rStream )
-/*****************************************************************************/
-{
-    RemoveProject();
-    pProject = new ByteString();
-    rStream >> *pProject;
-
-    sal_Bool bModeList;
-    rStream >> bModeList;
-    if (pModeList)
-        pModeList->CleanUp();
-    if (bModeList)
-    {
-        if (!pModeList)
-            pModeList = new SByteStringList();
-        *pModeList << rStream;
-    }
-    else
-        DELETEZ (pModeList);
-
-    rStream >> bAllModes;
-    return *this;
-}
-
-/*****************************************************************************/
-DepInfo& DepInfo::operator>>  ( SvStream& rStream )
-/*****************************************************************************/
-{
-    rStream << *pProject;
-    if (pModeList)
-    {
-        rStream << sal_True;
-        *pModeList >> rStream;
-    }
-    else
-        rStream << sal_False;
-    rStream << bAllModes;
-
-    return *this;
-}
-
-//
-// class SDepInfoList
-//
-
-/*****************************************************************************/
-SDepInfoList::SDepInfoList()
-/*****************************************************************************/
-                                : pAllModeList(0)
-{
-}
-
-/*****************************************************************************/
-SDepInfoList::~SDepInfoList()
-/*****************************************************************************/
-{
-    if (pAllModeList)
-        delete pAllModeList;
-}
-
-/*****************************************************************************/
-sal_uIntPtr SDepInfoList::IsString( ByteString* pStr )
-/*****************************************************************************/
-{
-    sal_uIntPtr nRet = NOT_THERE;
-    if ( (nRet = GetPrevString( pStr )) != 0 )
-    {
-        ByteString* pString = GetObject( nRet )->GetProject();
-        if ( *pString == *pStr )
-            return nRet;
-        else
-            return NOT_THERE;
-    }
-    else
-    {
-        ByteString* pString = GetObject( 0 )->GetProject();
-        if ( pString && (*pString == *pStr) )
-            return 0;
-        else
-            return NOT_THERE;
-    }
-    return nRet;
-}
-
-/*****************************************************************************/
-sal_uIntPtr SDepInfoList::GetPrevString( ByteString* pStr )
-/*****************************************************************************/
-{
-    sal_uIntPtr nRet = 0;
-    sal_Bool bFound = sal_False;
-    sal_uIntPtr nCount_l = Count();
-    sal_uIntPtr nUpper = nCount_l;
-    sal_uIntPtr nLower = 0;
-    sal_uIntPtr nCurrent = nUpper / 2;
-    sal_uIntPtr nRem = 0;
-    ByteString* pString;
-
-    do
-    {
-        if ( (nCurrent == nLower) || (nCurrent == nUpper) )
-            return nLower;
-        pString = GetObject( nCurrent )->GetProject();
-        int nResult =  pStr->CompareTo( *pString );
-        if ( nResult == COMPARE_LESS )
-        {
-            nUpper = nCurrent;
-            nCurrent = (nCurrent + nLower) /2;
-        }
-        else if ( nResult == COMPARE_GREATER )
-        {
-            nLower = nCurrent;
-            nCurrent = (nUpper + nCurrent) /2;
-        }
-        else if ( nResult == COMPARE_EQUAL )
-            return nCurrent;
-        if ( nRem == nCurrent )
-            return nCurrent;
-        nRem = nCurrent;
-    }
-    while ( !bFound );
-    return nRet;
-}
-
-/*****************************************************************************/
-void SDepInfoList::PutModeString( DepInfo* pInfoList, ByteString* pStr )
-/*****************************************************************************/
-{
-    SByteStringList* pList = pInfoList->GetModeList();
-    if (!pList)
-    {
-        pList = new SByteStringList;
-        pInfoList->SetModeList(pList);
-
-    }
-
-    if (pList)
-    {
-        // check if string exists
-        ByteString *pString = pList->First();
-        while ( pString )
-        {
-            if (*pString == *pStr)
-            {
-                delete pStr;
-                return;
-            }
-            pString = pList->Next();
-        }
-        pList->PutString( pStr );
-    }
-    else
-        delete pStr;
-}
-
-/*****************************************************************************/
-sal_uIntPtr SDepInfoList::PutString( ByteString* pStr)
-/*****************************************************************************/
-{
-    return PutString( pStr, NULL);
-}
-
-/**************************************************************************
-*
-*   Sortiert einen ByteString in die Liste ein und gibt die Position,
-*   an der einsortiert wurde, zurueck
-*
-**************************************************************************/
-
-sal_uIntPtr SDepInfoList::PutString( ByteString* pStr, ByteString* pModeStr)
-{
-    if (pAllModeList)
-    {
-        delete pAllModeList;
-        pAllModeList = NULL;
-    }
-
-    sal_uIntPtr nPos = GetPrevString ( pStr );
-    if ( Count() )
-    {
-        {
-            DepInfo* pInfo = GetObject( 0 );
-            ByteString* pString = pInfo->GetProject();
-            if ( pString->CompareTo( *pStr ) == COMPARE_GREATER )
-            {
-                pInfo = new DepInfo;
-                if (pInfo)
-                {
-                    pInfo->SetProject(pStr);
-                    if (pModeStr)
-                        PutModeString(pInfo, pModeStr);
-                    else
-                        pInfo->SetAllModes();
-                    Insert( pInfo, (sal_uIntPtr)0 );
-                }
-                return (sal_uIntPtr)0;
-            }
-        }
-        ByteString* pString = GetObject( nPos )->GetProject();
-        if ( *pStr != *pString )
-        {
-            DepInfo* pInfo = new DepInfo;
-            if (pInfo)
-            {
-                pInfo->SetProject(pStr);
-                if (pModeStr)
-                    PutModeString(pInfo, pModeStr);
-                else
-                    pInfo->SetAllModes();
-                Insert( pInfo, nPos+1 );
-            }
-            return ( nPos +1 );
-        }
-        else
-        {
-            delete pStr;
-            DepInfo* pInfo = GetObject( nPos );
-            if (pModeStr)
-                PutModeString(pInfo, pModeStr);
-            else
-                pInfo->SetAllModes();
-            return ( nPos +1 );
-        }
-    }
-    else
-    {
-        DepInfo* pInfo = new DepInfo;
-        if (pInfo)
-        {
-            pInfo->SetProject(pStr);
-            if (pModeStr)
-                PutModeString(pInfo, pModeStr);
-            else
-                pInfo->SetAllModes();
-            Insert( pInfo);
-            return (sal_uIntPtr)0;
-        }
-    }
-
-    delete pStr;
-    if (pModeStr)
-        delete pModeStr;
-    return NOT_THERE;
-}
-
-/*****************************************************************************/
-ByteString* SDepInfoList::RemoveString( const ByteString& rName )
-/*****************************************************************************/
-{
-    sal_uIntPtr i;
-    ByteString* pReturn;
-    if (pAllModeList)
-    {
-        delete pAllModeList;
-        pAllModeList = NULL;
-    }
-
-    for( i = 0 ; i < Count(); i++ )
-    {
-        if ( rName == *(GetObject( i )->GetProject()) )
-        {
-            pReturn = new ByteString(*(GetObject(i)->GetProject()));
-            DepInfo* pInfo;
-            pInfo = GetObject(i);
-            delete pInfo;
-            Remove(i);
-            return pReturn;
-        }
-    }
-
-    return NULL;
-}
-
-/*****************************************************************************/
-SByteStringList* SDepInfoList::GetAllDepModes()
-/*****************************************************************************/
-{
-    if (pAllModeList)
-            return pAllModeList;
-
-    DepInfo *pInfo = First();
-    while ( pInfo )
-    {
-        if (!pInfo->IsAllModes() && pInfo->GetModeList())
-        {
-            if (!pAllModeList)
-                pAllModeList = new SByteStringList();
-            ByteString* pStr = pInfo->GetModeList()->First();
-            while (pStr)
-            {
-                if (pAllModeList->IsString(pStr) == NOT_THERE)
-                    pAllModeList->PutString(pStr);
-                pStr = pInfo->GetModeList()->Next();
-            }
-        }
-        pInfo = Next();
-    }
-    return pAllModeList;
-}
-
-/*****************************************************************************/
-SDepInfoList& SDepInfoList::operator<< ( SvStream& rStream )
-/*****************************************************************************/
-{
-    sal_uIntPtr nCount_l;
-    rStream >> nCount_l;
-    for ( sal_uInt16 i = 0; i < nCount_l; i++ ) {
-        DepInfo* pDepInfo = new DepInfo();
-        *pDepInfo << rStream;
-        Insert (pDepInfo, LIST_APPEND);
-    }
-    return *this;
-}
-
-/*****************************************************************************/
-SDepInfoList& SDepInfoList::operator>> ( SvStream& rStream )
-/*****************************************************************************/
-{
-    sal_uIntPtr nCount_l = Count();
-    rStream << nCount_l;
-    DepInfo* pDepInfo = First();
-    while (pDepInfo) {
-        *pDepInfo >> rStream;
-        pDepInfo = Next();
-    }
-
-    return *this;
-}
-
-/*****************************************************************************/
-CommandData* Prj::GetDirectoryList ( sal_uInt16 nWhatOS, sal_uInt16 nCommand )
-/*****************************************************************************/
-{
-    return (CommandData *)NULL;
-}
-
-/*****************************************************************************/
-CommandData* Prj::GetDirectoryData( ByteString aLogFileName )
-/*****************************************************************************/
-{
-    PrjList* pPrjList = GetCommandDataList ();
-    CommandData *pData = NULL;
-    sal_uIntPtr nCount_l = pPrjList->Count();
-    for ( sal_uIntPtr i=0; i<nCount_l; i++ )
-    {
-        pData = pPrjList->GetObject(i);
-        if ( pData->GetLogFile() == aLogFileName )
-            return pData;
-    }
-    return NULL;
-}
-
-//
-//  class Prj
-//
-
-/*****************************************************************************/
-Prj::Prj() :
-    pPrjInitialDepList(0),
-    pPrjDepList(0),
-    pPrjDepInfoList(0),
-    bSorted( sal_False ),
-    bHardDependencies( sal_False ),
-    bFixedDependencies( sal_False ),
-    bVisited( sal_False ),
-    bIsAvailable( sal_True ),
-    pTempCommandDataList (0),
-    bTempCommandDataListPermanent (sal_False),
-    bError (sal_False)
-/*****************************************************************************/
-{
-}
-
-/*****************************************************************************/
-Prj::Prj( ByteString aName ) :
-    aProjectName( aName ),
-    pPrjInitialDepList(0),
-    pPrjDepList(0),
-    pPrjDepInfoList(0),
-    bSorted( sal_False ),
-    bHardDependencies( sal_False ),
-    bFixedDependencies( sal_False ),
-    bVisited( sal_False ),
-    bIsAvailable( sal_True ),
-    pTempCommandDataList (0),
-    bTempCommandDataListPermanent (sal_False),
-    bError (sal_False)
-/*****************************************************************************/
-{
-}
-
-/*****************************************************************************/
-Prj::~Prj()
-/*****************************************************************************/
-{
-    pPrjDepList = RemoveStringList (pPrjDepList);
-    pPrjInitialDepList = RemoveStringList (pPrjInitialDepList);
-    pPrjDepInfoList = RemoveDepInfoList (pPrjDepInfoList);
-}
-
-/*****************************************************************************/
-SByteStringList* Prj::RemoveStringList(SByteStringList* pStringList )
-/*****************************************************************************/
-{
-    if ( pStringList )
-    {
-        ByteString *pString = pStringList->First();
-        while ( pString )
-        {
-            delete pString;
-            pString = pStringList->Next();
-        }
-
-        delete pStringList;
-
-        pStringList = NULL;
-    }
-    return pStringList;
-}
-
-/*****************************************************************************/
-SDepInfoList* Prj::RemoveDepInfoList(SDepInfoList* pInfoList )
-/*****************************************************************************/
-{
-    if ( pInfoList )
-    {
-        DepInfo *pInfo = pInfoList->First();
-        while ( pInfo )
-        {
-            delete pInfo;
-            pInfo = pInfoList->Next();
-        }
-
-        delete pInfoList;
-
-        pInfoList = NULL;
-    }
-    return pInfoList;
-}
-
-/*****************************************************************************/
-void Prj::AddDependencies( ByteString aStr )
-/*****************************************************************************/
-{
-
-    if ( !pPrjDepInfoList )
-        pPrjDepInfoList = new SDepInfoList;
-
-    pPrjDepInfoList->PutString( new ByteString(aStr) );
-}
-
-/*****************************************************************************/
-void Prj::AddDependencies( ByteString aStr, ByteString aModeStr )
-/*****************************************************************************/
-{
-
-    // needs dirty flag - not expanded
-    if ( !pPrjDepInfoList )
-        pPrjDepInfoList = new SDepInfoList;
-
-    pPrjDepInfoList->PutString( new ByteString(aStr), new ByteString(aModeStr) );
-}
-
-/*****************************************************************************/
-SByteStringList* Prj::GetDependencies( sal_Bool bExpanded )
-/*****************************************************************************/
-{
-    if ( bExpanded )
-    {
-        if (!pPrjDepList)
-            SetMode (NULL);
-        return pPrjDepList;
-    }
-    else
-    {
-        if (!pPrjInitialDepList)
-            SetMode (NULL);
-        return pPrjInitialDepList;
-    }
-}
-
-/*****************************************************************************/
-void Prj::SetMode(SByteStringList* pModList)
-/*****************************************************************************/
-{
-    pPrjDepList = RemoveStringList (pPrjDepList);
-    pPrjInitialDepList = RemoveStringList (pPrjInitialDepList);
-
-    if (!pPrjDepInfoList)
-        return;
-
-    pPrjDepList = new SByteStringList;
-    pPrjInitialDepList = new SByteStringList;
-
-    DepInfo *pInfo = pPrjDepInfoList->First();
-    while ( pInfo )
-    {
-        if (pInfo->IsAllModes() || !pInfo->GetModeList() || !pModList)
-        {
-            pPrjDepList->PutString( new ByteString((ByteString) *(pInfo->GetProject())));
-            pPrjInitialDepList->PutString( new ByteString((ByteString) *(pInfo->GetProject())));
-            //pPrjDepList->PutString( pInfo->GetProject());
-            //pPrjInitialDepList->PutString( pInfo->GetProject());
-        }
-        else
-        {
-            sal_Bool bStringFound = sal_False;
-            SByteStringList * pDepList = pInfo->GetModeList();
-            ByteString *pModString = pDepList->First();
-            while ( pModString )
-            {
-                ByteString *pDefModString = pModList->First();
-                while ( pDefModString )
-                {
-                    if (*pDefModString == *pModString)
-                    {
-                        pPrjDepList->PutString( new ByteString((ByteString) *(pInfo->GetProject())));
-                        pPrjInitialDepList->PutString( new ByteString((ByteString) *(pInfo->GetProject())));
-                        //pPrjDepList->PutString( pInfo->GetProject());
-                        //pPrjInitialDepList->PutString( pInfo->GetProject());
-                        bStringFound = sal_True;
-                        break;
-                    }
-                    pDefModString = pModList->Next();
-                }
-                if (bStringFound)
-                    break;
-                pModString = pDepList->Next();
-            }
-
-        }
-
-        pInfo = pPrjDepInfoList->Next();
-    }
-}
-
-/*****************************************************************************/
-sal_Bool Prj::InsertDirectory ( ByteString aDirName, sal_uInt16 aWhat,
-                                sal_uInt16 aWhatOS, ByteString aLogFileName,
-                                const ByteString &rClientRestriction )
-/*****************************************************************************/
-{
-    CommandData* pData = new CommandData();
-
-    pData->SetPath( aDirName );
-    pData->SetCommandType( aWhat );
-    pData->SetOSType( aWhatOS );
-    pData->SetLogFile( aLogFileName );
-    pData->SetClientRestriction( rClientRestriction );
-
-    PrjList* pPrjList = GetCommandDataList ();
-    pPrjList->Insert( pData );
-
-    return sal_False;
-}
-
-/*****************************************************************************/
-//
-// removes directory and existing dependencies on it
-//
-CommandData* Prj::RemoveDirectory ( ByteString aLogFileName )
-/*****************************************************************************/
-{
-    PrjList* pPrjList = GetCommandDataList ();
-    sal_uIntPtr nCount_l = pPrjList->Count();
-    CommandData* pData;
-    CommandData* pDataFound = NULL;
-    SByteStringList* pDataDeps;
-
-    for ( sal_uInt16 i = 0; i < nCount_l; i++ )
-    {
-        pData = pPrjList->GetObject( i );
-        if ( pData->GetLogFile() == aLogFileName )
-            pDataFound = pData;
-        else
-        {
-            pDataDeps = pData->GetDependencies();
-            if ( pDataDeps )
-            {
-                ByteString* pString;
-                sal_uIntPtr nDataDepsCount = pDataDeps->Count();
-                for ( sal_uIntPtr j = nDataDepsCount; j > 0; j-- )
-                {
-                    pString = pDataDeps->GetObject( j - 1 );
-                    if ( pString->GetToken( 0, '.') == aLogFileName )
-                        pDataDeps->Remove( pString );
-                }
-            }
-        }
-    }
-
-    Remove( pDataFound );
-
-    return pDataFound;
-}
-
-/*****************************************************************************/
-void Prj::ExtractDependencies()
-/*****************************************************************************/
-{
-    sal_uIntPtr nPos = 0;
-    CommandData* pData = GetObject(nPos);
-    while (pData)
-    {
-        SByteStringList* pDepList = pData->GetDependencies();
-        if (pDepList)
-        {
-            ByteString * pDepStr = pDepList->First();
-            while (pDepStr)
-            {
-                CommandData* pSearchData = First();
-                while (pSearchData)
-                {
-                    if ((*pDepStr == pSearchData->GetPath()) && (pData->GetOSType() & pSearchData->GetOSType()))
-                    {
-                        *pDepStr = pSearchData->GetLogFile();
-                        break;
-                    }
-
-                    pSearchData = Next();
-                }
-
-                pDepStr = pDepList->Next();
-            }
-        }
-        nPos ++;
-        pData = GetObject(nPos);
-    }
-}
-
-/*****************************************************************************/
-PrjList* Prj::GetCommandDataList ()
-/*****************************************************************************/
-{
-    if (pTempCommandDataList)
-        return pTempCommandDataList;
-    else
-        return (PrjList*)this;
-}
-
-/*****************************************************************************/
-void Prj::RemoveTempCommandDataList()
-/*****************************************************************************/
-{
-    if (pTempCommandDataList)
-    {
-        delete pTempCommandDataList; // this list remove the elements by itself
-        pTempCommandDataList = NULL;
-    }
-}
-
-/*****************************************************************************/
-void Prj::GenerateTempCommandDataList()
-/*****************************************************************************/
-{
-    if (pTempCommandDataList)
-        RemoveTempCommandDataList();
-    pTempCommandDataList = new PrjList();
-    CommandData* pCommandData = First();
-    while (pCommandData) {
-        SvMemoryStream* pStream = new SvMemoryStream();
-        *pCommandData >> *pStream;
-        CommandData* pNewCommandData = new CommandData();
-        pStream->Seek( STREAM_SEEK_TO_BEGIN );
-        *pNewCommandData << *pStream;
-        pTempCommandDataList->Insert(pNewCommandData, LIST_APPEND);
-        delete pStream;
-        pCommandData = Next();
-    }
-}
-
-/*****************************************************************************/
-void Prj::GenerateEmptyTempCommandDataList()
-/*****************************************************************************/
-{
-    if (pTempCommandDataList)
-        RemoveTempCommandDataList();
-    pTempCommandDataList = new PrjList();
-}
-
-/*****************************************************************************/
-Prj& Prj::operator>>  ( SvStream& rStream )
-/*****************************************************************************/
-{
-    rStream << bVisited;
-    rStream << aProjectName;
-    rStream << aProjectPrefix;
-    rStream << bHardDependencies;
-    rStream << bFixedDependencies;
-    rStream << bSorted;
-    rStream << bIsAvailable;
-    rStream << bError;
-
-    if (pPrjDepInfoList)
-    {
-        rStream << sal_True;
-        *pPrjDepInfoList >> rStream;
-    }
-    else
-        rStream << sal_False;
-
-    sal_uIntPtr nCount_l = Count();
-    rStream << nCount_l;
-
-    CommandData* pData = First();
-    while (pData) {
-        *pData >> rStream;
-        pData = Next();
-    }
-
-    return *this;
-}
-
-/*****************************************************************************/
-Prj& Prj::operator<<  ( SvStream& rStream )
-/*****************************************************************************/
-{
-       rStream >> bVisited;
-    rStream >> aProjectName;
-    rStream >> aProjectPrefix;
-    rStream >> bHardDependencies;
-    rStream >> bFixedDependencies;
-    rStream >> bSorted;
-    rStream >> bIsAvailable;
-    rStream >> bError;
-
-    sal_Bool bDepList;
-    rStream >> bDepList;
-    DELETEZ (pPrjDepInfoList);
-    if (bDepList)
-    {
-        pPrjDepInfoList = new SDepInfoList();
-        *pPrjDepInfoList << rStream;
-    }
-
-    sal_uIntPtr nCount_l;
-    rStream >> nCount_l;
-
-    for ( sal_uInt16 i = 0; i < nCount_l; i++ ) {
-        CommandData* pData = new CommandData();
-        *pData << rStream;
-        Insert (pData, LIST_APPEND);
-    }
-
-    return *this;
-}
-
-
-//
-//  class Star
-//
-
-/*****************************************************************************/
-Star::Star()
-/*****************************************************************************/
-                : pDepMode (NULL),
-                pAllDepMode (NULL)
-{
-    // this ctor is only used by StarWriter
-}
-
-/*****************************************************************************/
-Star::Star(String aFileName, sal_uInt16 nMode )
-/*****************************************************************************/
-                : nStarMode( nMode ),
-                sFileName( aFileName ),
-                pDepMode (NULL),
-                pAllDepMode (NULL)
-{
-    Read( aFileName );
-}
-
-/*****************************************************************************/
-Star::Star(SolarFileList *pSolarFiles )
-/*****************************************************************************/
-                : nStarMode( STAR_MODE_MULTIPLE_PARSE ),
-                pDepMode (NULL),
-                pAllDepMode (NULL)
-{
-    // this ctor is used by StarBuilder to get the information for the whole workspace
-    Read( pSolarFiles );
-}
-
-/*****************************************************************************/
-Star::Star(GenericInformationList *pStandLst, ByteString &rVersion )
-/*****************************************************************************/
-                : pDepMode (NULL),
-                pAllDepMode (NULL)
-{
-    UpdateFileList (pStandLst, rVersion, sal_True );
-}
-
-/*****************************************************************************/
-void Star::UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersion,
-    sal_Bool bRead )
-/*****************************************************************************/
-{
-    sSourceRoot=String::CreateFromAscii(""); // clear old SourceRoot
-    ByteString sPath( rVersion );
-
-#ifdef UNX
-    sPath += "/settings/UNXSOLARLIST";
-#else
-    sPath += "/settings/SOLARLIST";
-#endif
-    GenericInformation *pInfo = pStandLst->GetInfo( sPath, sal_True );
-
-    if( pInfo && pInfo->GetValue().Len()) {
-        ByteString sFile( pInfo->GetValue());
-        String sFileName_l( sFile, RTL_TEXTENCODING_ASCII_US );
-        nStarMode = STAR_MODE_SINGLE_PARSE;
-        if (bRead)
-            Read( sFileName_l );
-    }
-    else {
-        SolarFileList *pFileList = new SolarFileList();
-
-        sPath = rVersion;
-        sPath += "/drives";
-
-        GenericInformation *pInfo_l = pStandLst->GetInfo( sPath, sal_True );
-        if ( pInfo_l && pInfo_l->GetSubList())  {
-            GenericInformationList *pDrives = pInfo_l->GetSubList();
-            for ( sal_uIntPtr i = 0; i < pDrives->Count(); i++ ) {
-                GenericInformation *pDrive = pDrives->GetObject( i );
-                if ( pDrive ) {
-                    DirEntry aEntry;
-                    sal_Bool bOk = sal_False;
-                    if ( sSourceRoot.Len()) {
-                        aEntry = DirEntry( sSourceRoot );
-                        bOk = sal_True;
-                    }
-                    else {
-#ifdef UNX
-                        sPath = "UnixVolume";
-                        GenericInformation *pUnixVolume = pDrive->GetSubInfo( sPath );
-                        if ( pUnixVolume ) {
-                            String sRoot( pUnixVolume->GetValue(), RTL_TEXTENCODING_ASCII_US );
-                            aEntry = DirEntry( sRoot );
-                            bOk = sal_True;
-                         }
-#else
-                        bOk = sal_True;
-                        String sRoot( *pDrive, RTL_TEXTENCODING_ASCII_US );
-                        sRoot += String::CreateFromAscii( "\\" );
-                        aEntry = DirEntry( sRoot );
-#endif
-                    }
-                    if ( bOk ) {
-                        sPath = "projects";
-                        GenericInformation *pProjectsKey = pDrive->GetSubInfo( sPath, sal_True );
-                        if ( pProjectsKey ) {
-                            if ( !sSourceRoot.Len()) {
-                                sPath = rVersion;
-                                sPath += "/settings/PATH";
-                                GenericInformation *pPath = pStandLst->GetInfo( sPath, sal_True );
-                                if( pPath ) {
-                                    ByteString sAddPath( pPath->GetValue());
-#ifdef UNX
-                                    sAddPath.SearchAndReplaceAll( "\\", "/" );
-#else
-                                    sAddPath.SearchAndReplaceAll( "/", "\\" );
-#endif
-                                    String ssAddPath( sAddPath, RTL_TEXTENCODING_ASCII_US );
-                                    aEntry += DirEntry( ssAddPath );
-                                }
-                            }
-                            sPath = rVersion;
-                            sPath += "/settings/SHORTPATH";
-                            GenericInformation *pShortPath = pStandLst->GetInfo( sPath, sal_True );
-                            sal_Bool bShortPath = sal_False;
-                            if (pShortPath && (pShortPath->GetValue() == "_TRUE"))
-                                bShortPath = sal_True;
-                            sSourceRoot = aEntry.GetFull();
-                            GenericInformationList *pProjects = pProjectsKey->GetSubList();
-                            if ( pProjects ) {
-                                GenericInformation * pProject = pProjects->First();
-                                while (pProject) {
-                                    String sLocalSourceRoot = sSourceRoot;
-                                    ByteString sProject( *pProject );
-                                    String ssProject( sProject, RTL_TEXTENCODING_ASCII_US );
-
-                                    ByteString aDirStr ("Directory");
-                                    GenericInformation * pDir = pProject->GetSubInfo (aDirStr);
-                                    if (pDir) {
-                                        ByteString aDir = pDir->GetValue();
-                                        DirEntry aRootEntry;
-                                        if (bShortPath)
-                                            aRootEntry = aEntry + DirEntry(aDir);
-                                        else
-                                            aRootEntry = aEntry.GetPath() + DirEntry(aDir);
-                                        sLocalSourceRoot = aRootEntry.GetFull();
-                                    }
-
-                                    String aBuildListPath = CreateFileName(ssProject, sLocalSourceRoot);
-
-                                    pFileList->Insert( new String( aBuildListPath ), LIST_APPEND );
-                                    ByteString sFile( aBuildListPath, RTL_TEXTENCODING_ASCII_US );
-                                    pProject = pProjects->Next();
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if (!CheckFileLoadList(pFileList))
-        {
-            ClearAvailableDeps();
-            ClearCurrentDeps();
-            ClearLoadedFilesList();
-            RemoveAllPrj();
-            bRead = sal_True; // read new list because old list is deleted
-        }
-
-        if (bRead)
-            Read( pFileList );
-        else
-            GenerateFileLoadList( pFileList );
-    }
-}
-
-/*****************************************************************************/
-void Star::FullReload( GenericInformationList *pStandLst, ByteString &rVersion,
-    sal_Bool bRead )
-/*****************************************************************************/
-{
-    ClearAvailableDeps();
-    ClearCurrentDeps();
-    ClearLoadedFilesList();
-    RemoveAllPrj();
-    UpdateFileList( pStandLst, rVersion, bRead );
-}
-
-/*****************************************************************************/
-sal_Bool Star::CheckFileLoadList(SolarFileList *pSolarFiles)
-/*****************************************************************************/
-{
-    sal_Bool bRet = sal_True;
-    if (aLoadedFilesList.Count() == 0)
-        return bRet;
-    StarFile * pLoadFile = aLoadedFilesList.First();
-    while (pLoadFile)
-    {
-        sal_Bool bIsAvailable = sal_False;
-        String * pFile = pSolarFiles->First();
-        while (pFile)
-        {
-            if (*pFile == pLoadFile->GetName())
-            {
-                bIsAvailable = sal_True;
-                break;
-            }
-            pFile = pSolarFiles->Next();
-        }
-        if (!bIsAvailable)
-        {
-            bRet = sal_False;
-            break;
-        }
-        pLoadFile = aLoadedFilesList.Next();
-    }
-       return bRet;
-}
-
-/*****************************************************************************/
-Star::~Star()
-/*****************************************************************************/
-{
-    ClearAvailableDeps();
-    ClearCurrentDeps();
-    ClearLoadedFilesList();
-    RemoveAllPrj();
-}
-
-/*****************************************************************************/
-void Star::GenerateFileLoadList( SolarFileList *pSolarFiles )
-/*****************************************************************************/
-{
-    SolarFileList* pNewSolarFiles = NULL;
-    while(  pSolarFiles->Count()) {
-        StarFile *pFile = new StarFile( *pSolarFiles->GetObject(( sal_uIntPtr ) 0 ));
-        aMutex.acquire();
-        sal_uIntPtr nPos = SearchFileEntry(&aLoadedFilesList, pFile);
-        if ( nPos == LIST_ENTRY_NOTFOUND )
-        {
-            if (!pNewSolarFiles)
-                pNewSolarFiles = new SolarFileList();
-
-            pNewSolarFiles->Insert(new String(pFile->GetName()), LIST_APPEND );
-        }
-        aMutex.release();
-        delete pSolarFiles->Remove(( sal_uIntPtr ) 0 );
-        delete pFile;
-    }
-    delete pSolarFiles;
-    if (pNewSolarFiles)
-        Read (pNewSolarFiles);
-}
-
-/*****************************************************************************/
-SolarFileList* Star::NeedsFilesForUpdate()
-/*****************************************************************************/
-{
-    aMutex.acquire();
-    SolarFileList* pPrjList = NULL;
-    for ( sal_uIntPtr i = 0; i < aLoadedFilesList.Count(); i++ )
-        if ( aLoadedFilesList.GetObject( i )->NeedsUpdate()) {
-            if (!pPrjList)
-                pPrjList = new SolarFileList();
-
-            pPrjList->Insert(new String (aLoadedFilesList.GetObject( i )->GetName()), LIST_APPEND);
-        }
-
-    aMutex.release();
-    return pPrjList;
-}
-
-/*****************************************************************************/
-sal_Bool Star::NeedsUpdate()
-/*****************************************************************************/
-{
-    aMutex.acquire();
-    for ( sal_uIntPtr i = 0; i < aLoadedFilesList.Count(); i++ )
-        if ( aLoadedFilesList.GetObject( i )->NeedsUpdate()) {
-            aMutex.release();
-            return sal_True;
-        }
-
-    aMutex.release();
-    return sal_False;
-}
-
-/*****************************************************************************/
-void Star::Read( String &rFileName )
-/*****************************************************************************/
-{
-    ClearAvailableDeps ();
-    ByteString aString;
-    aFileList.Insert( new String( rFileName ));
-
-    DirEntry aEntry( rFileName );
-    aEntry.ToAbs();
-    aEntry = aEntry.GetPath().GetPath().GetPath();
-    sSourceRoot = aEntry.GetFull();
-
-    while( aFileList.Count()) {
-        String ssFileName = *aFileList.GetObject(( sal_uIntPtr ) 0 );
-        StarFile* pFile = ReadBuildlist (ssFileName);
-        aMutex.acquire();
-        ReplaceFileEntry (&aLoadedFilesList, pFile);
-        //aLoadedFilesList.Insert( pFile, LIST_APPEND );
-        aMutex.release();
-        aFileList.Remove(( sal_uIntPtr ) 0 );
-    }
-    // resolve all dependencies recursive
-    Expand_Impl();
-}
-
-/*****************************************************************************/
-sal_uIntPtr Star::SearchFileEntry( StarFileList *pStarFiles, StarFile* pFile )
-/*****************************************************************************/
-{
-    StarFile *pSearchFile;
-    sal_uIntPtr nCount_l;
-
-    nCount_l = pStarFiles->Count();
-
-    for ( sal_uIntPtr i=0; i<nCount_l; i++)
-    {
-        pSearchFile = pStarFiles->GetObject(i);
-        if ( pSearchFile->GetName() == pFile->GetName() )
-        {
-            return i;
-        }
-    }
-    return LIST_ENTRY_NOTFOUND;
-}
-
-/*****************************************************************************/
-void Star::ReplaceFileEntry( StarFileList *pStarFiles, StarFile* pFile )
-/*****************************************************************************/
-{
-    sal_uIntPtr nPos = SearchFileEntry(pStarFiles, pFile);
-    if ( nPos != LIST_ENTRY_NOTFOUND )
-    {
-        StarFile* pTmpStarFile = pStarFiles->GetObject(nPos);
-        delete pTmpStarFile;
-        pStarFiles->Replace(pFile, nPos);
-        return;
-    }
-    pStarFiles->Insert( pFile,  LIST_APPEND );
-}
-
-/*****************************************************************************/
-void Star::Read( SolarFileList *pSolarFiles )
-/*****************************************************************************/
-{
-    ClearAvailableDeps ();
-    while(  pSolarFiles->Count()) {
-        ByteString aString;
-
-        String ssFileName = *pSolarFiles->GetObject(( sal_uIntPtr ) 0 );
-        StarFile *pFile = ReadBuildlist ( ssFileName);
-
-        if ( pFile->Exists()) {
-            DirEntry aEntry( pFile->GetName() );
-            DirEntry aEntryPrj = aEntry.GetPath().GetPath();
-            if (aEntryPrj.GetExtension() != String::CreateFromAscii( "" ))
-            {
-                aEntryPrj.CutExtension();
-                ByteString aPrjName = ByteString( aEntryPrj.GetName(), gsl_getSystemTextEncoding());
-                Prj* pPrj = GetPrj(aPrjName);
-                if (pPrj)
-                    pPrj->IsAvailable (sal_False);
-            }
-
-        }
-
-        aMutex.acquire();
-        ReplaceFileEntry (&aLoadedFilesList, pFile);
-        //aLoadedFilesList.Insert( pFile,   LIST_APPEND );
-        aMutex.release();
-        delete pSolarFiles->Remove(( sal_uIntPtr ) 0 );
-    }
-    delete pSolarFiles;
-
-    Expand_Impl();
-}
-
-/*****************************************************************************/
-String Star::CreateFileName( String& rProject, String& rSourceRoot )
-/*****************************************************************************/
-{
-    // this method is used to find solarlist parts of nabours (other projects)
-    String sPrjDir( String::CreateFromAscii( "prj" ));
-    String sBuildList( String::CreateFromAscii( "build.lst" ));
-//  String sXmlBuildList( String::CreateFromAscii( "build.xlist" ));
-
-    DirEntry aEntry( rSourceRoot );
-    aEntry += DirEntry( rProject );
-
-    // if this project not exists, maybe it's a not added project of a CWS
-
-    if ( !aEntry.Exists() ) {
-        aEntry.SetExtension(String::CreateFromAscii( "lnk" ));
-        if ( !aEntry.Exists() )
-            aEntry.CutExtension();
-
-        aEntry.SetExtension(String::CreateFromAscii( "link" ));
-        if ( !aEntry.Exists() )
-            aEntry.CutExtension();
-    }
-
-    aEntry += DirEntry( sPrjDir );
-
-//  DirEntry aPossibleEntry(aEntry);
-//  aPossibleEntry += DirEntry( sXmlBuildList );
-
-    aEntry += DirEntry( sBuildList );
-
-    DirEntry& aActualEntry = aEntry;
-/*
-    if (aPossibleEntry.Exists()) {
-        aActualEntry = aPossibleEntry;
-    } else */
-    if ( !aActualEntry.Exists() && aDBNotFoundHdl.IsSet())
-        aDBNotFoundHdl.Call( &rProject );
-    return aActualEntry.GetFull();
-}
-
-/*****************************************************************************/
-void Star::InsertSolarList( String sProject )
-/*****************************************************************************/
-{
-    // inserts a new solarlist part of another project
-    String sFileName_l( CreateFileName( sProject, sSourceRoot ));
-
-    for ( sal_uIntPtr i = 0; i < aFileList.Count(); i++ ) {
-        if (( *aFileList.GetObject( i )) == sFileName_l )
-            return;
-    }
-
-    ByteString ssProject( sProject, RTL_TEXTENCODING_ASCII_US );
-    if ( HasProject( ssProject ))
-        return;
-
-    aFileList.Insert( new String( sFileName_l ), LIST_APPEND );
-}
-
-/*****************************************************************************/
-void Star::ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj )
-/*****************************************************************************/
-{
-    if ( pDepPrj->bVisited )
-        return;
-
-    pDepPrj->bVisited = sal_True;
-
-    SByteStringList* pPrjLst = pPrj->GetDependencies();
-    SByteStringList* pDepLst = NULL;
-    ByteString* pDepend;
-    ByteString* pPutStr;
-    Prj *pNextPrj = NULL;
-    sal_uIntPtr i, nRetPos;
-
-    if ( pPrjLst ) {
-        pDepLst = pDepPrj->GetDependencies();
-        if ( pDepLst ) {
-            for ( i = 0; i < pDepLst->Count(); i++ ) {
-                pDepend = pDepLst->GetObject( i );
-                pPutStr = new ByteString( *pDepend );
-                nRetPos = pPrjLst->PutString( pPutStr );
-                if( nRetPos == NOT_THERE )
-                    delete pPutStr;
-                pNextPrj = GetPrj( *pDepend );
-                if ( pNextPrj ) {
-                    ExpandPrj_Impl( pPrj, pNextPrj );
-                }
-            }
-        }
-    }
-}
-
-/*****************************************************************************/
-void Star::Expand_Impl()
-/*****************************************************************************/
-{
-    for ( sal_uIntPtr i = 0; i < Count(); i++ ) {
-        for ( sal_uIntPtr j = 0; j < Count(); j++ )
-            GetObject( j )->bVisited = sal_False;
-
-        Prj* pPrj = GetObject( i );
-        pPrj->SetMode(pDepMode); // DepList f�r Mode initialisieren
-        ExpandPrj_Impl( pPrj, pPrj );
-    }
-}
-
-/*****************************************************************************/
-StarFile* Star::ReadBuildlist (const String& rFilename, sal_Bool bReadComments, sal_Bool bExtendAlias)
-/*****************************************************************************/
-{
-    ByteString sFileName_l(rFilename, RTL_TEXTENCODING_ASCII_US);
-    StarFile *pFile = new StarFile( rFilename );
-    if ( pFile->Exists()) {
-        SimpleConfig aSolarConfig( rFilename );
-        DirEntry aEntry(rFilename);
-        ByteString sProjectName (aEntry.GetPath().GetPath().GetName(), RTL_TEXTENCODING_ASCII_US);
-        Prj* pPrj = GetPrj (sProjectName); // 0, if Prj not found
-        if (pPrj)
-        {
-            Remove(pPrj); // Project exist, remove old Project and read again
-            DELETEZ (pPrj); // delete and set pPrj to 0
-        }
-        ByteString aString;
-        while (( aString = aSolarConfig.GetCleanedNextLine( bReadComments )) != ByteString::EmptyString() )
-            InsertTokenLine ( aString, &pPrj, sProjectName, bExtendAlias );
-    }
-    return pFile;
-}
-
-/*****************************************************************************/
-void Star::InsertTokenLine ( const ByteString& rTokenLine, Prj** ppPrj, const ByteString& rProjectName, const sal_Bool bExtendAlias )
-/*****************************************************************************/
-{
-    int i = 0;
-    ByteString aWhat, aWhatOS,
-        sClientRestriction, aLogFileName, aProjectName, aPrefix, aCommandPara;
-    ByteString aDirName;
-    sal_Bool bPrjDep = sal_False;
-    sal_Bool bHardDep = sal_False;
-    sal_Bool bFixedDep = sal_False;
-    sal_Bool bNewProject = sal_False;
-    int nCommandType=0, nOSType=0;
-    Prj* pPrj = *ppPrj;
-    CommandData* pCmdData;
-    SByteStringList *pDepList = NULL;
-    ByteString aCommentString;
-    ByteString sToken;
-    ByteString sStringBuffer = rTokenLine;
-
-    while (sStringBuffer != ByteString::EmptyString())
-    {
-        ByteString sToken = sStringBuffer.GetToken(0,'\t');
-        sStringBuffer.Erase(0, sToken.Len()+1);
-
-        switch (i)
-        {
-            case 0:
-                    if ( sToken.Search( "#" ) == 0 )
-                    {
-                        i = -1;
-                        aCommentString = sToken;
-                        sStringBuffer = ByteString::EmptyString();
-                        if ( Count() == 0 )
-                            aDirName = "null_entry" ; //comments at begin of file
-                    }
-                    else
-                    {
-                        aPrefix = sToken;
-                        pDepList = 0;
-                    }
-                    break;
-            case 1:
-                    aDirName = sToken;
-                    aProjectName = aDirName.GetToken ( 0, 0x5c);
-                    if (aProjectName != rProjectName)
-                        sStringBuffer = ByteString::EmptyString(); // something is wrong, ignore line
-                    break;
-            case 2:
-                    if ( sToken.CompareTo(":") == COMPARE_EQUAL )
-                    {
-                        bPrjDep = sal_True;
-                        bHardDep = sal_False;
-                        bFixedDep = sal_False;
-                        i = 9;
-                    }
-                    else if ( sToken.CompareTo("::") == COMPARE_EQUAL )
-                    {
-                        bPrjDep = sal_True;
-                        bHardDep = sal_True;
-                        bFixedDep = sal_False;
-                        i = 9;
-                    }
-                    else if ( sToken.CompareTo(":::") == COMPARE_EQUAL )
-                    {
-                        bPrjDep = sal_True;
-                        bHardDep = sal_True;
-                        bFixedDep = sal_True;
-                        i = 9;
-                    }
-                    else
-                    {
-                        bPrjDep = sal_False;
-                        bHardDep = sal_False;
-                        bFixedDep = sal_False;
-
-                        aWhat = sToken;
-                        nCommandType = GetJobType(aWhat);
-                    }
-                    if (bPrjDep)
-                    {
-                        if (pPrj)
-                            sStringBuffer = ByteString::EmptyString(); // definition more than once or not first line, ignore line
-                    }
-                    break;
-            case 3:
-                    if ( !bPrjDep )
-                    {
-                        aWhat = sToken;
-                        if ( aWhat == "-" )
-                        {
-                            aCommandPara = ByteString();
-                        }
-                        else
-                            aCommandPara = aWhat;
-                    }
-                    break;
-            case 4:
-                    if ( !bPrjDep )
-                    {
-                        aWhatOS = sToken;
-                        if ( aWhatOS.GetTokenCount( ',' ) > 1 ) {
-                            sClientRestriction = aWhatOS.Copy( aWhatOS.GetToken( 0, ',' ).Len() + 1 );
-                            aWhatOS = aWhatOS.GetToken( 0, ',' );
-                        }
-                        nOSType = GetOSType (aWhatOS);
-                    }
-                    break;
-            case 5:
-                    if ( !bPrjDep )
-                    {
-                        if (bExtendAlias)
-                            aLogFileName = (ByteString(aProjectName).Append("_")).Append(sToken);
-                        else
-                            aLogFileName = sToken;
-
-                    }
-                    break;
-            default:
-                    if ( !bPrjDep )
-                    {
-                        ByteString aItem = sToken;
-                        if ( aItem == "NULL" )
-                        {
-                            // Liste zu Ende
-                            i = -1;
-                        }
-                        else
-                        {
-                            // ggfs. Dependency liste anlegen und ergaenzen
-                            if ( !pDepList )
-                                pDepList = new SByteStringList;
-                            ByteString* pStr;
-                            if (bExtendAlias)
-                                pStr = new ByteString ((ByteString (aProjectName).Append("_")).Append(aItem));
-                            else
-                                pStr = new ByteString (aItem);
-                            pDepList->PutString( pStr );
-                        }
-                    }
-                    else
-                    {
-                        ByteString aItem = sToken;
-                        if ( aItem == "NULL" )
-                        {
-                            // Liste zu Ende
-                            i = -1;
-                            bPrjDep= sal_False;
-                        }
-                        else
-                        {
-                            ByteString sMode;
-                            sal_Bool bHasModes = sal_False;
-                            if (aItem.Search(":") != STRING_NOTFOUND)
-                            {
-                                sMode = aItem.GetToken ( 0, ':');
-                                aItem = aItem.GetToken ( 1, ':');
-                                bHasModes = sal_True;
-                            }
-                            if (!pPrj)
-                            {
-                                // neues Project anlegen
-                                pPrj = new Prj ( aProjectName );
-                                pPrj->SetPreFix( aPrefix );
-                                bNewProject = sal_True;
-                            }
-                            if (bHasModes)
-                                pPrj->AddDependencies( aItem, sMode );
-                            else
-                                pPrj->AddDependencies( aItem );
-                            pPrj->HasHardDependencies( bHardDep );
-                            pPrj->HasFixedDependencies( bFixedDep );
-                        }
-                    }
-                    break;
-        }
-        if ( i == -1 )
-            break;
-        i++;
-    }
-    /* Wenn dieses Project noch nicht vertreten ist, in die Liste
-       der Solar-Projekte einfuegen */
-    if ( i == -1 )
-    {
-        if (!pPrj)
-        {
-            // neues Project anlegen
-            pPrj = new Prj ( aProjectName );
-            pPrj->SetPreFix( aPrefix );
-            bNewProject = sal_True;
-        }
-
-        if (bNewProject)
-            Insert(pPrj,LIST_APPEND);
-
-        pCmdData = new CommandData;
-        pCmdData->SetPath( aDirName );
-        pCmdData->SetCommandType( nCommandType );
-        pCmdData->SetCommandPara( aCommandPara );
-        pCmdData->SetOSType( nOSType );
-        pCmdData->SetLogFile( aLogFileName );
-        pCmdData->SetComment( aCommentString );
-        pCmdData->SetClientRestriction( sClientRestriction );
-        if ( pDepList )
-            pCmdData->SetDependencies( pDepList );
-
-        pDepList = 0;
-        pPrj->Insert ( pCmdData, LIST_APPEND );
-
-        // und wer raeumt die depLst wieder ab ?
-        // CommandData macht das
-    }
-    else
-    {
-        if (!pPrj)
-        {
-            // new project to set the error flag
-            pPrj = new Prj ( rProjectName );
-            pPrj->SetPreFix( aPrefix );
-            bNewProject = sal_True;
-        }
-        if (pPrj)
-        {
-            pPrj->SetError();
-            if (bNewProject)
-                Insert(pPrj,LIST_APPEND); // add project even if there is a buildlist error
-        }
-        if ( pDepList )
-            delete pDepList;
-    }
-    *ppPrj = pPrj;
-}
-
-/*****************************************************************************/
-sal_Bool Star::HasProject ( ByteString aProjectName )
-/*****************************************************************************/
-{
-    Prj *pPrj;
-    int nCount_l;
-
-    nCount_l = Count();
-
-    for ( int i=0; i<nCount_l; i++)
-    {
-        pPrj = GetObject(i);
-        if ( pPrj->GetProjectName().ToLowerAscii() == aProjectName.ToLowerAscii() )
-            return sal_True;
-    }
-    return sal_False;
-}
-
-/*****************************************************************************/
-Prj* Star::GetPrj ( ByteString aProjectName )
-/*****************************************************************************/
-{
-    Prj* pPrj;
-    int nCount_l = Count();
-    for ( int i=0;i<nCount_l;i++)
-    {
-        pPrj = GetObject(i);
-        if ( pPrj->GetProjectName().ToLowerAscii() == aProjectName.ToLowerAscii() )
-            return pPrj;
-    }
-//  return (Prj*)NULL;
-    return 0L ;
-}
-
-/*****************************************************************************/
-sal_Bool Star::RemovePrj ( Prj* pPrj )
-/*****************************************************************************/
-{
-    sal_uIntPtr nPos = GetPos(pPrj);
-    if (nPos != LIST_ENTRY_NOTFOUND) {
-        delete pPrj;
-        Remove(nPos);
-        return sal_True;
-    }
-    return sal_False;
-}
-
-/*****************************************************************************/
-void Star::RemoveAllPrj ()
-/*****************************************************************************/
-{
-    Prj* pPrj = First();
-    while (pPrj)
-    {
-        delete pPrj;
-        pPrj = Next();
-    }
-    Clear();
-}
-
-/*****************************************************************************/
-ByteString Star::GetPrjName( DirEntry &aPath )
-/*****************************************************************************/
-{
-    ByteString aRetPrj, aDirName;
-    ByteString aFullPathName = ByteString( aPath.GetFull(), gsl_getSystemTextEncoding());
-
-    sal_uInt16 nToken = aFullPathName.GetTokenCount(PATH_DELIMETER);
-    for ( int i=0; i< nToken; i++ )
-    {
-        aDirName = aFullPathName.GetToken( i, PATH_DELIMETER );
-        if ( HasProject( aDirName ))
-        {
-            aRetPrj = aDirName;
-            break;
-        }
-    }
-
-    return aRetPrj;
-}
-
-/*****************************************************************************/
-void Star::ClearAvailableDeps ()
-/*****************************************************************************/
-{
-    if ( pAllDepMode )
-    {
-        ByteString *pString = pAllDepMode->First();
-        while ( pString )
-        {
-            delete pString;
-            pString = pAllDepMode->Next();
-        }
-        delete pAllDepMode;
-        pAllDepMode = NULL;
-    }
-}
-
-/*****************************************************************************/
-void Star::ClearLoadedFilesList ()
-/*****************************************************************************/
-{
-    StarFile *pStarFile = aLoadedFilesList.First();
-    while ( pStarFile )
-    {
-        delete pStarFile;
-        pStarFile = aLoadedFilesList.Next();
-    }
-    aLoadedFilesList.Clear();
-}
-
-/*****************************************************************************/
-void Star::ClearCurrentDeps ()
-/*****************************************************************************/
-{
-    if ( pDepMode )
-    {
-        ByteString *pString = pDepMode->First();
-        while ( pString )
-        {
-            delete pString;
-            pString = pDepMode->Next();
-        }
-        delete pDepMode;
-        pDepMode = NULL;
-    }
-}
-
-/*****************************************************************************/
-SByteStringList* Star::GetAvailableDeps ()
-/*****************************************************************************/
-{
-    if ( pAllDepMode )
-        return pAllDepMode;
-
-    Prj *pPrj;
-    ByteString* pStr;
-    pPrj = First();
-    while (pPrj)
-    {
-        SByteStringList* pModeList = NULL;
-        if (pPrj->GetModeAndDependencies() && (pModeList = pPrj->GetModeAndDependencies()->GetAllDepModes()))
-        {
-            pStr = pModeList->First();
-            while (pStr)
-            {
-                if ( !pAllDepMode )
-                    pAllDepMode = new SByteStringList();
-
-                if (pAllDepMode->IsString(pStr) == NOT_THERE)
-                    pAllDepMode->PutString(new ByteString(*pStr));
-
-                pStr = pModeList->Next();
-            }
-        }
-        pPrj = Next();
-    }
-    return pAllDepMode;
-}
-
-/*****************************************************************************/
-void Star::SetCurrentDeps (SByteStringList* pDepList)
-/*****************************************************************************/
-{
-    ClearCurrentDeps();
-
-    if (pDepList)
-    {
-        pDepMode = new SByteStringList();
-        ByteString *pString = pDepList->First();
-        while ( pString )
-        {
-            ByteString* pStr = new ByteString (*pString);
-            if (pDepMode->PutString(pStr) == NOT_THERE)
-                delete pStr; // String is not in List
-            pString = pDepList->Next();
-        }
-    }
-    Expand_Impl();
-}
-
-///*****************************************************************************/
-//void Star::ReadXmlBuildList(const ByteString& sBuildLstPath) {
-///*****************************************************************************/
-//  if (mpXmlBuildList) {
-//      Prj* pPrj = NULL;
-//
-//      try {
-//          mpXmlBuildList->loadXMLFile(sBuildLstPath);
-//      }
-//      catch (XmlBuildListException) {
-//          DirEntry aDirEntry (sBuildLstPath);
-//          String ssPrjName = aDirEntry.GetPath().GetPath().GetBase();
-//          ByteString sPrjName = ByteString(ssPrjName, RTL_TEXTENCODING_ASCII_US);
-//          pPrj = GetPrj( sPrjName );
-//          if (pPrj)
-//          {
-//              //remove old Project
-//              RemovePrj (pPrj);
-//          }
-//          return;
-//      }
-//
-//      try {
-//          ByteString sProjectName = mpXmlBuildList->getModuleName();
-//          pPrj = GetPrj( sProjectName );
-//          if (pPrj)
-//          {
-//              //remove old Project
-//              RemovePrj (pPrj);
-//          }
-//
-//          // insert new Project
-//          pPrj = new Prj ( sProjectName );
-//          pPrj->SetPreFix( sProjectName ); // use ProjectName as Prefix
-//          Insert(pPrj,LIST_APPEND);
-//
-//          // get global dependencies
-//          FullByteStringListWrapper aProducts = mpXmlBuildList->getProducts();
-//          ByteString aDepType = ByteString(DEP_MD_ALWAYS_STR);
-//          if (mpXmlBuildList->hasModuleDepType(aProducts, aDepType))
-//              pPrj->HasHardDependencies( sal_True );
-//
-//          aDepType = ByteString(DEP_MD_FORCE_STR);
-//          if (mpXmlBuildList->hasModuleDepType(aProducts, aDepType))
-//          {
-//              pPrj->HasHardDependencies( sal_True );
-//              pPrj->HasFixedDependencies( sal_True );
-//          }
-//
-//          // modul dependencies
-//          ByteString sModulDepType = ByteString();
-//          FullByteStringListWrapper aModulDeps = mpXmlBuildList->getModuleDependencies(aProducts, sModulDepType);
-//          ByteString * pModulDep = aModulDeps.First();
-//          while (pModulDep)
-//          {
-//              FullByteStringListWrapper aModulProducts = mpXmlBuildList->getModuleProducts(*pModulDep);
-//              ByteString *pModulePoduct = aModulProducts.First();
-//              while (pModulePoduct)
-//              {
-//                  if (*pModulePoduct == XML_ALL)
-//                      pPrj->AddDependencies( *pModulDep );
-//                  else
-//                      pPrj->AddDependencies( *pModulDep, *pModulePoduct);
-//
-//                  pModulePoduct = aModulProducts.Next();
-//              }
-//              pModulDep = aModulDeps.Next();
-//          }
-//
-//          // job dirs
-//          ByteString sJobType = ByteString();
-//          ByteString sJobPlatforms = ByteString();
-//          FullByteStringListWrapper aJobDirs = mpXmlBuildList->getJobDirectories(sJobType, sJobPlatforms); // all dirs
-//          ByteString* pJobDir = aJobDirs.First();
-//          while (pJobDir)
-//          {
-//              FullByteStringListWrapper aJobPlatforms = mpXmlBuildList->getJobPlatforms (*pJobDir);
-//              ByteString* pJobPlatform = aJobPlatforms.First();
-//              while (pJobPlatform)
-//              {
-//                  ByteString sJobRestriction = ByteString();
-//                  FullByteStringListWrapper aJobReq = mpXmlBuildList->getJobBuildReqs (*pJobDir, *pJobPlatform);
-//                  // nur ein Req pro Platform wird zur Zeit unterst�tzt
-//                  // mehr geht wegen der Struktur zur Zeit nicht!
-//                  // lese sie trotzdem kommasepariert ein, wenn n�tig
-//                  if (aJobReq.Count() > 0)
-//                  {
-//                      ByteString* pRestriction = aJobReq.First();
-//                      sJobRestriction = ByteString (*pRestriction);
-//                      pRestriction = aJobReq.Next();
-//                      while (pRestriction)
-//                      {
-//                          sJobRestriction += ByteString (",");
-//                          sJobRestriction += ByteString (*pRestriction);
-//                          pRestriction = aJobReq.Next();
-//                      }
-//                  }
-//
-//                  FullByteStringListWrapper aJobTypes = mpXmlBuildList->getJobTypes (*pJobDir);
-//                  ByteString * pJobType = aJobTypes.First();
-//                  while(pJobType)
-//                  {
-//                      FullByteStringListWrapper aDirDependencies = mpXmlBuildList->getDirDependencies(*pJobDir, *pJobType, *pJobPlatform);
-//                      SByteStringList *pDepList = NULL;
-//                      if (aDirDependencies.Count() > 0)
-//                      {
-//                          pDepList = new SByteStringList;
-//                          ByteString* pDirDep = aDirDependencies.First();
-//                          while (pDirDep)
-//                          {
-//                              ByteString sFullDir = sProjectName;
-//                              sFullDir += *pDirDep;
-//                              sFullDir.SearchAndReplaceAll('/', '\\');
-//                              *pDirDep = sFullDir;
-//                              pDepList->PutString(pDirDep);   // String wird �bergeben
-//                              aDirDependencies.Remove();      // Zeiger aus alter Liste l�schen
-//                              pDirDep = aDirDependencies.First();
-//                          }
-//                      }
-//                      // insert CommandData
-//                      CommandData * pCmdData = new CommandData;
-//                      ByteString sRequiredPath = sProjectName;
-//                      sRequiredPath += *pJobDir;
-//                      sRequiredPath.SearchAndReplaceAll('/', '\\');
-//                      pCmdData->SetPath(sRequiredPath);
-//                      pCmdData->SetCommandType( GetJobType(*pJobType) );
-//                      pCmdData->SetCommandPara( ByteString() );
-//                      pCmdData->SetOSType( GetOSType(*pJobPlatform) );
-//                      ByteString sLogFileName = sProjectName;
-//                      sLogFileName += ByteString::CreateFromInt64( pPrj->Count() );
-//                      pCmdData->SetLogFile( sLogFileName );
-//                      pCmdData->SetClientRestriction( sJobRestriction );
-//                      if ( pDepList )
-//                          pCmdData->SetDependencies( pDepList );
-//
-//                      pPrj->Insert ( pCmdData, LIST_APPEND );
-//
-//                      pJobType = aJobTypes.Next();
-//                  }
-//
-//                  pJobPlatform = aJobPlatforms.Next();
-//              }
-//
-//              pJobDir = aJobDirs.Next();
-//          }
-//          pPrj->ExtractDependencies();
-//      }
-//      catch (XmlBuildListException) {
-//          if (pPrj)
-//          {
-//              RemovePrj (pPrj);
-//              delete pPrj;
-//          }
-//
-//      }
-//  }
-//}
-
-/*****************************************************************************/
-int Star::GetOSType ( ByteString& aWhatOS ) {
-/*****************************************************************************/
-    int nOSType = OS_NONE;
-    if ( aWhatOS == "all" )
-        nOSType = ( OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX | OS_MAC );
-    else if ( aWhatOS == "w" || aWhatOS == "wnt" )
-        nOSType = ( OS_WIN16 | OS_WIN32 );
-    else if ( aWhatOS == "p" )
-        nOSType = OS_OS2;
-    else if ( aWhatOS == "u" || aWhatOS == "unx" )
-        nOSType = OS_UNX;
-    else if ( aWhatOS == "d" )
-        nOSType = OS_WIN16;
-    else if ( aWhatOS == "n" )
-        nOSType = OS_WIN32;
-    else if ( aWhatOS == "m" || aWhatOS == "mac" )
-        nOSType = OS_MAC;
-    return nOSType;
-
-};
-
-/*****************************************************************************/
-int Star::GetJobType ( ByteString& JobType ) {
-/*****************************************************************************/
-    int nCommandType = 0;
-    if ( JobType == "nmake" || JobType == "make")
-        nCommandType = COMMAND_NMAKE;
-    else if ( JobType == "get" )
-        nCommandType = COMMAND_GET;
-    else {
-        sal_uIntPtr nOffset = JobType.Copy( 3 ).ToInt32();
-        nCommandType = COMMAND_USER_START + nOffset - 1;
-    }
-    return nCommandType;
-};
-
-/*****************************************************************************/
-void Star::PutPrjIntoStream (SByteStringList* pPrjNameList, SvStream* pStream)
-/*****************************************************************************/
-{
-    aMutex.acquire();
-    *pStream << sal_False; // not full Star / only some Projects
-
-    sal_uIntPtr nCount_l = pPrjNameList->Count();
-    *pStream << nCount_l;
-    ByteString* pStr = pPrjNameList->First();
-    while (pStr) {
-        Prj* pPrj = GetPrj (*pStr);
-        *pPrj >> *pStream;
-        pStr = pPrjNameList->Next();
-    }
-    aMutex.release();
-}
-
-/*****************************************************************************/
-Star& Star::operator>>  ( SvStream& rStream )
-/*****************************************************************************/
-{
-    aMutex.acquire();
-    rStream << sal_True; // full Star
-    rStream << nStarMode;
-    if (pDepMode)
-    {
-        rStream << sal_True;
-        *pDepMode >> rStream;
-    }
-    else
-        rStream << sal_False;
-
-    sal_uIntPtr nCount_l = Count();
-    rStream << nCount_l;
-    Prj* pPrj = First();
-    while (pPrj) {
-        *pPrj >> rStream;
-        pPrj = Next();
-    }
-    aMutex.release();
-
-    return *this;
-}
-
-/*****************************************************************************/
-Star& Star::operator<<  ( SvStream& rStream )
-/*****************************************************************************/
-{
-    aMutex.acquire();
-    sal_Bool bFullList;
-    rStream >> bFullList;
-    if (bFullList)
-    {
-        rStream >> nStarMode;
-        sal_Bool bDepMode;
-        rStream >> bDepMode;
-        if (pDepMode)
-            pDepMode->CleanUp();
-        if (bDepMode)
-        {
-            if (!pDepMode)
-                pDepMode = new SByteStringList();
-            *pDepMode << rStream;
-        }
-        else
-            DELETEZ (pDepMode);
-
-    }
-    sal_uIntPtr nCount_l;
-    rStream >> nCount_l;
-    for ( sal_uInt16 i = 0; i < nCount_l; i++ ) {
-        Prj* pPrj = new Prj();
-        *pPrj << rStream;
-        pPrj->SetMode(pDepMode);
-        if (HasProject (pPrj->GetProjectName())) {
-            Prj* pTmpPrj = GetPrj( pPrj->GetProjectName() );
-            Replace (pPrj, pTmpPrj);
-            delete pTmpPrj;
-        }
-        else
-            Insert (pPrj, LIST_APPEND);
-    }
-    Expand_Impl();
-    aMutex.release();
-    return *this;
-}
-
-
-
-//
-//  class StarWriter
-//
-
-/*****************************************************************************/
-StarWriter::StarWriter( String aFileName, sal_Bool bReadComments, sal_uInt16 nMode )
-/*****************************************************************************/
-                : Star ()
-{
-    sFileName = aFileName;
-    Read ( aFileName, bReadComments, nMode );
-}
-
-/*****************************************************************************/
-StarWriter::StarWriter( SolarFileList *pSolarFiles, sal_Bool bReadComments )
-/*****************************************************************************/
-                : Star ()
-{
-    Read( pSolarFiles, bReadComments );
-}
-
-/*****************************************************************************/
-StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion,
-    ByteString &rMinor, sal_Bool bReadComments )
-/*****************************************************************************/
-                : Star ()
-{
-    ByteString sPath( rVersion );
-
-#ifdef UNX
-    sPath += "/settings/UNXSOLARLIST";
-#else
-    sPath += "/settings/SOLARLIST";
-#endif
-    GenericInformation *pInfo_l = pStandLst->GetInfo( sPath, sal_True );
-
-    if( pInfo_l && pInfo_l->GetValue().Len()) {
-        ByteString sFile( pInfo_l->GetValue());
-        String sFileName_l( sFile, RTL_TEXTENCODING_ASCII_US );
-        nStarMode = STAR_MODE_SINGLE_PARSE;
-        Read( sFileName_l, bReadComments );
-    }
-    else {
-        SolarFileList *pFileList = new SolarFileList();
-
-        sPath = rVersion;
-        sPath += "/drives";
-
-        GenericInformation *pInfo_k = pStandLst->GetInfo( sPath, sal_True );
-        if ( pInfo_k && pInfo_k->GetSubList())  {
-            GenericInformationList *pDrives = pInfo_k->GetSubList();
-            for ( sal_uIntPtr i = 0; i < pDrives->Count(); i++ ) {
-                GenericInformation *pDrive = pDrives->GetObject( i );
-                if ( pDrive ) {
-                    DirEntry aEntry;
-                    sal_Bool bOk = sal_False;
-                    if ( sSourceRoot.Len()) {
-                        aEntry = DirEntry( sSourceRoot );
-                        bOk = sal_True;
-                    }
-                    else {
-#ifdef UNX
-                        sPath = "UnixVolume";
-                        GenericInformation *pUnixVolume = pDrive->GetSubInfo( sPath );
-                        if ( pUnixVolume ) {
-                            String sRoot( pUnixVolume->GetValue(), RTL_TEXTENCODING_ASCII_US );
-                            aEntry = DirEntry( sRoot );
-                            bOk = sal_True;
-                         }
-#else
-                        bOk = sal_True;
-                        String sRoot( *pDrive, RTL_TEXTENCODING_ASCII_US );
-                        sRoot += String::CreateFromAscii( "\\" );
-                        aEntry = DirEntry( sRoot );
-#endif
-                    }
-                    if ( bOk ) {
-                        sPath = "projects";
-                        GenericInformation *pProjectsKey = pDrive->GetSubInfo( sPath, sal_True );
-                        if ( pProjectsKey ) {
-                            if ( !sSourceRoot.Len()) {
-                                sPath = rVersion;
-                                sPath += "/settings/PATH";
-                                GenericInformation *pPath = pStandLst->GetInfo( sPath, sal_True );
-                                if( pPath ) {
-                                    ByteString sAddPath( pPath->GetValue());
-#ifdef UNX
-                                    sAddPath.SearchAndReplaceAll( "\\", "/" );
-#else
-                                    sAddPath.SearchAndReplaceAll( "/", "\\" );
-#endif
-                                     //If Minor has been set add it to path
-                                    if (rMinor.Len()>0) {
-                                        sAddPath += ".";
-                                        sAddPath += rMinor;
-                                    }
-                                    String ssAddPath( sAddPath, RTL_TEXTENCODING_ASCII_US );
-
-                                    aEntry += DirEntry( ssAddPath );
-                                }
-                            }
-                            sPath = rVersion;
-                            sPath += "/settings/SHORTPATH";
-                            GenericInformation *pShortPath = pStandLst->GetInfo( sPath, sal_True );
-                            sal_Bool bShortPath = sal_False;
-                            if (pShortPath && (pShortPath->GetValue() == "_TRUE"))
-                                bShortPath = sal_True;
-                            sSourceRoot = aEntry.GetFull();
-                            GenericInformationList *pProjects = pProjectsKey->GetSubList();
-                            if ( pProjects ) {
-                                String sPrjDir( String::CreateFromAscii( "prj" ));
-                                String sSolarFile( String::CreateFromAscii( "build.lst" ));
-
-                                GenericInformation * pProject = pProjects->First();
-                                while (pProject) {
-                                    ByteString sProject( *pProject);
-                                    String ssProject( sProject, RTL_TEXTENCODING_ASCII_US );
-
-                                    DirEntry aPrjEntry( aEntry );
-
-                                    ByteString aDirStr ("Directory");
-                                    GenericInformation * pDir = pProject->GetSubInfo (aDirStr);
-                                    if (pDir) {
-                                        ByteString aDir = pDir->GetValue();
-                                        if (bShortPath)
-                                            aPrjEntry = aEntry;
-                                        else
-                                            aPrjEntry = aEntry.GetPath();
-                                        aPrjEntry += DirEntry(aDir);
-                                    }
-
-                                    aPrjEntry += DirEntry( ssProject );
-                                    aPrjEntry += DirEntry( sPrjDir );
-                                    aPrjEntry += DirEntry( sSolarFile );
-
-                                    pFileList->Insert( new String( aPrjEntry.GetFull()), LIST_APPEND );
-
-                                    ByteString sFile( aPrjEntry.GetFull(), RTL_TEXTENCODING_ASCII_US );
-                                    fprintf( stdout, "%s\n", sFile.GetBuffer());
-                                    pProject = pProjects->Next();
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        Read( pFileList, bReadComments );
-    }
-}
-
-/*****************************************************************************/
-void StarWriter::CleanUp()
-/*****************************************************************************/
-{
-    Expand_Impl();
-}
-
-/*****************************************************************************/
-sal_uInt16 StarWriter::Read( String aFileName, sal_Bool bReadComments, sal_uInt16 nMode  )
-/*****************************************************************************/
-{
-    sFileName = aFileName;
-
-    nStarMode = nMode;
-
-    ByteString aString;
-    aFileList.Insert( new String( aFileName ));
-
-    DirEntry aEntry( aFileName );
-    aEntry.ToAbs();
-    aEntry = aEntry.GetPath().GetPath().GetPath();
-    sSourceRoot = aEntry.GetFull();
-
-    while( aFileList.Count()) {
-        String ssFileName = *aFileList.GetObject(( sal_uIntPtr ) 0 );
-        StarFile* pFile = ReadBuildlist (ssFileName, bReadComments, sal_False);
-        aMutex.acquire();
-        aLoadedFilesList.Insert( pFile, LIST_APPEND );
-        aMutex.release();
-        delete aFileList.Remove(( sal_uIntPtr ) 0 );
-    }
-    // resolve all dependencies recursive
-    Expand_Impl();
-
-    // Die gefundenen Abhaengigkeiten rekursiv aufloesen
-    Expand_Impl();
-    return 0;
-}
-
-/*****************************************************************************/
-sal_uInt16 StarWriter::Read( SolarFileList *pSolarFiles, sal_Bool bReadComments )
-/*****************************************************************************/
-{
-    nStarMode = STAR_MODE_MULTIPLE_PARSE;
-
-    // this ctor is used by StarBuilder to get the information for the whole workspace
-    while(  pSolarFiles->Count()) {
-        ByteString aString;
-        String ssFileName = *pSolarFiles->GetObject(( sal_uIntPtr ) 0 );
-        StarFile* pFile = ReadBuildlist(ssFileName, bReadComments, sal_False);
-        aMutex.acquire();
-        aLoadedFilesList.Insert( pFile, LIST_APPEND );
-        aMutex.release();
-        delete pSolarFiles->Remove(( sal_uIntPtr ) 0 );
-    }
-    delete pSolarFiles;
-
-    Expand_Impl();
-    return 0;
-}
-
-/*****************************************************************************/
-sal_uInt16 StarWriter::WritePrj( Prj *pPrj, SvFileStream& rStream )
-/*****************************************************************************/
-{
-    ByteString aDataString;
-    ByteString aTab('\t');
-    ByteString aSpace(' ');
-    ByteString aEmptyString("");
-    SByteStringList* pCmdDepList;
-    SByteStringList* pPrjDepList;
-
-    CommandData* pCmdData = NULL;
-    if ( pPrj->Count() > 0 )
-    {
-        pCmdData = pPrj->First();
-        if ( (pPrjDepList = pPrj->GetDependencies( sal_False )) )
-        {
-            aDataString = pPrj->GetPreFix();
-            aDataString += aTab;
-            aDataString += pPrj->GetProjectName();
-            aDataString += aTab;
-            if ( pPrj->HasFixedDependencies())
-                aDataString+= ByteString(":::");
-            else if ( pPrj->HasHardDependencies())
-                aDataString+= ByteString("::");
-            else
-                aDataString+= ByteString(":");
-            aDataString += aTab;
-            for ( sal_uInt16 i = 0; i< pPrjDepList->Count(); i++ ) {
-                aDataString += *pPrjDepList->GetObject( i );
-                aDataString += aSpace;
-            }
-            aDataString+= "NULL";
-
-            rStream.WriteLine( aDataString );
-
-            pCmdData = pPrj->Next();
-        }
-        if ( pCmdData ) {
-            do
-            {
-                if (( aDataString = pCmdData->GetComment()) == aEmptyString )
-                {
-                    aDataString = pPrj->GetPreFix();
-                    aDataString += aTab;
-
-                    aDataString+= pCmdData->GetPath();
-                    aDataString += aTab;
-                    sal_uInt16 nPathLen = pCmdData->GetPath().Len();
-                    if ( nPathLen < 40 )
-                        for ( int i = 0; i < 9 - pCmdData->GetPath().Len() / 4 ; i++ )
-                            aDataString += aTab;
-                    else
-                        for ( int i = 0; i < 12 - pCmdData->GetPath().Len() / 4 ; i++ )
-                            aDataString += aTab;
-                    aDataString += pCmdData->GetCommandTypeString();
-                    aDataString += aTab;
-                    if ( pCmdData->GetCommandType() == COMMAND_GET )
-                        aDataString += aTab;
-                    if ( pCmdData->GetCommandPara() == aEmptyString )
-                        aDataString+= ByteString("-");
-                    else
-                        aDataString+= pCmdData->GetCommandPara();
-                    aDataString += aTab;
-                    aDataString+= pCmdData->GetOSTypeString();
-                    if ( pCmdData->GetClientRestriction().Len()) {
-                        aDataString += ByteString( "," );
-                        aDataString += pCmdData->GetClientRestriction();
-                    }
-                    aDataString += aTab;
-                    aDataString += pCmdData->GetLogFile();
-                    aDataString += aSpace;
-
-                    pCmdDepList = pCmdData->GetDependencies();
-                    if ( pCmdDepList )
-                        for ( sal_uInt16 i = 0; i< pCmdDepList->Count(); i++ ) {
-                            aDataString += *pCmdDepList->GetObject( i );
-                            aDataString += aSpace;
-                    }
-                    aDataString += "NULL";
-                }
-
-                rStream.WriteLine( aDataString );
-
-                pCmdData = pPrj->Next();
-            } while ( pCmdData );
-        }
-    }
-    return 0;
-}
-
-/*****************************************************************************/
-sal_uInt16 StarWriter::Write( String aFileName )
-/*****************************************************************************/
-{
-    sFileName = aFileName;
-
-    FileStat::SetReadOnlyFlag( DirEntry( aFileName ), sal_False );
-
-    SvFileStream aFileStream;
-
-    aFileStream.Open( aFileName, STREAM_WRITE | STREAM_TRUNC);
-    if ( !aFileStream.IsOpen() && aFileIOErrorHdl.IsSet()) {
-        String sError( String::CreateFromAscii( "Error: Unable to open \"" ));
-        sError += aFileName;
-        sError += String::CreateFromAscii( "for writing!" );
-        aFileIOErrorHdl.Call( &sError );
-    }
-
-    if ( Count() > 0 )
-    {
-        Prj* pPrj = First();
-        do
-        {
-            WritePrj( pPrj, aFileStream );
-            pPrj = Next();
-        } while ( pPrj );
-    }
-
-    aFileStream.Close();
-
-    return 0;
-}
-
-/*****************************************************************************/
-sal_uInt16 StarWriter::WriteMultiple( String rSourceRoot )
-/*****************************************************************************/
-{
-    sSourceRoot = rSourceRoot;
-
-    if ( Count() > 0 )
-    {
-        String sPrjDir( String::CreateFromAscii( "prj" ));
-        String sSolarFile( String::CreateFromAscii( "build.lst" ));
-
-        Prj* pPrj = First();
-        do
-        {
-            String sName( pPrj->GetProjectName(), RTL_TEXTENCODING_ASCII_US );
-
-            DirEntry aEntry( rSourceRoot );
-            aEntry += DirEntry( sName );
-            aEntry += DirEntry( sPrjDir );
-            aEntry += DirEntry( sSolarFile );
-
-            FileStat::SetReadOnlyFlag( aEntry, sal_False );
-
-            SvFileStream aFileStream;
-            aFileStream.Open( aEntry.GetFull(), STREAM_WRITE | STREAM_TRUNC);
-
-            if ( !aFileStream.IsOpen() && aFileIOErrorHdl.IsSet()) {
-                String sError( String::CreateFromAscii( "Error: Unable to open \"" ));
-                sError += aEntry.GetFull();
-                sError += String::CreateFromAscii( "for writing!" );
-                aFileIOErrorHdl.Call( &sError );
-            }
-
-              WritePrj( pPrj, aFileStream );
-
-            aFileStream.Close();
-
-            pPrj = Next();
-        } while ( pPrj );
-    }
-
-    return 0;
-}
-
-/*****************************************************************************/
-void StarWriter::InsertTokenLine ( const ByteString& rTokenLine )
-/*****************************************************************************/
-{
-    ByteString sProjectName = rTokenLine.GetToken(1,'\t');
-    Prj* pPrj = GetPrj (sProjectName); // 0, if Prj not found;
-    Star::InsertTokenLine ( rTokenLine, &pPrj, sProjectName, sal_False );
-}
-
-/*****************************************************************************/
-sal_Bool StarWriter::InsertProject ( Prj* /*pNewPrj*/ )
-/*****************************************************************************/
-{
-    return sal_False;
-}
-
-/*****************************************************************************/
-Prj* StarWriter::RemoveProject ( ByteString aProjectName )
-/*****************************************************************************/
-{
-    sal_uIntPtr nCount_l = Count();
-    Prj* pPrj;
-    Prj* pPrjFound = NULL;
-    SByteStringList* pPrjDeps;
-
-    for ( sal_uInt16 i = 0; i < nCount_l; i++ )
-    {
-        pPrj = GetObject( i );
-        if ( pPrj->GetProjectName() == aProjectName )
-            pPrjFound = pPrj;
-        else
-        {
-            pPrjDeps = pPrj->GetDependencies( sal_False );
-            if ( pPrjDeps )
-            {
-                ByteString* pString;
-                sal_uIntPtr nPrjDepsCount = pPrjDeps->Count();
-                for ( sal_uIntPtr j = nPrjDepsCount; j > 0; j-- )
-                {
-                    pString = pPrjDeps->GetObject( j - 1 );
-                    if ( pString->GetToken( 0, '.') == aProjectName )
-                        pPrjDeps->Remove( pString );
-                }
-            }
-        }
-    }
-
-    Remove( pPrjFound );
-
-    return pPrjFound;
-}
-
-//
-// class StarFile
-//
-
-/*****************************************************************************/
-StarFile::StarFile( const String &rFile )
-/*****************************************************************************/
-                : aFileName( rFile )
-{
-    DirEntry aEntry( aFileName );
-    if ( aEntry.Exists()) {
-        bExists = sal_True;
-        FileStat aStat( aEntry );
-        aDate = aStat.DateModified();
-        aTime = aStat.TimeModified();
-        aDateCreated = aStat.DateCreated();
-        aTimeCreated = aStat.TimeCreated();
-    }
-    else
-        bExists = sal_False;
-}
-
-/*****************************************************************************/
-sal_Bool StarFile::NeedsUpdate()
-/*****************************************************************************/
-{
-    DirEntry aEntry( aFileName );
-    if ( aEntry.Exists()) {
-        if ( !bExists ) {
-            bExists = sal_True;
-            return sal_True;
-        }
-        FileStat aStat( aEntry );
-        if (( aStat.DateModified() != aDate ) || ( aStat.TimeModified() != aTime )
-            || ( aStat.DateCreated() != aDateCreated ) || ( aStat.TimeCreated() != aTimeCreated ))
-            return sal_True;
-    }
-    return sal_False;
-}
diff --git a/soldep/bootstrp/prodmap.cxx b/soldep/bootstrp/prodmap.cxx
deleted file mode 100644
index 0c5ce1e66f14..000000000000
--- a/soldep/bootstrp/prodmap.cxx
+++ /dev/null
@@ -1,517 +0,0 @@
- /*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "prodmap.hxx"
-#include <tools/geninfo.hxx>
-#include <tools/fsys.hxx>
-#include "minormk.hxx"
-
-#include <stdio.h>
-
-#define PRODUCT_KEY     "TARGETDESCRIPTION/PRODUCTS"
-#define DEPENDS_ON_KEY  "TARGETDESCRIPTION/DEPENDSON"
-#define BASED_ON_KEY    "TARGETDESCRIPTION/BASEDON"
-
-//
-// class ProductMapper
-//
-
-/*****************************************************************************/
-ProductMapper::ProductMapper()
-/*****************************************************************************/
-                : pVersionList( NULL ),
-                pProductList( NULL )
-{
-}
-
-/*****************************************************************************/
-ProductMapper::ProductMapper( GenericInformationList *pVerList )
-/*****************************************************************************/
-                : pVersionList( pVerList ),
-                pProductList( NULL )
-{
-    if ( pVerList )
-        CreateProductList( pVerList );
-}
-
-/*****************************************************************************/
-ProductMapper::~ProductMapper()
-/*****************************************************************************/
-{
-    delete pProductList;
-}
-
-/*****************************************************************************/
-void ProductMapper::CreateProductList( GenericInformationList *pVerList )
-/*****************************************************************************/
-{
-    /*
-    creates a list of the following format:
-
-    ProductName Workspace                // 6.0 Final SRC641
-    {                                    // {
-        DependsOn                        //     DependsOn
-        {                                //     {
-            product1                     //
-            product2                     //
-            ...                          //
-        }                                //
-        BasedOn                          //
-        {                                //
-            productX                     //
-            productY                     //
-            ...                          //
-        }                                //
-    }                                    //
-    */
-
-    delete pProductList;
-    pProductList = NULL;
-
-    pVersionList = pVerList;
-
-    if ( pVersionList ) {
-        ByteString sProductKey( PRODUCT_KEY );
-        ByteString sDependsOnKey( DEPENDS_ON_KEY );
-        ByteString sBasedOnKey( BASED_ON_KEY );
-
-        for ( sal_uIntPtr i = 0; i < pVersionList->Count(); i++ ) {
-            GenericInformation *pVersion = pVersionList->GetObject( i );
-
-            GenericInformation *pProducts = pVersion->GetSubInfo( sProductKey, sal_True );
-            if ( pProducts ) {
-                ByteString sProducts = pProducts->GetValue();
-
-                ByteString sDependsOn;
-                GenericInformation *pDependsOn = pVersion->GetSubInfo( sDependsOnKey, sal_True );
-                if ( pDependsOn )
-                    sDependsOn = pDependsOn->GetValue();
-
-                ByteString sBasedOn;
-                GenericInformation *pBasedOn = pVersion->GetSubInfo( sBasedOnKey, sal_True );
-                if ( pBasedOn )
-                    sBasedOn = pBasedOn->GetValue();
-
-                for ( sal_uInt16 x = 0; x < sProducts.GetTokenCount( ';' ); x++ ) {
-                    ByteString sProduct( sProducts.GetToken( x, ';' ));
-                    if( sProduct.Len()) {
-                        if ( !pProductList )
-                            pProductList = new GenericInformationList();
-
-                        pProductList->InsertInfo( sProduct, *pVersion, sal_True, sal_True );
-
-                        for ( sal_uInt16 y = 0; y < sDependsOn.GetTokenCount( ';' ); y++ ) {
-                            ByteString sDependsOnKey_l = sProduct;
-                            sDependsOnKey_l += "/DependsOn/";
-                            sDependsOnKey_l += sDependsOn.GetToken( y, ';' );
-
-                            pProductList->InsertInfo( sDependsOnKey_l, "", sal_True, sal_True );
-                        }
-                        for ( sal_uInt16 z = 0; z < sBasedOn.GetTokenCount( ';' ); z++ ) {
-                            ByteString sBasedOnKey_l = sProduct;
-                            sBasedOnKey_l += "/BasedOn/";
-                            sBasedOnKey_l += sBasedOn.GetToken( z, ';' );
-
-                            pProductList->InsertInfo( sBasedOnKey_l, "", sal_True, sal_True );
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-/*****************************************************************************/
-sal_uInt16 ProductMapper::GetProductInformation(
-    const ByteString &rProduct, GenericInformation *& pProductInfo )
-/*****************************************************************************/
-{
-    pProductInfo = NULL;
-
-    if ( !pVersionList )
-        return PRODUCT_MAPPER_NO_VERSION_INFORMATION;
-
-    if ( !pProductList )
-        return PRODUCT_MAPPER_NO_PRODUCT;
-
-    ByteString sProductKey( rProduct );
-    pProductInfo = pProductList->GetInfo( sProductKey, sal_True );
-
-    if ( !pProductInfo )
-        return PRODUCT_MAPPER_NO_PRODUCT;
-
-    return PRODUCT_MAPPER_OK;
-}
-
-/*****************************************************************************/
-sal_uInt16 ProductMapper::PrintDependentTargets(
-    const ByteString &rProduct, sal_uInt16 nLevel )
-/*****************************************************************************/
-{
-    GenericInformation *pProductInfo;
-
-    sal_uInt16 nReturn = GetProductInformation( rProduct, pProductInfo );
-
-    if ( nReturn == PRODUCT_MAPPER_OK ) {
-        for ( sal_uInt16 i = 0; i < nLevel; i++ )
-            fprintf( stdout, "    " );
-        fprintf( stdout, "%s (%s)\n", pProductInfo->GetBuffer(),
-            pProductInfo->GetValue().GetBuffer());
-        aPrintedList.PutString( new ByteString( *pProductInfo ));
-
-        for ( sal_uIntPtr j = 0; j < pProductList->Count(); j++ ) {
-            GenericInformation *pCandidate = pProductList->GetObject( j );
-            ByteString sKey( "DEPENDSON/" );
-            sKey += rProduct;
-            GenericInformation *pDependsOn = pCandidate->GetSubInfo( sKey, sal_True );
-            if ( pDependsOn )
-                PrintDependentTargets( *pCandidate, nLevel + 1 );
-        }
-        if ( !nLevel ) {
-            ByteString sKey( "BASEDON" );
-            GenericInformation *pBasedOn = pProductInfo->GetSubInfo( sKey );
-            if ( pBasedOn ) {
-                GenericInformationList *pBases = pBasedOn->GetSubList();
-                if ( pBases ) {
-                    for ( sal_uIntPtr k = 0; k < pBases->Count(); k++ ) {
-                        aBaseList.PutString( new ByteString( *pBases->GetObject( k )));
-                    }
-                }
-            }
-        }
-    }
-
-    return nReturn;
-}
-
-/*****************************************************************************/
-sal_uInt16 ProductMapper::PrintAndDeleteBaseList()
-/*****************************************************************************/
-{
-    if ( aBaseList.Count()) {
-        fprintf( stdout, "\nbased on\n" );
-        while ( aBaseList.Count()) {
-            ByteString sProduct( *aBaseList.GetObject(( sal_uIntPtr ) 0 ));
-            if ( aPrintedList.IsString( aBaseList.GetObject(( sal_uIntPtr ) 0 )) == NOT_THERE ) {
-                aPrintedList.PutString( aBaseList.GetObject(( sal_uIntPtr ) 0 ));
-                PrintDependentTargets( sProduct );
-            }
-            else
-                delete aBaseList.GetObject(( sal_uIntPtr ) 0 );
-
-            aBaseList.Remove(( sal_uIntPtr ) 0 );
-        }
-        while ( aPrintedList.Count())
-            delete aPrintedList.Remove(( sal_uIntPtr ) 0 );
-
-        fprintf( stdout, "\n" );
-    }
-    return PRODUCT_MAPPER_OK;
-}
-
-/*****************************************************************************/
-sal_uInt16 ProductMapper::PrintDependencies( const ByteString &rProduct )
-/*****************************************************************************/
-{
-    sal_uInt16 nResult = PrintDependentTargets( rProduct );
-    PrintAndDeleteBaseList();
-    return nResult;
-}
-
-/*****************************************************************************/
-sal_uInt16 ProductMapper::PrintProductList()
-/*****************************************************************************/
-{
-    if ( !pVersionList )
-        return PRODUCT_MAPPER_NO_VERSION_INFORMATION;
-
-    if ( !pProductList || !pProductList->Count())
-        return PRODUCT_MAPPER_NO_PRODUCT;
-
-    if ( pProductList->Count()) {
-        for ( sal_uIntPtr i = 0; i < pProductList->Count(); i++ )
-            fprintf( stdout, "%s (%s)\n",
-                pProductList->GetObject( i )->GetBuffer(),
-                pProductList->GetObject( i )->GetValue().GetBuffer());
-        fprintf( stdout, "\n" );
-    }
-
-    return PRODUCT_MAPPER_OK;
-}
-
-/*****************************************************************************/
-SByteStringList *ProductMapper::GetMinorList(
-    const ByteString &rVersion, const ByteString &rEnvironment )
-/*****************************************************************************/
-{
-    SByteStringList *pList = NULL;
-
-    if ( pVersionList ) {
-        String sRoot( GetVersionRoot( pVersionList, rVersion ));
-        if ( sRoot.Len()) {
-            DirEntry aEntry( sRoot );
-            aEntry += DirEntry( String( rEnvironment, RTL_TEXTENCODING_ASCII_US ));
-            String sWildcard( String::CreateFromAscii( "inc.*" ));
-            aEntry += DirEntry( sWildcard );
-
-            Dir aDir( aEntry, FSYS_KIND_DIR );
-            for ( sal_uInt16 i = 0; i < aDir.Count(); i++ ) {
-                ByteString sInc( aDir[ i ].GetName(), RTL_TEXTENCODING_ASCII_US );
-                if ( sInc.GetTokenCount( '.' ) > 1 ) {
-                    if ( !pList )
-                        pList = new SByteStringList();
-                    pList->PutString( new ByteString( sInc.GetToken( 1, '.' )));
-                }
-            }
-        }
-    }
-    return pList;
-}
-
-/*****************************************************************************/
-String ProductMapper::GetVersionRoot(
-    GenericInformationList *pList, const ByteString &rVersion )
-/*****************************************************************************/
-{
-    ByteString sKey( rVersion );
-    GenericInformation *pVersion = pList->GetInfo( sKey );
-    if ( pVersion ) {
-#ifdef UNX
-        sKey = "drives/o:/unixvolume";
-        GenericInformation *pUnixVolume = pVersion->GetSubInfo( sKey, sal_True );
-        ByteString sPath;
-        if ( pUnixVolume )
-            sPath = pUnixVolume->GetValue();
-        sPath += "/";
-#else
-        ByteString sPath( "o:\\" );
-#endif
-        sKey = "settings/path";
-        GenericInformation *pPath = pVersion->GetSubInfo( sKey, sal_True );
-        if ( pPath ) {
-            sPath += pPath->GetValue().GetToken( 0, '\\' );
-            sPath += "/";
-        }
-#ifdef UNX
-        sPath.SearchAndReplaceAll( "\\", "/" );
-        while( sPath.SearchAndReplace( "//", "/" ) != STRING_NOTFOUND ) {};
-#else
-        sPath.SearchAndReplaceAll( "/", "\\" );
-        while( sPath.SearchAndReplace( "\\\\", "\\" ) != STRING_NOTFOUND ) {};
-#endif
-
-        return String( sPath, RTL_TEXTENCODING_ASCII_US );
-    }
-    return String();
-}
-
-/*****************************************************************************/
-BaseProductList *ProductMapper::GetBases(
-    GenericInformation *pProductInfo, sal_uInt16 nLevel,
-    BaseProductList *pBases )
-/*****************************************************************************/
-{
-    if ( !pBases )
-        pBases = new BaseProductList();
-
-    if ( pProductInfo ) {
-        ByteString sCandidate( *pProductInfo );
-        sCandidate += " (";
-        sCandidate += pProductInfo->GetValue();
-        sCandidate += ")";
-
-        ByteString sKey( "BASEDON" );
-        GenericInformation *pBasedOn = pProductInfo->GetSubInfo( sKey );
-        if ( pBasedOn ) {
-            GenericInformationList *pBasesInfo = pBasedOn->GetSubList();
-            if ( pBasesInfo ) {
-                for ( sal_uIntPtr k = 0; k < pBasesInfo->Count(); k++ ) {
-                    GenericInformation *pBaseProduct;
-                    if ( GetProductInformation( *pBasesInfo->GetObject( k ), pBaseProduct ) == PRODUCT_MAPPER_OK )
-                        GetBases( pBaseProduct, ++ nLevel, pBases );
-                }
-            }
-        }
-        sal_Bool bFound = sal_False;
-        ByteString sUpperCandidate( sCandidate );
-        sUpperCandidate.ToUpperAscii();
-        for ( sal_uInt16 i = 0; i < pBases->Count() && !bFound; i++ ) {
-            ByteString sTest( *pBases->GetObject( i ));
-            if ( sTest.ToUpperAscii() == sUpperCandidate )
-                bFound = sal_True;
-        }
-        if ( !bFound )
-            pBases->Insert( new ByteString( sCandidate ), ( sal_uIntPtr ) 0 );
-    }
-    return pBases;
-}
-
-/*****************************************************************************/
-sal_uInt16 ProductMapper::PrintMinorList(
-    const ByteString rProduct, const ByteString rEnvironment )
-/*****************************************************************************/
-{
-    if ( !pVersionList )
-        return PRODUCT_MAPPER_NO_VERSION_INFORMATION;
-
-    if ( !pProductList || !pProductList->Count())
-        return PRODUCT_MAPPER_NO_PRODUCT;
-
-    GenericInformation *pProductInfo;
-    GetProductInformation( rProduct, pProductInfo );
-    if ( !pProductInfo )
-        return PRODUCT_MAPPER_NO_PRODUCT;
-
-    BaseProductList *pBases = GetBases( pProductInfo );
-    if ( pBases->Count()) {
-        if ( pBases->Count() > 1 )
-            fprintf( stdout, "Product \"%s\" based on ", pBases->GetObject(( sal_uIntPtr ) 0 )->GetBuffer());
-        else
-            fprintf( stdout, "Product \"%s\" based on no other products", pBases->GetObject(( sal_uIntPtr ) 0 )->GetBuffer());
-
-        for ( sal_uIntPtr i = 1; i < pBases->Count(); i++ ) {
-            fprintf( stdout, "\"%s\"", pBases->GetObject( i )->GetBuffer());
-            if ( i < pBases->Count() - 1 )
-                fprintf( stdout, ", " );
-        }
-        fprintf( stdout, "\n\n" );
-    }
-    sal_uInt16 nResult = PRODUCT_MAPPER_OK;
-
-    if ( rEnvironment.Len())
-        nResult = PrintSingleMinorList( pProductInfo, pBases, rEnvironment );
-    else {
-        ByteString sEnvKey( pProductInfo->GetValue());
-        sEnvKey += "/Environments";
-
-        GenericInformation *pEnvironmentInfo = pVersionList->GetInfo( sEnvKey, sal_True );
-        if ( pEnvironmentInfo ) {
-            GenericInformationList *pEnvironmentList = pEnvironmentInfo->GetSubList();
-            if ( pEnvironmentList ) {
-                for ( sal_uIntPtr i = 0; i < pEnvironmentList->Count(); i++ ) {
-                    sal_uInt16 nTmp = PrintSingleMinorList( pProductInfo, pBases, *pEnvironmentList->GetObject( i ));
-                    if ( nTmp != PRODUCT_MAPPER_OK )
-                        nResult = nTmp;
-                }
-            }
-        }
-    }
-
-    for ( sal_uIntPtr m = 0; m < pBases->Count(); m++ )
-        delete pBases->GetObject( m );
-    delete pBases;
-
-    return nResult;
-}
-
-/*****************************************************************************/
-sal_uInt16 ProductMapper::PrintSingleMinorList(
-    GenericInformation *pProductInfo, BaseProductList *pBases,
-    const ByteString rEnvironment )
-/*****************************************************************************/
-{
-    DirEntry aRoot( GetVersionRoot( pVersionList, pProductInfo->GetValue()));
-    aRoot += DirEntry( String( rEnvironment, RTL_TEXTENCODING_ASCII_US ));
-    if ( !aRoot.Exists())
-        return PRODUCT_MAPPER_OK;
-
-    SByteStringList *pMinors = GetMinorList( pProductInfo->GetValue(), rEnvironment );
-    if ( !pMinors )
-        pMinors = new SByteStringList();
-    pMinors->Insert( new ByteString( "" ), LIST_APPEND );
-
-    SByteStringList aOutputList;
-    sal_Bool bUnknownMinor = sal_False;
-    for ( sal_uIntPtr i = 0; i < pMinors->Count(); i++ ) {
-        ByteString sOutput;
-        ByteString sProductVersion;
-
-        for ( sal_uIntPtr j = 0; j < pBases->Count(); j++ ) {
-            ByteString sCurProduct( *pBases->GetObject( j ));
-            ByteString sVersion( sCurProduct.GetToken( sCurProduct.GetTokenCount( '(' ) - 1, '(' ).GetToken( 0, ')' ));
-            if ( !j )
-                sProductVersion = sVersion;
-
-            MinorMk *pMinorMk = new MinorMk(
-                pVersionList, sProductVersion, sVersion, rEnvironment, *pMinors->GetObject( i ));
-
-            ByteString sMinor( pMinorMk->GetLastMinor().GetBuffer());
-            if ( !sMinor.Len()) {
-                sMinor = "!";
-                bUnknownMinor = sal_True;
-            }
-            if ( j == 0 ) {
-                sOutput += pMinorMk->GetBuildNr();
-                sOutput += " ";
-
-                if ( i == pMinors->Count() - 1 )
-                    sOutput += "flat: ";
-                else
-                    sOutput += "      ";
-            }
-            sOutput += sVersion;
-            sOutput += ".";
-            sOutput += sMinor;
-            sOutput += "(";
-            sOutput += pMinorMk->GetBuildNr();
-            sOutput += ")  ";
-        }
-        aOutputList.PutString( new ByteString( sOutput ));
-    }
-    ByteString sOldMinor;
-
-    if ( aOutputList.Count())
-        fprintf( stdout, "Available builds on %s:\n", rEnvironment.GetBuffer());
-
-    for ( sal_uIntPtr o = 0; o < aOutputList.Count(); o++ ) {
-        ByteString sOutput( *aOutputList.GetObject( o ));
-        sOutput = sOutput.Copy( sOutput.GetToken( 0, ' ' ).Len() + 1 );
-
-        ByteString sCurMinor( sOutput.GetToken( 1, '.' ).GetToken( 0, '(' ));
-        if ( sOldMinor.Len() && sCurMinor < sOldMinor ) {
-            fprintf( stdout, "      ----------\n" );
-        }
-        sOldMinor = sCurMinor;
-
-        fprintf( stdout, "%s\n", sOutput.GetBuffer());
-        delete aOutputList.GetObject( o );
-    }
-    if ( bUnknownMinor )
-        fprintf( stdout, "Symbol ! indcates that at least one minor could not be found\n\n" );
-    else if ( aOutputList.Count())
-        fprintf( stdout, "\n" );
-
-    for ( sal_uIntPtr l = 0; l < pMinors->Count(); l++ )
-        delete pMinors->GetObject( l );
-    delete pMinors;
-
-    return PRODUCT_MAPPER_OK;
-}
-
-
-
-
diff --git a/soldep/bootstrp/sstring.cxx b/soldep/bootstrp/sstring.cxx
deleted file mode 100644
index a9c50839f6f6..000000000000
--- a/soldep/bootstrp/sstring.cxx
+++ /dev/null
@@ -1,314 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _TOOLS_STRINGLIST
-#  define _TOOLS_STRINGLIST
-#endif
-
-#define ENABLE_BYTESTRING_STREAM_OPERATORS
-#include <tools/stream.hxx>
-#include "soldep/sstring.hxx"
-
-SByteStringList::SByteStringList()
-{
-}
-
-SByteStringList::~SByteStringList()
-{
-}
-
-sal_uIntPtr SByteStringList::IsString( ByteString* pStr )
-{
-    sal_uIntPtr nRet = NOT_THERE;
-    if ( (nRet = GetPrevString( pStr )) != 0 )
-    {
-        ByteString* pString = GetObject( nRet );
-        if ( *pString == *pStr )
-            return nRet;
-        else
-            return NOT_THERE;
-    }
-    else
-    {
-        ByteString* pString = GetObject( 0 );
-        if ( pString && (*pString == *pStr) )
-            return 0;
-        else
-            return NOT_THERE;
-    }
-}
-
-sal_uIntPtr SByteStringList::GetPrevString( ByteString* pStr )
-{
-    sal_uIntPtr nRet = 0;
-    sal_Bool bFound = sal_False;
-    sal_uIntPtr nCountMember = Count();
-    sal_uIntPtr nUpper = nCountMember;
-    sal_uIntPtr nLower = 0;
-    sal_uIntPtr nCurrent = nUpper / 2;
-    sal_uIntPtr nRem = 0;
-    ByteString* pString;
-
-    do
-    {
-        if ( (nCurrent == nLower) || (nCurrent == nUpper) )
-            return nLower;
-        pString = GetObject( nCurrent );
-        StringCompare nResult =  pStr->CompareTo( *pString );
-        if ( nResult == COMPARE_LESS )
-        {
-            nUpper = nCurrent;
-            nCurrent = (nCurrent + nLower) /2;
-        }
-        else if ( nResult == COMPARE_GREATER )
-        {
-            nLower = nCurrent;
-            nCurrent = (nUpper + nCurrent) /2;
-        }
-        else if ( nResult == COMPARE_EQUAL )
-            return nCurrent;
-        if ( nRem == nCurrent )
-            return nCurrent;
-        nRem = nCurrent;
-    }
-    while ( !bFound );
-    return nRet;
-}
-
-/**************************************************************************
-*
-*   Sortiert einen ByteString in die Liste ein und gibt die Position,
-*   an der einsortiert wurde, zurueck
-*
-**************************************************************************/
-
-sal_uIntPtr SByteStringList::PutString( ByteString* pStr )
-{
-    sal_uIntPtr nPos = GetPrevString ( pStr );
-    if ( Count() )
-    {
-        {
-            ByteString* pString = GetObject( 0 );
-            if ( pString->CompareTo( *pStr ) == COMPARE_GREATER )
-            {
-                Insert( pStr, (sal_uIntPtr)0 );
-                return (sal_uIntPtr)0;
-            }
-        }
-        ByteString* pString = GetObject( nPos );
-        if ( *pStr != *pString )
-        {
-            Insert( pStr, nPos+1 );
-            return ( nPos +1 );
-        }
-    }
-    else
-    {
-        Insert( pStr );
-        return (sal_uIntPtr)0;
-    }
-
-    return NOT_THERE;
-}
-
-ByteString* SByteStringList::RemoveString( const ByteString& rName )
-{
-    sal_uIntPtr i;
-    ByteString* pReturn;
-
-    for( i = 0 ; i < Count(); i++ )
-    {
-        if ( rName == *GetObject( i ) )
-        {
-            pReturn = GetObject(i);
-            Remove(i);
-            return pReturn;
-        }
-    }
-
-    return NULL;
-}
-
-void SByteStringList::CleanUp()
-{
-    ByteString* pByteString = First();
-    while (pByteString) {
-        delete pByteString;
-        pByteString = Next();
-    }
-    Clear();
-}
-
-SByteStringList& SByteStringList::operator<<  ( SvStream& rStream )
-{
-    sal_uInt32 nListCount;
-    rStream >> nListCount;
-    for ( sal_uInt16 i = 0; i < nListCount; i++ ) {
-        ByteString* pByteString = new ByteString();
-        rStream >> *pByteString;
-        Insert (pByteString, LIST_APPEND);
-    }
-    return *this;
-}
-
-SByteStringList& SByteStringList::operator>>  ( SvStream& rStream )
-{
-    sal_uInt32 nListCount = Count();
-    rStream << nListCount;
-    ByteString* pByteString = First();
-    while (pByteString) {
-        rStream << *pByteString;
-        pByteString = Next();
-    }
-    return *this;
-}
-
-
-
-
-
-
-
-SUniStringList::SUniStringList()
-{
-}
-
-SUniStringList::~SUniStringList()
-{
-}
-
-sal_uIntPtr SUniStringList::IsString( UniString* pStr )
-{
-    sal_uIntPtr nRet = NOT_THERE;
-    if ( (nRet = GetPrevString( pStr )) != 0 )
-    {
-        UniString* pString = GetObject( nRet );
-        if ( *pString == *pStr )
-            return nRet;
-        else
-            return NOT_THERE;
-    }
-    else
-    {
-        UniString* pString = GetObject( 0 );
-        if ( pString && (*pString == *pStr) )
-            return 0;
-        else
-            return NOT_THERE;
-    }
-}
-
-sal_uIntPtr SUniStringList::GetPrevString( UniString* pStr )
-{
-    sal_uIntPtr nRet = 0;
-    sal_Bool bFound = sal_False;
-    sal_uIntPtr nCountMember = Count();
-    sal_uIntPtr nUpper = nCountMember;
-    sal_uIntPtr nLower = 0;
-    sal_uIntPtr nCurrent = nUpper / 2;
-    sal_uIntPtr nRem = 0;
-    UniString* pString;
-
-    do
-    {
-        if ( (nCurrent == nLower) || (nCurrent == nUpper) )
-            return nLower;
-        pString = GetObject( nCurrent );
-        StringCompare nResult =  pStr->CompareTo( *pString );
-        if ( nResult == COMPARE_LESS )
-        {
-            nUpper = nCurrent;
-            nCurrent = (nCurrent + nLower) /2;
-        }
-        else if ( nResult == COMPARE_GREATER )
-        {
-            nLower = nCurrent;
-            nCurrent = (nUpper + nCurrent) /2;
-        }
-        else if ( nResult == COMPARE_EQUAL )
-            return nCurrent;
-        if ( nRem == nCurrent )
-            return nCurrent;
-        nRem = nCurrent;
-    }
-    while ( !bFound );
-    return nRet;
-}
-
-/**************************************************************************
-*
-*   Sortiert einen UniString in die Liste ein und gibt die Position,
-*   an der einsortiert wurde, zurueck
-*
-**************************************************************************/
-
-sal_uIntPtr SUniStringList::PutString( UniString* pStr )
-{
-    sal_uIntPtr nPos = GetPrevString ( pStr );
-    if ( Count() )
-    {
-        {
-            UniString* pString = GetObject( 0 );
-            if ( pString->CompareTo( *pStr ) == COMPARE_GREATER )
-            {
-                Insert( pStr, (sal_uIntPtr)0);
-                return (sal_uIntPtr)0;
-            }
-        }
-        UniString* pString = GetObject( nPos );
-        if ( *pStr != *pString )
-        {
-            Insert( pStr, nPos+1 );
-            return ( nPos +1 );
-        }
-    }
-    else
-    {
-        Insert( pStr );
-        return (sal_uIntPtr)0;
-    }
-
-    return NOT_THERE;
-}
-
-UniString* SUniStringList::RemoveString( const UniString& rName )
-{
-    sal_uIntPtr i;
-    UniString* pReturn;
-
-    for( i = 0 ; i < Count(); i++ )
-    {
-        if ( rName == *GetObject( i ) )
-        {
-            pReturn = GetObject(i);
-            Remove(i);
-            return pReturn;
-        }
-    }
-
-    return NULL;
-}
diff --git a/soldep/inc/dep.hxx b/soldep/inc/dep.hxx
deleted file mode 100644
index 74bf674203eb..000000000000
--- a/soldep/inc/dep.hxx
+++ /dev/null
@@ -1,69 +0,0 @@
- /*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _DEP_HXX
-#define _DEP_HXX
-
-#include <soldep/sstring.hxx>
-
-class SByteExtStringList : public SByteStringList
-{
-    private:
-        sal_Bool        bDeleteStrings;
-    public:
-        SByteExtStringList(sal_Bool bDelete = sal_True) : bDeleteStrings (bDelete) {}
-        ~SByteExtStringList();
-};
-
-class VersionDepInfo : public SByteExtStringList
-{
-    private:
-        ByteString*                 pVersion;
-    public:
-        VersionDepInfo() : pVersion (NULL) {}
-        VersionDepInfo(const ByteString& rCurrentVersion) : pVersion (NULL) { pVersion = new ByteString(rCurrentVersion); }
-        ~VersionDepInfo();
-        void                Clear();
-        const ByteString*   GetVersion() { return pVersion; }
-        //void              SetVersion(ByteString* pStr) { pVersion = pStr; }
-};
-
-DECLARE_LIST( VersionDepInfoList_Impl, VersionDepInfo* )
-
-class VersionDepInfoList : public VersionDepInfoList_Impl
-{
-    public:
-        VersionDepInfoList () {}
-        ~VersionDepInfoList () {}
-        VersionDepInfo*     GetVersion (ByteString& rVersion);
-        void                RemoveVersion (ByteString& rVersion);
-        VersionDepInfo*     InsertVersion (ByteString& rVersion);
-
-};
-
-
-#endif
diff --git a/soldep/inc/dtsodcmp.hrc b/soldep/inc/dtsodcmp.hrc
deleted file mode 100644
index bfeca821562b..000000000000
--- a/soldep/inc/dtsodcmp.hrc
+++ /dev/null
@@ -1,99 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _DTSODCMP_HRC
-#define _DTSODCMP_HRC
-
-//========================================================================
-// Bereiche
-#define RID_SD_STRING_START             26000
-#define RID_SD_MENU_START               27000
-#define RID_SD_CONTEXTMENU_START        28500
-#define RID_SD_TOOLBOX_START            29000
-#define RID_SD_WINDOW_START             30000
-#define RID_SD_STATUSBAR_START          30500
-#define RID_SD_IMAGE_START              31000
-#define RID_SD_BITMAP_START             31250
-#define RID_SD_DIALOG_START             31500
-#define RID_SD_DEPPER_DIALOG_START      31750
-// end is at 31999
-
-#define SID_START                   0
-
-//========================================================================
-// Window-Ids
-
-//========================================================================
-// Menu-Ids
-#define RID_SD_MENU_APP                             (RID_SD_MENU_START)
-#define RID_SD_MENU_FILE                            (RID_SD_MENU_START      +   1)
-#define RID_SD_MENU_FILE_NEW                        (RID_SD_MENU_START      +   2)
-#define RID_SD_MENU_FILE_OPEN                       (RID_SD_MENU_START      +   3)
-#define RID_SD_MENU_FILE_SAVE                       (RID_SD_MENU_START      +   4)
-#define RID_SD_MENU_FILE_SAVEAS                     (RID_SD_MENU_START      +   5)
-#define RID_SD_MENU_FILE_EXIT                       (RID_SD_MENU_START      +   6)
-#define RID_SD_MENU_NEW_OBJECT                      (RID_SD_MENU_START      +   7)
-#define RID_SD_MENU_REMOVE_LAST                     (RID_SD_MENU_START      +   8)
-#define RID_SD_MENU_AUTO                            (RID_SD_MENU_START      +   9)
-#define RID_SD_MENU_RUN_TEST                        (RID_SD_MENU_START      +   10)
-
-//========================================================================
-// ContextMenu-Ids
-
-//========================================================================
-// ToolBox-Ids
-#define RID_SD_TOOLBOX_APP                          (RID_SD_TOOLBOX_START)
-#define RID_SD_TOOLBOX_FILE_NEW                 (RID_SD_TOOLBOX_START   +   1)
-#define RID_SD_TOOLBOX_FILE_OPEN                    (RID_SD_TOOLBOX_START   +   2)
-#define RID_SD_TOOLBOX_FILE_SAVE                    (RID_SD_TOOLBOX_START   +   3)
-
-
-//========================================================================
-// StatusBar-Ids
-
-//========================================================================
-// Image-Ids
-#define RID_SD_CP_IMAGE                         (RID_SD_IMAGE_START)
-
-//========================================================================
-// Dialog-Ids
-#define RID_SD_DIALOG_NEWPROJECT                (RID_SD_DEPPER_DIALOG_START)
-#define RID_SD_DIALOG_NEWDIRECTORY              (RID_SD_DEPPER_DIALOG_START + 1)
-#define RID_SD_DIALOG_HELP                      (RID_SD_DEPPER_DIALOG_START + 2)
-
-//========================================================================
-// String-Ids
-#define RID_SD_CP_NAME                          (RID_SD_STRING_START)
-
-//========================================================================
-// Slot-Ids
-
-//========================================================================
-// Format-Ids
-
-#endif //_DTSODCMP_HRC
-
diff --git a/soldep/inc/minormk.hxx b/soldep/inc/minormk.hxx
deleted file mode 100644
index 1f4205cd8981..000000000000
--- a/soldep/inc/minormk.hxx
+++ /dev/null
@@ -1,77 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <tools/stream.hxx>
-
-class GenericInformationList;
-
-//
-// class MinorMk
-//
-
-class MinorMk : public SvFileStream
-{
-private:
-    ByteString sRSCVERSION;
-    ByteString sRSCREVISION;
-    ByteString sBUILD;
-    ByteString sLAST_MINOR;
-
-    sal_Bool bExists;
-
-    void ReadMinorMk( const String &rFileName );
-
-public:
-    MinorMk(
-        GenericInformationList *pList,
-        const ByteString &rVersion,
-        const ByteString &rWorkStamp,
-        const ByteString &rEnvironment,
-        const ByteString &rMinor
-    );
-    MinorMk(
-        const ByteString &rMinor,
-        const ByteString &rEnvironment
-    );
-    MinorMk(
-        GenericInformationList *pList,
-        const ByteString rVersion
-    );
-    ~MinorMk();
-
-    ByteString GetRscVersion()
-        { return sRSCVERSION; }
-    ByteString GetRscRevision()
-        { return sRSCREVISION; }
-    ByteString GetBuildNr()
-        { return sBUILD; }
-    ByteString GetLastMinor()
-        { return sLAST_MINOR; }
-
-    sal_Bool Exists()
-        { return bExists; }
-};
diff --git a/soldep/inc/prodmap.hxx b/soldep/inc/prodmap.hxx
deleted file mode 100644
index c0f6ade654cd..000000000000
--- a/soldep/inc/prodmap.hxx
+++ /dev/null
@@ -1,84 +0,0 @@
- /*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef PRODUCT_MAPPER_HXX
-#define PRODUCT_MAPPER_HXX
-
-#include <soldep/sstring.hxx>
-
-class GenericInformation;
-class GenericInformationList;
-
-DECLARE_LIST( BaseProductList, ByteString * )
-
-//
-// class ProductMapper
-//
-
-#define PRODUCT_MAPPER_OK                       0x0000
-#define PRODUCT_MAPPER_NO_PRODUCT               0x0001
-#define PRODUCT_MAPPER_NO_VERSION_INFORMATION   0x0002
-
-class ProductMapper
-{
-private:
-    GenericInformationList *pVersionList;
-    GenericInformationList *pProductList;
-
-    SByteStringList aBaseList;
-    SByteStringList aPrintedList;
-
-    sal_uInt16 PrintDependentTargets( const ByteString &rProduct, sal_uInt16 nLevel = 0 );
-    sal_uInt16 PrintAndDeleteBaseList();
-
-    SByteStringList *GetMinorList( const ByteString &rVersion, const ByteString &rEnvironment );
-    BaseProductList *GetBases( GenericInformation *pProductInfo, sal_uInt16 nLevel = 0, BaseProductList *pBases = NULL );
-
-    sal_uInt16 PrintSingleMinorList( GenericInformation *pProductInfo, BaseProductList *pBases, const ByteString rEnvironment );
-
-public:
-    ProductMapper();
-    ProductMapper( GenericInformationList *pVerList );
-
-    ~ProductMapper();
-
-    void CreateProductList( GenericInformationList *pVerList );
-
-    sal_uInt16 GetProductInformation( const ByteString &rProduct, GenericInformation *& pProductInfo );
-    sal_uInt16 PrintDependencies( const ByteString &rProduct );
-    sal_uInt16 PrintProductList();
-
-    sal_uInt16 PrintMinorList( const ByteString rProduct, const ByteString rEnvironment );
-
-    static String GetVersionRoot( GenericInformationList *pList, const ByteString &rVersion );
-
-    GenericInformationList *GetProductList() { return pProductList; }
-};
-
-
-#endif // PRODUCT_MAPPER_HXX
-
diff --git a/soldep/inc/soldep/appdef.hxx b/soldep/inc/soldep/appdef.hxx
deleted file mode 100644
index d02e4bbe9008..000000000000
--- a/soldep/inc/soldep/appdef.hxx
+++ /dev/null
@@ -1,161 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _MHAPPDEF_HXX
-#define _MHAPPDEF_HXX
-
-
-#ifdef UNX
-#define DEFAULT_INI_ROOT    "/so/env"
-#define DEFAULT_BS_ROOT     "/so/env/b_server"
-#define DEFAULT_EIS_ROOT    "/so/env/merge"
-#define PATH_SEPARATOR      '/'
-#define S_PATH_SEPARATOR    "/"
-#else
-#define DEFAULT_INI_ROOT    "r:"
-#define DEFAULT_BS_ROOT     "n:"
-#define DEFAULT_EIS_ROOT    "w:"
-#define PATH_SEPARATOR      '\\'
-#define S_PATH_SEPARATOR    "\\"
-#endif
-
-#define _INI_DRV                DEFAULT_INI_ROOT
-#define B_SERVER_ROOT           DEFAULT_BS_ROOT
-#define DEFAULT_INI_FILE        B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "b_server.ini"
-#define BINARYROOT              B_SERVER_ROOT S_PATH_SEPARATOR "bin"
-#define _JOB_DIR                B_SERVER_ROOT S_PATH_SEPARATOR "server" S_PATH_SEPARATOR "db"
-#define _INJOB_DIR              B_SERVER_ROOT S_PATH_SEPARATOR "server" S_PATH_SEPARATOR "dbin"
-#define _OUTJOB_DIR             B_SERVER_ROOT S_PATH_SEPARATOR "server" S_PATH_SEPARATOR "dbout"
-#define _ERRJOB_DIR             B_SERVER_ROOT S_PATH_SEPARATOR "server" S_PATH_SEPARATOR "dberr"
-#define _BUILDPATTERN_DIR       B_SERVER_ROOT S_PATH_SEPARATOR "pattern"
-#define _COMMENT_DIR            B_SERVER_ROOT S_PATH_SEPARATOR "comment"
-#define _SOLARLIST              B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "solar.lst"
-#define _DEF_STAND_LIST         B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "stand.lst"
-#define _DEF_DEFAULT_LIST       B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "default.lst"
-#define _DEF_SSOLARINI          B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "ssolar.ini"
-#define _DEF_SSCOMMON           B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "ssolar.cmn"
-#define _SERVER_IDENT_FLAG      B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "server.id"
-#define _CUSTOMJOBINI           B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "custom.ini"
-#define _BUILDCOMMANDINI        B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "bcommand.ini"
-#define _DATABASEINI            B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "database.ini"
-#define _ZNINI                  B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "bszn.ini"
-#define _ERRORINFOFILE          B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "errinf.lst"
-#define _REGEXPINFOFILE         B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "regexp.lst"
-#define _POSITIVERRORINFOFILE   B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "perrinf.lst"
-#define _POSITIVREGEXPINFOFILE  B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "pregexp.lst"
-#define _INIROOT                B_SERVER_ROOT S_PATH_SEPARATOR "config"
-#define _INIROOT_OLD            B_SERVER_ROOT S_PATH_SEPARATOR "config"
-#define _ENV_DIR                B_SERVER_ROOT S_PATH_SEPARATOR "config"
-#define _REDIRECTIONPATH        B_SERVER_ROOT S_PATH_SEPARATOR "redir"
-#define _ZLOGSPATH              B_SERVER_ROOT S_PATH_SEPARATOR "zlogs"
-#define DEFAULT_PROTPATH        B_SERVER_ROOT S_PATH_SEPARATOR "filesize"
-#define _INI_UNC                "\\\\jumbo2.germany.sun.com\\R-Laufwerk"
-#define _INI_UNC_OLD            "\\\\jumbo2.germany.sun.com\\R-Laufwerk"
-#define LOG_DIR                 B_SERVER_ROOT S_PATH_SEPARATOR "log"
-
-#define _REDIRECTIONSIZE        "10000"
-#define _EISPATH                DEFAULT_EIS_ROOT S_PATH_SEPARATOR "EIS"
-
-#define _BUILDEVENTPATH         _EISPATH S_PATH_SEPARATOR "EventImport"
-
-#define _WRITE_LOGFILES         "1"
-#define _WRITE_JOBFILES         "1"
-
-#define _VERSION_WINDOW         "0"
-#define _JOB_WINDOW             "0"
-#define _APPWIN_MAXIMIZED       "0"
-#define _CONTEXT_TBOX           "0"
-
-#define _COLOR_DROPED           COL_GRAY
-#define _COLOR_WAIT             COL_BLUE
-#define _COLOR_BUILD            COL_GREEN
-#define _COLOR_ERROR            COL_RED
-#define _COLOR_BUILDERROR       COL_MAGENTA
-#define _COLOR_OK               COL_BLACK
-#define _COLOR_DELIVERED        COL_CYAN
-#define _COLOR_MASTERSTOP       COL_LIGHTRED
-
-#define _ASYNCHRON              "1"
-
-// folowing defines are used to write filesize information for binaries
-#define OH_GOTT "*"
-#define UNX_DEFAULT_FILESIZES       "bin/" OH_GOTT ".bin;bin/" OH_GOTT ".res;bin/" OH_GOTT ".tlb;lib/" OH_GOTT ".so"
-#define DOS_DEFAULT_FILESIZES       "bin\\*.exe;bin\\*.res;bin\\*.dll;bin\\*.tlb"
-
-#ifdef UNX
-#define DEFAULT_FILESIZES UNX_DEFAULT_FILESIZES
-#else
-#define DEFAULT_FILESIZES DOS_DEFAULT_FILESIZES
-#endif
-
-/** States for BuildServer projects and directories
-*/
-#ifndef BuildStatus
-#define BuildStatus sal_uInt16
-#endif
-#define BS_DROPED                   0   /// project is waiting for dispatching
-#define BS_BUILD                    1   /// project/directory is building
-#define BS_WAIT                     2   /// project/directory is waiting for building
-#define BS_OK                       3   /// project/directory builded whithout errors
-#define BS_BUILDANDERROR            4   /// project is in build, any errors accured
-#define BS_ERROR                    5   /// project/directory builded with errors
-#define BS_NON                      6   /// no state is set
-#define BS_DELIVERED                7   /// project was delivered without errors
-#define BS_DELIVEREDANDERROR        8   /// project was delivered with errors
-#define BS_FIXED                    9   /// errors are fixed
-#define BS_NOTDELIVERED            10   /// project is ready to deliver
-#define BS_BUILD_PRIO              11   /// build projects with prio
-#define BS_BUILD_ORDER             12   /// build project in correct order
-#define BS_BUILD_DEPEND            13   /// build projects using dependencies
-#define BS_BUILD_DELIVER           14   /// build projects using dependencies and deliver builded projects
-#define BS_BUILD_NORMAL            15   /// build projects without using dependencies
-#define BS_BUILD_DELIVER_NO_DEPEND 16   /// build projects without using dependencies and deliver builded projects
-#define BS_BUILD_DOUBLE_LOG        17   /// error with double log names
-
-#define LF_STARDIV  "StarDivision"
-#define LF_UNIX     "UNIX"
-#define LF_MAC      "Macintosh"
-#define LF_OS2      "OS/2"
-
-// path conversion
-const char* GetDefStandList();
-const char* GetIniRoot();
-const char* GetIniRootOld();
-const char* GetSSolarIni();
-const char* GetSSCommon();
-const char* GetBServerRoot();
-
-const char* GetEnv( const char *pVar );
-const char* GetEnv( const char *pVar, const char *pDefault );
-
-#define CONVERT_R_TO_HOSTFSYS( sPath )  { sPath.ToLowerAscii().SearchAndReplace( "r:", GetEnv("ISERVERBASE", DEFAULT_INI_ROOT ) ); sPath.SearchAndReplaceAll( "\\", S_PATH_SEPARATOR ); }
-
-// Only for usage inside IServer!
-#define ISERVER_DEF_STAND_LIST  "r:\\b_server\\config\\stand.lst"
-#define ISERVER_DEF_DEPEND_LIST "r:\\b_server\\config\\depend.lst"
-
-#endif
diff --git a/soldep/inc/soldep/command.hxx b/soldep/inc/soldep/command.hxx
index 50781e1679a9..93c01616e593 100644
--- a/soldep/inc/soldep/command.hxx
+++ b/soldep/inc/soldep/command.hxx
@@ -57,9 +57,6 @@ enum ExeType
 #ifdef WNT
 #define COMMAND_SHELL   "4nt.exe"
 #endif
-#ifdef OS2
-#define COMMAND_SHELL  "4os2.exe"
-#endif
 #ifdef UNX
 #define COMMAND_SHELL   "csh"
 #endif
diff --git a/soldep/inc/soldep/connctr.hxx b/soldep/inc/soldep/connctr.hxx
deleted file mode 100644
index a7dd57d4a6e3..000000000000
--- a/soldep/inc/soldep/connctr.hxx
+++ /dev/null
@@ -1,84 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#ifndef _FMRWRK_CONNCTR_HXX
-#define _FMRWRK_CONNCTR_HXX
-
-
-#include <vcl/window.hxx>
-#include <soldep/listmacr.hxx>
-#include <tools/stream.hxx>
-
-class DepWin;
-class ObjectWin;
-
-static Rectangle aEmptyRect( Point( 0, 0), Point( 0, 0));
-
-class Connector
-{
-    ObjectWin *mpStartWin, *mpEndWin;
-    sal_uIntPtr mnStartId, mnEndId;
-    Point mStart, mEnd, mCenter;
-    DepWin* mpParent;
-
-    sal_Bool bVisible;
-    sal_Bool mbHideIndependend;
-    static sal_Bool msbHideMode;
-
-
-public:
-    double len;
-    Connector( DepWin* pParent, WinBits nWinStyle );
-    ~Connector();
-
-    void    Initialize( ObjectWin* pStartWin, ObjectWin* pEndWin, sal_Bool bVis = sal_False );
-    Point   GetMiddle();
-    void    Paint( const Rectangle& rRect );
-    void    UpdatePosition( ObjectWin* pWin, sal_Bool bPaint = sal_True );
-    sal_uInt16  Save( SvFileStream& rOutFile );
-    sal_uInt16  Load( SvFileStream& rInFile );
-    sal_uIntPtr GetStartId(){ return mnStartId; };
-    sal_uIntPtr GetEndId(){ return mnEndId; };
-    ObjectWin*  GetStartWin(){ return mpStartWin; };
-    ObjectWin*  GetEndWin(){ return mpEndWin; };
-    ObjectWin*  GetOtherWin( ObjectWin* pWin );
-    sal_uIntPtr GetOtherId( sal_uIntPtr nId );
-    sal_uIntPtr GetLen();
-    sal_Bool    IsStart( ObjectWin* pWin );
-    void    SetHideIndependend( sal_Bool bHide) { mbHideIndependend = bHide; };
-
-    sal_Bool    IsVisible() { return bVisible; }
-    void    SetVisibility( sal_Bool visible ) { bVisible = visible; }
-    void    UpdateVisibility();
-    void    SetHideMode(sal_Bool bHide) { msbHideMode = bHide; };
-    void    DrawOutput( OutputDevice* pDevice, const Point& rOffset  );
-};
-
-DECLARE_LIST( ConnectorList, Connector* )
-
-#endif
diff --git a/soldep/inc/soldep/depper.hxx b/soldep/inc/soldep/depper.hxx
deleted file mode 100644
index c160c68baffd..000000000000
--- a/soldep/inc/soldep/depper.hxx
+++ /dev/null
@@ -1,208 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _FMRWRK_DEPPER_HXX
-#define _FMRWRK_DEPPER_HXX
-
-#include <vcl/window.hxx>
-#include <vcl/wrkwin.hxx>
-#include <tools/resmgr.hxx>
-#include <soldep/objwin.hxx>
-#include <soldep/depwin.hxx>
-#include <soldep/graphwin.hxx>
-#include <soldep/tbox.hxx>
-#include <soldep/soldlg.hrc>
-#include <soldep/hashtbl.hxx>
-#include <soldep/hashobj.hxx>
-#include <soldep/soldlg.hxx>
-#include <soldep/prj.hxx>
-#include <soldep/sdtresid.hxx>
-
-DECLARE_HASHTABLE_OWNER(SolIdMapper,ByteString,MyHashObject*)
-
-// just for conversion - convert char* to String
-class ProgressBar;
-class FixedText;
-
-#define SOLDEPL_NAME "StarDepend V1.0"
-
-#define DEPPER_ID   4711
-
-//User Events
-#define VCLEVENT_USER_MOUSEBUTTON_DOWN      5000
-#define VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT  5001
-#define VCLEVENT_USER_MOUSEBUTTON_DOWN_CTRL 5002
-#define VCLEVENT_USER_MOUSEBUTTON_UP        5003
-#define VCLEVENT_USER_MOUSEBUTTON_UP_ALT    5004
-#define VCLEVENT_USER_MOUSEBUTTON_UP_CTRL   5005
-#define VCLEVENT_USER_MOUSEBUTTON_UP_SHFT   5006
-#define VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK 5007
-#define VCLEVENT_USER_TBOX_RESIZE           5008
-#define VCLEVENT_USER_TBOX_RESIZE_APP       5009
-#define VCLEVENT_USER_TBOX_FIND             5010
-#define VCLEVENT_USER_TBOX_HIDE_INDEPENDEND 5011
-#define VCLEVENT_USER_TBOX_SELECT_WORKSPACE 5012
-#define VCLEVENT_USER_TBOX_BACK             5013
-
-#define     OBJWIN_X_SPACING        50
-#define     OBJWIN_Y_SPACING        12
-#define     DEPPER_MAX_DEPTH        100
-#define     DEPPER_MAX_WIDTH        12
-#define     DEPPER_MAX_LEVEL_WIDTH      10 * DEPPER_MAX_WIDTH
-
-
-#define DEP_OK                      0
-#define DEP_OBJECT_NOT_FOUND        1
-#define DEP_STARTID_NOT_FOUND       2
-#define DEP_ENDID_NOT_FOUND         3
-#define DEP_CONNECTOR_NOT_FOUND     4
-#define DEP_ENDLES_RECURSION_FOUND  DEPPER_MAX_DEPTH + 1
-
-#define DEPPOPUP_NEW                                1
-#define DEPPOPUP_AUTOARRANGE                        2
-#define DEPPOPUP_LOAD                               3
-#define DEPPOPUP_SAVE                               4
-#define DEPPOPUP_WRITE_SOURCE                       5
-#define DEPPOPUP_READ_SOURCE                        6
-#define DEPPOPUP_OPEN_SOURCE                        7
-#define DEPPOPUP_ZOOMIN                             8
-#define DEPPOPUP_ZOOMOUT                            9
-#define DEPPOPUP_CLEAR                              10
-#define DEPPOPUP_CLOSE                              11
-#define DEPPOPUP_HELP                               12
-#define DEPPOPUP_SHOW_TOOLBOX                       13
-#define DEPPOPUP_TEST                               0xff
-
-struct depper_head
-{
-    sal_uIntPtr nID;
-    sal_uIntPtr nObjectCount;
-    sal_uIntPtr nCnctrCount;
-
-};
-
-enum DistType
-{
-    BOTTOMUP = 0,
-    TOPDOWN = 1,
-    BOTH = 2
-};
-
-
-class Depper : public SolDevDll, public Window
-{
-    sal_Bool    mbIsPrjView;
-    sal_uIntPtr mnMinDynXOffs;
-    Point   maDefPos;
-    Size    maDefSize;
-
-    long    nZoomed;
-
-    sal_uIntPtr mnViewMask;
-
-    ProgressBar*    pSubBar;
-    ProgressBar*    pMainBar;
-    FixedText*      pSubText;
-    FixedText*      pMainText;
-    SolAutoarrangeDlg maArrangeDlg;
-
-
-protected:
-    Prj*            mpPrj;
-    SolIdMapper*    mpSolIdMapper;
-    SolIdMapper*    mpPrjIdMapper;
-    StarWriter*     mpStarWriter;
-    StarWriter*     mpPrjStarWriter;        //for inside prj-view
-    sal_uIntPtr         mnSolWinCount;
-    sal_uIntPtr         mnSolLastId;
-    sal_uIntPtr         mnPrjWinCount;
-    sal_uIntPtr         mnPrjLastId;
-    ObjectList*         mpObjectList;           //Extended ObjWinList class
-    ObjectList*         mpObjectPrjList;        //for module internal dependencies
-    DepWin*             mpBaseWin;
-    DepWin*             mpBasePrjWin;           //for inside prj-view
-    GraphWin*           mpGraphWin;
-    GraphWin*           mpGraphPrjWin;          //for inside prj-view
-    Window*             mpProcessWin;
-    Window*             mpParentProcessWin;
-    ObjectWin*          ObjIdToPtr( ObjectList* pObjLst, sal_uIntPtr nId );
-    SoldepToolBox       maToolBox;
-    FloatingWindow      maTaskBarFrame; // For ToolBox
-
-    sal_uIntPtr       AddObjectToList(DepWin* pParentWin, ObjectList* pObjLst, sal_uIntPtr &LastID, sal_uIntPtr &WinCount, ByteString& rBodyText, sal_Bool bInteract=sal_True );
-    sal_uIntPtr       AddObjectToList( DepWin* pParentWin, ObjectList* pObjLst, sal_uIntPtr &LastID, sal_uIntPtr &WinCount, ByteString& rBodyText, Point& rPos, Size& rSize );
-    ObjectWin*  RemoveObjectFromList( ObjectList* pObjLst, sal_uIntPtr &WinCount, sal_uInt16 nId, sal_Bool bDelete );
-    sal_uInt16      AddConnectorToObjects( ObjectList* pObjLst, sal_uIntPtr nStartId, sal_uIntPtr nEndId );
-    sal_uInt16      RemoveConnectorFromObjects( ObjectList* pObjLst, sal_uIntPtr nStartId, sal_uIntPtr nEndId );
-    sal_uInt16      AddConnectorToObjects( ObjectWin* pStartWin, ObjectWin* pEndWin );
-    sal_uInt16      RemoveConnectorFromObjects( ObjectWin* pStartWin, ObjectWin* pEndWin );
-
-public:
-    Depper( Window* pBaseWindow );
-    ~Depper();
-    sal_Bool                TogglePrjViewStatus();
-    void                SetPrjViewStatus(sal_Bool state) { mbIsPrjView = state; }
-    sal_Bool                IsPrjView() { return mbIsPrjView; }
-    GraphWin*           GetGraphWin() { return (!mbIsPrjView) ? mpGraphWin : mpGraphPrjWin; }   //scrollbar window
-    DepWin*             GetDepWin() { return (!mbIsPrjView) ? mpBaseWin : mpBasePrjWin; }       //content of scrollbar window
-    ProgressBar*        GetMainProgressBar() { return pMainBar; }
-    void                SetMainProgressBar( sal_uInt16 i);
-    void                UpdateMainProgressBar(sal_uInt16 i, sal_uInt16 nScaleVal, sal_uInt16 &nStep, sal_Bool bCountingDown = sal_False);
-    void                UpdateSubProgrssBar(sal_uIntPtr i);
-    void                SetTitle( const String &rTitle ) { mpProcessWin->SetText( rTitle ); }
-    virtual void        RemoveAllObjects( ObjectList* ObjLst );
-    sal_uInt16              Save( const ByteString& rFileName );
-//  sal_uInt16              Load( const ByteString& rFileName );
-    virtual sal_uInt16      WriteSource();
-    virtual sal_uInt16      ReadSource( sal_Bool bUpdater );
-    virtual sal_uInt16      OpenSource();
-    void                SetDefPos( Point& rPos ) { maDefPos = rPos; };
-    Point&              GetDefPos() { return maDefPos; };
-    void                SetDefSize( Size& rSize ) { maDefSize = rSize; };
-    Size&               GetDefSize() { return maDefSize; };
-    virtual sal_uInt16      AutoArrangeDlgStart();
-    virtual sal_uInt16      AutoArrangeDlgStop();
-    virtual sal_uInt16      Zoom( MapMode& rMapMode );
-    virtual sal_Bool        ViewContent( ByteString& ) { return sal_False; };
-    virtual sal_uInt16      CloseWindow() { return 0; };
-    virtual void        ShowHelp(){};
-    ObjectList*         GetObjectList() { return (!mbIsPrjView) ? mpObjectList : mpObjectPrjList; }
-    sal_uIntPtr               HandleNewPrjDialog( ByteString &rBodyText );
-    sal_uIntPtr               HandleNewDirectoryDialog( ByteString &rBodyText );
-    void                HideObjectsAndConnections( ObjectList* pObjLst );
-    void                ShowObjectsAndConnections( ObjectList* pObjLst );
-    //virtual void        MouseButtonDown( const MouseEvent& rMEvt );
-//#ifdef DEBUG
-    virtual void        test(){};
-    DECL_LINK( PopupSelected, PopupMenu* );
-//#endif
-
-    //void SetViewMask( sal_uIntPtr nMask );
-    sal_uIntPtr GetViewMask() { return mnViewMask; }
-};
-
-#endif
diff --git a/soldep/inc/soldep/depwin.hxx b/soldep/inc/soldep/depwin.hxx
deleted file mode 100644
index 8e8d123ff73b..000000000000
--- a/soldep/inc/soldep/depwin.hxx
+++ /dev/null
@@ -1,75 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _FMRWRK_DEPWIN_HXX
-#define _FMRWRK_DEPWIN_HXX
-
-#ifndef _SV_WRKWIN_HXX
-#include <vcl/wrkwin.hxx>
-#endif
-#include <vcl/menu.hxx>
-#include <svtools/scrwin.hxx>
-#include <soldep/connctr.hxx>
-
-class Depper;
-
-class DepWin : public Window
-{
-private:
-    ConnectorList   ConList;
-
-    ObjectWin*      mpNewConWin;
-    sal_Bool            mbStartNewCon;
-    Point           maNewConStart;
-    Point           maNewConEnd;
-    ObjectWin*      mpSelectedProject;
-
-public:
-    PopupMenu*      mpPopup;
-//  Depper*         mpDepperDontuseme;
-
-                    DepWin( Window* pParent, WinBits nWinStyle );
-                    ~DepWin();
-    void            AddConnector( Connector* pNewCon );
-    void            RemoveConnector( Connector* piOldCon );
-    void            NewConnector( ObjectWin* pWin );
-    ConnectorList*  GetConnectorList();
-    void            ClearConnectorList() { ConList.Clear();}
-    void            Paint( const Rectangle& rRect );
-    void            MouseButtonUp( const MouseEvent& rMEvt );
-    virtual void    Command( const CommandEvent& rEvent);
-//  void            Resize();
-    void            MouseMove( const MouseEvent& rMEvt );
-    sal_Bool            IsStartNewCon() { return mbStartNewCon; };
-    void            SetPopupHdl( void* pHdl );
-    void            SetSelectedProject( ObjectWin* object ) { mpSelectedProject = object; };
-    ObjectWin*      GetSelectedProject() { return mpSelectedProject; };
-//  DECL_LINK( PopupSelected, PopupMenu* );
-    void    DrawOutput( OutputDevice* pDevice, const Point& rOffset  );
-};
-
-#endif
diff --git a/soldep/inc/soldep/graphwin.hxx b/soldep/inc/soldep/graphwin.hxx
deleted file mode 100644
index e0152d6e34f7..000000000000
--- a/soldep/inc/soldep/graphwin.hxx
+++ /dev/null
@@ -1,54 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _FMRWRK_GRAPHWIN_HXX
-#define _FMRWRK_GRAPHWIN_HXX
-
-#include <svtools/scrwin.hxx>
-
-class GraphWin : public ScrollableWindow
-{
-private:
-    void* mpClass;
-
-protected:
-    Window aBufferWindow;
-
-public:
-    GraphWin( Window * pParent, void * pClass );
-            void CalcSize();
-    virtual void EndScroll( long nDeltaX, long nDeltaY );
-    virtual void Resize();
-    virtual void Command( const CommandEvent& rEvent);
-    Window* GetBufferWindow(){ return &aBufferWindow; };
-};
-
-#define PIXELS( nLeft, nTop, nWidth, nHeight )\
-    LogicToPixel( Point( nLeft, nTop ) ), LogicToPixel( Size( nWidth, nHeight ) )
-
-#endif //  _FMRWRK_GRAPHWIN_HXX
-
diff --git a/soldep/inc/soldep/hashtbl.hxx b/soldep/inc/soldep/hashtbl.hxx
deleted file mode 100644
index e955696588b9..000000000000
--- a/soldep/inc/soldep/hashtbl.hxx
+++ /dev/null
@@ -1,204 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _HASHTBL_HXX
-#define _HASHTBL_HXX
-
-#include <tools/gen.hxx>
-#include <tools/string.hxx>
-
-// ADT hash table
-//
-// Invariante:
-//    1. m_lElem < m_lSize
-//    2. die Elemente in m_Array wurden double-hashed erzeugt
-//
-class HashItem;
-
-class HashTable
-{
-    sal_uIntPtr     m_lSize;
-    sal_uIntPtr     m_lElem;
-    HashItem *m_pData;
-    double    m_dMaxLoadFactor;
-    double    m_dGrowFactor;
-    sal_Bool      m_bOwner;
-
-    sal_uIntPtr Hash(ByteString const& Key) const;
-    sal_uIntPtr DHash(ByteString const& Key, sal_uIntPtr lHash) const;
-    sal_uIntPtr Probe(sal_uIntPtr lPos) const;
-
-    HashItem* FindPos(ByteString const& Key) const;
-    void      SmartGrow();
-    double    CalcLoadFactor() const;
-
-// Statistik
-#ifdef DBG_UTIL
-private:
-    struct
-    {
-        sal_uIntPtr m_lSingleHash;
-        sal_uIntPtr m_lDoubleHash;
-        sal_uIntPtr m_lProbe;
-    }
-        m_aStatistic;
-#endif
-
-protected:
-    friend class HashTableIterator;
-
-    virtual void OnDeleteObject(void* pObject);
-
-    void* GetObjectAt(sal_uIntPtr lPos) const;
-
-// Default-Werte
-public:
-    static double m_defMaxLoadFactor;
-    static double m_defDefGrowFactor;
-
-public:
-    HashTable
-    (
-        sal_uIntPtr lSize,
-        sal_Bool    bOwner,
-        double  dMaxLoadFactor = HashTable::m_defMaxLoadFactor /* 0.8 */,
-        double  dGrowFactor = HashTable::m_defDefGrowFactor /* 2.0 */
-    );
-
-    virtual ~HashTable();
-
-    sal_Bool  IsFull() const;
-    sal_uIntPtr GetSize() const { return m_lSize; }
-
-    void* Find   (ByteString const& Key) const;
-    sal_Bool  Insert (ByteString const& Key, void* pObject);
-    void* Delete (ByteString const& Key);
-};
-
-// ADT hash table iterator
-//
-// Invariante: 0 <= m_lAt < m_aTable.GetCount()
-//
-class HashTableIterator
-{
-    sal_uIntPtr          m_lAt;
-    HashTable const& m_aTable;
-
-    void* FindValidObject(sal_Bool bForward);
-
-protected:
-    void* GetFirst(); // Interation _ohne_ Sortierung
-    void* GetNext();
-    void* GetLast();
-    void* GetPrev();
-
-public:
-    HashTableIterator(HashTable const&);
-};
-
-// typsichere Makros ---------------------------------------------------
-
-#define DECLARE_HASHTABLE_INTERN(ClassName,Owner,KeyType,ObjType)       \
-    class ClassName : public HashTable                                  \
-    {                                                                   \
-    public:                                                             \
-        ClassName                                                       \
-        (                                                               \
-            sal_uIntPtr lSize,                                              \
-            double  dMaxLoadFactor = HashTable::m_defMaxLoadFactor,     \
-            double  dGrowFactor = HashTable::m_defDefGrowFactor         \
-        )                                                               \
-        : HashTable(lSize,Owner,dMaxLoadFactor,dGrowFactor) {}          \
-                                                                        \
-        ObjType  Find (KeyType const& Key) const                        \
-        { return (ObjType) HashTable::Find(ByteString(Key)); }              \
-                                                                        \
-        using HashTable::Insert;                                        \
-        sal_Bool Insert (KeyType const& Key, ObjType Object)                \
-        { return HashTable::Insert(ByteString(Key), (void*) Object); }      \
-                                                                        \
-        ObjType  Delete (KeyType const&Key)                             \
-        { return (ObjType) HashTable::Delete (ByteString(Key)); }           \
-    };
-
-// HashTable OHNE Owner-Verhalten
-#define DECLARE_HASHTABLE(ClassName,KeyType,ObjType)                 \
-    DECLARE_HASHTABLE_INTERN(ClassName,sal_False,KeyType,ObjType)
-
-// HashTable MIT Owner-Verhalten
-#define DECLARE_HASHTABLE_OWNER(ClassName,KeyType,ObjType)           \
-    DECLARE_HASHTABLE_INTERN(ClassName##2,sal_True,KeyType,ObjType)      \
-    class ClassName : public ClassName##2                            \
-    {                                                                \
-    protected:                                                       \
-        virtual void OnDeleteObject(void* pObject);                  \
-    public:                                                          \
-        ClassName                                                    \
-        (                                                            \
-            sal_uIntPtr lSize,                                           \
-            double  dMaxLoadFactor = HashTable::m_defMaxLoadFactor,  \
-            double  dGrowFactor = HashTable::m_defDefGrowFactor      \
-        )                                                            \
-        : ClassName##2(lSize,dMaxLoadFactor,dGrowFactor) {}          \
-        ~ClassName();                                                \
-    };
-
-#define IMPLEMENT_HASHTABLE_OWNER(ClassName,KeyType,ObjType)         \
-    void ClassName::OnDeleteObject(void* pObject)                    \
-    { delete (ObjType) pObject; }                                    \
-                                                                     \
-    ClassName::~ClassName()                                          \
-    {                                                                \
-        for (sal_uIntPtr i=0; i<GetSize(); i++)                            \
-        {                                                            \
-            void *pObject = GetObjectAt(i);                          \
-            if (pObject != NULL)                                     \
-                OnDeleteObject(pObject);                             \
-        }                                                            \
-    }
-
-// Iterator-Makros --------------------------------------------------
-
-#define DECLARE_HASHTABLE_ITERATOR(ClassName,ObjType)               \
-    class ClassName : public HashTableIterator                      \
-    {                                                               \
-    public:                                                         \
-        ClassName(HashTable const& aTable)                          \
-        : HashTableIterator(aTable) {}                              \
-                                                                    \
-        ObjType GetFirst()                                          \
-            { return (ObjType)HashTableIterator::GetFirst(); }      \
-        ObjType GetNext()                                           \
-            { return (ObjType)HashTableIterator::GetNext();  }      \
-        ObjType GetLast()                                           \
-            { return (ObjType)HashTableIterator::GetLast();  }      \
-        ObjType GetPrev()                                           \
-            { return (ObjType)HashTableIterator::GetPrev();  }      \
-    };
-
-
-#endif // _HASHTBL_HXX
diff --git a/soldep/inc/soldep/listmacr.hxx b/soldep/inc/soldep/listmacr.hxx
deleted file mode 100644
index a27f51cfdd4c..000000000000
--- a/soldep/inc/soldep/listmacr.hxx
+++ /dev/null
@@ -1,60 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _LISTMACR_HXX
-#define _LISTMACR_HXX
-
-#define DECL_DEST_LIST( TmpListType, ListType, PointerType )    \
-DECLARE_LIST(TmpListType, PointerType)                          \
-class ListType : public TmpListType                             \
-{                                                               \
-public:                                                         \
-    void ClearAndDelete()                                       \
-    {                                                           \
-        while ( Count()) {                                      \
-            PointerType pTmp = GetObject(( sal_uIntPtr ) 0 );       \
-            delete pTmp;                                        \
-            Remove(( sal_uIntPtr ) 0 );                             \
-        }                                                       \
-    }                                                           \
-    ~ListType()                                                 \
-    {                                                           \
-        ClearAndDelete();                                       \
-    }                                                           \
-};                                                              \
-
-#endif
-
-
-
-
-
-
-
-
-
-
diff --git a/soldep/inc/soldep/objwin.hxx b/soldep/inc/soldep/objwin.hxx
deleted file mode 100644
index 20156cd74a3a..000000000000
--- a/soldep/inc/soldep/objwin.hxx
+++ /dev/null
@@ -1,160 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _FMRWRK_OBJWIN_HXX
-#define _FMRWRK_OBJWIN_HXX
-
-#ifndef _SV_WINDOW_HXX
-#include <vcl/window.hxx>
-#endif
-#include <vcl/menu.hxx>
-#include <vcl/timer.hxx>
-#include <soldep/listmacr.hxx>
-#include <tools/stream.hxx>
-
-#include <soldep/connctr.hxx>
-
-#define OBJWIN_EDIT_TEXT        1
-#define OBJWIN_ADD_CONNECTOR    2
-#define OBJWIN_REMOVE_WIN       3
-#define OBJWIN_VIEW_CONTENT     4
-
-#define MARKMODE_DEFAULT        0
-#define MARKMODE_DEPENDING      1
-#define MARKMODE_NEEDED         2
-#define MARKMODE_ACTIVATED      4
-#define MARKMODE_SELECTED       8
-
-class Depper;
-class Connector;
-class ObjectWin;
-
-class ObjectWin : public Window
-{
-    Point       maMouseOffset;
-    Point       maCalcPos;
-    ByteString      msBodyText;
-    ByteString      msTipText;
-    sal_uIntPtr     mnObjectId;
-    PopupMenu*  mpPopup;
-    sal_uInt16      mnPopupStaticItems;
-    Wallpaper   maObjWallpaper;
-    ConnectorList   mConnections;
-    sal_uIntPtr     mnMarkMode;
-    sal_uIntPtr         mnViewMask;
-    sal_Bool        mbVisible;
-    sal_Bool        mbMenuExecute;
-    static sal_Bool msbHideMode;
-    static sal_uIntPtr msnGlobalViewMask;   //will be set by SolDep
-
-public:
-    sal_Bool        mbVisited;
-//  double x, y;
-
-    sal_uInt16 mnRootDist;
-    sal_uInt16 mnHeadDist;
-    sal_Bool mbFixed;
-    //Depper*       mpDepperDontuseme;
-    Timer   aTipTimer;
-
-                    ObjectWin( Window* pParent, WinBits nWinStyle );
-                    ~ObjectWin();
-        void            SetHideMode(sal_Bool bHide);
-        sal_Bool            ToggleHideMode();
-        sal_Bool            IsHideMode() { return msbHideMode; };
-        sal_Bool            IsNullObject() { return (msBodyText == "null"); };
-        void            SetGlobalViewMask(sal_uIntPtr gvm) { msnGlobalViewMask = gvm; };
-        void            SetBodyText( const ByteString& rNewText );
-        ByteString&         GetBodyText();
-        sal_uIntPtr           GetIdByName( const ByteString& rText );
-        void            SetTipText( const ByteString& rNewText );
-        ByteString&         GetTipText();
-        Point           GetFixPoint( const Point& rRefPoint, sal_Bool bUseRealPos = sal_True );
-
-        void            SetCalcPosPixel( const Point& rNewPos ){ maCalcPos = rNewPos; };
-        Point           GetCalcPosPixel() const { return maCalcPos; }
-
-        void            AddConnector( Connector* pNewCon );
-        void            RemoveConnector( Connector* pOldCon );
-        Connector*      GetConnector( sal_uIntPtr nIndex );
-        Connector*      GetConnector( sal_uIntPtr nStartId, sal_uIntPtr nEndId );
-        virtual void    SetMarkMode( sal_uIntPtr nMarkMode = 0 );
-        virtual void    UnsetMarkMode( sal_uIntPtr nMarkMode );
-        sal_uIntPtr         GetMarkMode(){ return mnMarkMode; };
-        Wallpaper       GetActualWallpaper() { return maObjWallpaper;};
-        void            SetActualWallpaper(const Wallpaper& aWp) { maObjWallpaper = aWp;};
-        void            MarkNeeded( sal_Bool bReset = sal_False );
-        void            MarkDepending( sal_Bool bReset = sal_False );
-        void            Paint( const Rectangle& rRecct );
-        void            MouseButtonDown( const MouseEvent& rMEvt );
-        void            MouseButtonUp( const MouseEvent& rMEvt );
-        void            MouseMove( const MouseEvent& rMEvt );
-//      void            DoubleClick();
-        sal_uInt16          Save( SvFileStream& rOutFile );
-        sal_uInt16          Load( SvFileStream& rInFile );
-        void            SetId( sal_uIntPtr nId );
-        sal_uIntPtr         GetId();
-        void            UpdateConnectors();
-        void            SetAllConnectorsUnvisible();
-        virtual void    Command( const CommandEvent& rEvent);
-
-        void SetViewMask( sal_uIntPtr nMask );
-        sal_uIntPtr GetViewMask() { return mnViewMask; }
-        using Window::IsVisible;
-        sal_Bool IsVisible() { return mbVisible; }
-
-        DECL_LINK( PopupSelected, PopupMenu * );
-        DECL_LINK( PopupDeactivated, PopupMenu * );
-        DECL_LINK( TipHdl, void * );
-
-        //virtual void GetFocus();
-        virtual void LoseFocus();
-
-        sal_Bool            ConnectionExistsInAnyDirection( ObjectWin *pWin );
-        void    DrawOutput( OutputDevice* pDevice, const Point& rOffset  );
-        sal_Bool    IsTop();
-};
-
-DECL_DEST_LIST( TmpObjWinList, ObjWinList, ObjectWin* )
-
-//Extend ObjWinList
-class ObjectList : public ObjWinList
-{
-private:
-    ObjectWin* pSelectedObjectWin;
-protected:
-    sal_Bool       mbHideMode;
-public:
-               ObjectList();
-               ~ObjectList() {};
-    void       ResetSelectedObject();
-    ObjectWin* GetPtrByName( const ByteString& rText );
-    ObjectList* FindTopLevelModules();
-};
-
-#endif
-
diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx
deleted file mode 100644
index 766a89d72237..000000000000
--- a/soldep/inc/soldep/prj.hxx
+++ /dev/null
@@ -1,480 +0,0 @@
- /*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _PRJ_HXX
-#define _PRJ_HXX
-
-#include <tools/fsys.hxx>
-#include <tools/stream.hxx>
-#include <soldep/listmacr.hxx>
-#include <vos/mutex.hxx>
-#include <tools/string.hxx>
-
-#define XML_EXT "xlist"
-
-#define OS_NONE             0x0000
-#define OS_WIN16            0x0001
-#define OS_WIN32            0x0002
-#define OS_OS2              0x0004
-#define OS_UNX              0x0008
-#define OS_MAC              0x0010
-#define OS_ALL              ( OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX | OS_MAC )
-
-#define COMMAND_PROJECTROOT 0x0000
-#define COMMAND_NMAKE       0x0001
-#define COMMAND_GET         0x0002
-#define COMMAND_USER_START  0x0003
-#define COMMAND_USER_END    0xFFFE
-#define COMMAND_ALLDIRS     0xFFFF
-
-class SByteStringList;
-class GenericInformationList;
-
-/*
-// Pfade auf Konfigurationsdateien des Build-Servers
-
-#define REQUEST_DIR         \\src\data4\source\b_server\server\newjob
-*/
-/*********************************************************************
-*
-*   Die Klasse CommandData haelte alle Informationen, die fuer die
-*   Abarbeitung eines Kommandos (nmake, get) noetig sind
-*
-*********************************************************************/
-
-class CommandData
-{
-    ByteString      aPrj;
-    ByteString      aLogFileName;
-    ByteString      aInpath;
-    ByteString      aUpd;
-    ByteString      aUpdMinor;
-    ByteString      aProduct;
-    ByteString      aCommand;
-    ByteString      aPath;
-    ByteString      aPrePath;
-    ByteString      aPreFix;
-    ByteString      aCommandPara;
-    ByteString      aComment;
-    ByteString      sClientRestriction;
-    SByteStringList *pDepList;
-    SByteStringList *pCommandList;
-    sal_uInt16      nOSType;
-    sal_uInt16      nCommand;
-
-    sal_uIntPtr     nDepth;             // Tiefe der Abhaenigkeit
-
-public:
-                CommandData();
-                ~CommandData();
-    ByteString      GetProjectName(){return aPrj;}
-    void        SetProjectName( ByteString aName ){aPrj = aName;}
-    ByteString      GetLogFile(){return aLogFileName;}
-    void        SetLogFile( ByteString aName ){aLogFileName = aName;}
-    ByteString      GetInpath(){return aInpath;}
-    void        SetInpath( ByteString aName ){aInpath = aName;}
-    ByteString      GetUpd(){return aUpd;}
-    void        SetUpd( ByteString aName ){aUpd = aName;}
-    ByteString      GetUpdMinor(){return aUpdMinor;}
-    void        SetUpdMinor( ByteString aName ){aUpdMinor = aName;}
-    ByteString      GetProduct(){return aProduct;}
-    void        SetProduct( ByteString aName ){aProduct = aName;}
-    ByteString      GetCommand(){return aCommand;}
-    void        SetCommand ( ByteString aName ){aCommand = aName;}
-    ByteString      GetCommandPara(){return aCommandPara;}
-    void        SetCommandPara ( ByteString aName ){aCommandPara = aName;}
-    ByteString      GetComment(){return aComment;}
-    void        SetComment ( ByteString aCommentString ){aComment = aCommentString;}
-    ByteString      GetPath(){return aPath;}
-    void        SetPath( ByteString aName ){aPath = aName;}
-    ByteString      GetPrePath(){return aPrePath;}
-    void        SetPrePath( ByteString aName ){aPrePath = aName;}
-    sal_uInt16      GetOSType(){return nOSType;}
-    ByteString      GetOSTypeString();
-    void        SetOSType( sal_uInt16 nType ){nOSType = nType;}
-    sal_uInt16      GetCommandType(){return nCommand;}
-    ByteString      GetCommandTypeString();
-    void        SetCommandType( sal_uInt16 nCommandType ){nCommand = nCommandType;}
-    SByteStringList* GetDependencies(){return pDepList;}
-    void        SetDependencies( SByteStringList *pList ){pDepList = pList;}
-    ByteString      GetClientRestriction() { return sClientRestriction; }
-    void        SetClientRestriction( ByteString sRestriction ) { sClientRestriction = sRestriction; }
-
-    void        AddDepth(){nDepth++;}
-    sal_uIntPtr     GetDepth(){return nDepth;}
-
-    void AddCommand(ByteString* pCommand);
-    SByteStringList* GetCommandList() {return pCommandList;}
-
-    CommandData& operator<<  ( SvStream& rStream );
-    CommandData& operator>>  ( SvStream& rStream );
-};
-
-/*********************************************************************
-*
-*   Die Klasse SimpleConfig kann benutzt werden, um aus einer Textdatei
-*   alle Tokens zu lesen
-*
-*********************************************************************/
-
-class SimpleConfig
-{
-    long            nLine;
-    String          aFileName;
-    SvFileStream    aFileStream;
-    ByteString          aTmpStr;
-    ByteString          aStringBuffer;
-
-    ByteString          GetNextLine();
-public:
-                    SimpleConfig(String aSimpleConfigFileName);
-                    SimpleConfig(DirEntry& rDirEntry);
-                    ~SimpleConfig();
-    ByteString          GetNext();
-    ByteString          GetCleanedNextLine( sal_Bool bReadComments = sal_False );
-};
-
-#define ENV_GUI     0x00000000
-#define ENV_OS      0x00000001
-#define ENV_UPD     0x00000002
-#define ENV_UPDMIN  0x00000004
-#define ENV_INPATH  0x00000008
-#define ENV_OUTPATH 0x00000010
-#define ENV_GUIBASE 0x00000020
-#define ENV_CVER    0x00000040
-#define ENV_GVER    0x00000080
-#define ENV_GUIENV  0x00000100
-#define ENV_CPU     0x00000200
-#define ENV_CPUNAME 0x00000400
-#define ENV_DLLSUFF 0x00000800
-#define ENV_COMEX   0x00001000
-#define ENV_COMPATH 0x00002000
-#define ENV_INCLUDE 0x00004000
-#define ENV_LIB     0x00008000
-#define ENV_PATH    0x00010000
-#define ENV_SOLVER  0x00020000
-#define ENV_SOLENV  0x00040000
-#define ENV_SOLROOT 0x00080000
-#define ENV_DEVROOT 0x00100000
-#define ENV_EMERG   0x00200000
-#define ENV_STAND   0x00400000
-
-DECL_DEST_LIST ( PrjList_tmp, PrjList, CommandData * )
-
-/*********************************************************************
-*
-*   class DepInfo
-*   Struct mit Modeinfos
-*
-*********************************************************************/
-
-class DepInfo
-{
-    private:
-        ByteString*         pProject;
-        SByteStringList*    pModeList;
-        sal_Bool                bAllModes;
-
-        void                RemoveProject ();
-        void                RemoveModeList ();
-    public:
-                            DepInfo() : pProject(0), pModeList(0), bAllModes(sal_False) {}
-                            DepInfo(ByteString* pString) : pProject(0), pModeList(0), bAllModes(sal_False) {pProject = pString;}
-                            DepInfo(ByteString* pString, SByteStringList* pList) : pProject(0), pModeList(0), bAllModes(sal_False) {pProject = pString; pModeList = pList;}
-                            ~DepInfo();
-
-        void                SetProject (ByteString* pStr);
-        ByteString*         GetProject() {return pProject;}
-        void                PutModeString (ByteString* pStr);
-        SByteStringList*    GetModeList() {return pModeList;}
-        void                SetModeList (SByteStringList* pList) {pModeList = pList;}
-        sal_Bool                IsAllModes() {return bAllModes;}
-        void                SetAllModes(sal_Bool bModes=sal_True) {bAllModes = bModes;}
-
-        DepInfo&            operator<<  ( SvStream& rStream );
-        DepInfo&            operator>>  ( SvStream& rStream );
-};
-
-DECLARE_LIST( DepInfoList, DepInfo* )
-
-/*********************************************************************
-*
-*   class SDepInfoList
-*   Struct mit Modeinfos + Listen Methoden
-*
-*********************************************************************/
-
-class SDepInfoList : public DepInfoList
-{
-    SByteStringList*    pAllModeList; // only pointer to strings
-
-    public:
-                SDepInfoList();
-                ~SDepInfoList();
-
-                // neuen ByteString in Liste einfuegen
-    sal_uIntPtr     PutString( ByteString*, ByteString*);
-    sal_uIntPtr     PutString( ByteString*);
-    void        PutModeString( DepInfo* pInfoList, ByteString* pStr );
-
-    ByteString*     RemoveString( const ByteString& rName );
-
-                // Position des ByteString in Liste, wenn nicht enthalten, dann
-                // return = NOT_THERE
-    sal_uIntPtr     IsString( ByteString* );
-
-                // Vorgaenger ermitteln ( auch wenn selbst noch nicht in
-                // Liste enthalten
-    sal_uIntPtr     GetPrevString( ByteString* );
-    SByteStringList*    GetAllDepModes();
-
-    SDepInfoList& operator<< ( SvStream& rStream );
-    SDepInfoList& operator>> ( SvStream& rStream );
-};
-
-
-/*********************************************************************
-*
-*   class Prj
-*   alle Daten eines Projektes werden hier gehalten
-*
-*********************************************************************/
-
-class Star;
-class Prj : public PrjList
-{
-friend class Star;
-private:
-
-    ByteString          aPrjPath;
-    ByteString          aProjectName;
-    ByteString          aProjectPrefix;     // max. 2-buchstabige Abk.
-    SByteStringList*    pPrjInitialDepList;
-    SByteStringList*    pPrjDepList;
-    SDepInfoList*       pPrjDepInfoList;
-    sal_Bool            bSorted;
-    sal_Bool            bHardDependencies;
-    sal_Bool            bFixedDependencies;
-    sal_Bool            bVisited;
-    sal_Bool            bIsAvailable;
-    SByteStringList* RemoveStringList(SByteStringList* pStringList );
-    SDepInfoList*   RemoveDepInfoList(SDepInfoList* pInfoList );
-    PrjList*        pTempCommandDataList;
-    sal_Bool            bTempCommandDataListPermanent;
-    sal_Bool            bError;
-public:
-                    Prj();
-                    Prj( ByteString aName );
-                    ~Prj();
-    void            SetPreFix( ByteString aPre ){aProjectPrefix = aPre;}
-    ByteString          GetPreFix(){return aProjectPrefix;}
-    ByteString          GetProjectName()
-                            {return aProjectName;}
-    void            SetProjectName(ByteString aName)
-                            {aProjectName = aName;}
-    sal_Bool            InsertDirectory( ByteString aDirName , sal_uInt16 aWhat,
-                                    sal_uInt16 aWhatOS, ByteString aLogFileName,
-                                    const ByteString &rClientRestriction );
-    CommandData*    RemoveDirectory( ByteString aLogFileName );
-    CommandData*    GetDirectoryList ( sal_uInt16 nWhatOs, sal_uInt16 nCommand );
-    CommandData*    GetDirectoryData( ByteString aLogFileName );
-    inline CommandData* GetData( ByteString aLogFileName )
-                            { return GetDirectoryData( aLogFileName ); };
-
-    SByteStringList*    GetDependencies( sal_Bool bExpanded = sal_True );
-    SDepInfoList*   GetModeAndDependencies() {return pPrjDepInfoList;}
-    void            AddDependencies( ByteString aStr );
-    void            AddDependencies( ByteString aStr, ByteString aModeStr );
-    void            SetMode(SByteStringList* pModeList);
-    void            HasHardDependencies( sal_Bool bHard ) { bHardDependencies = bHard; }
-    sal_Bool            HasHardDependencies() { return bHardDependencies; }
-    void            HasFixedDependencies( sal_Bool bFixed ) { bFixedDependencies = bFixed; }
-    sal_Bool            HasFixedDependencies() { return bFixedDependencies; }
-
-    sal_Bool            IsAvailable() { return bIsAvailable; }
-    void            IsAvailable( sal_Bool bAvailable ) { bIsAvailable=bAvailable; }
-
-    void            ExtractDependencies();
-
-    PrjList*        GetCommandDataList ();
-    void            RemoveTempCommandDataList();
-    void            GenerateTempCommandDataList();
-    void            GenerateEmptyTempCommandDataList();
-    sal_Bool            HasTempCommandDataList() {return pTempCommandDataList != NULL;}
-    void            SetTempCommandDataListPermanent (sal_Bool bVar = sal_True) {bTempCommandDataListPermanent = bVar;}
-    sal_Bool            IsTempCommandDataListPermanent() {return bTempCommandDataListPermanent;}
-
-    void            SetError (sal_Bool bVar = sal_True) {bError = bVar;}
-    sal_Bool            HasError () {return bError;}
-
-    Prj&            operator<<  ( SvStream& rStream );
-    Prj&            operator>>  ( SvStream& rStream );
-};
-
-/*********************************************************************
-*
-*   class Star
-*   Diese Klasse liest die Projectstruktur aller StarDivision Projekte
-*   aus \\dev\data1\upenv\data\config\solar.lst aus
-*
-*********************************************************************/
-
-DECL_DEST_LIST ( StarList_tmp, StarList, Prj* )
-DECLARE_LIST ( SolarFileList, String* )
-
-class StarFile
-{
-private:
-    String aFileName;
-    Date aDate;
-    Time aTime;
-    Date aDateCreated;
-    Time aTimeCreated;
-
-    sal_Bool bExists;
-
-public:
-    StarFile( const String &rFile );
-    const String &GetName() { return aFileName; }
-    Date GetDate() { return aDate; }
-    Time GetTime() { return aTime; }
-
-    sal_Bool NeedsUpdate();
-    sal_Bool Exists() { return bExists; }
-};
-
-DECLARE_LIST( StarFileList, StarFile * )
-
-#define STAR_MODE_SINGLE_PARSE          0x0000
-//#define STAR_MODE_RECURSIVE_PARSE     0x0001      it dosen't work anymore
-#define STAR_MODE_MULTIPLE_PARSE        0x0002
-
-class Star : public StarList
-{
-private:
-    Link aDBNotFoundHdl;
-    ByteString      aStarName; // no idee what this should be
-
-protected:
-    vos:: OMutex  aMutex;
-
-    sal_uInt16          nStarMode;
-    SolarFileList   aFileList;
-    StarFileList    aLoadedFilesList;
-    String          sSourceRoot;
-    String          sFileName;
-    SByteStringList* pDepMode;
-    SByteStringList* pAllDepMode;
-
-    Link aFileIOErrorHdl; // called with &String as parameter!!!
-
-    void InsertSolarList( String sProject );
-    String CreateFileName( String& rProject, String& rSourceRoot );
-
-    void            Expand_Impl();
-    void            ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj );
-    sal_uIntPtr         SearchFileEntry( StarFileList *pStarFiles, StarFile* pFile );
-    void            InsertTokenLine (const ByteString& rToken, Prj** ppPrj, const ByteString& rProjectName, const sal_Bool bExtendAlias = sal_True);
-
-public:
-                    Star();
-                    Star( String aFileName, sal_uInt16 nMode = STAR_MODE_SINGLE_PARSE );
-                    Star( SolarFileList *pSolarFiles );
-                    Star( GenericInformationList *pStandLst, ByteString &rVersion );
-
-                    ~Star();
-
-    void            SetDBNotFoundHdl( const Link &rLink ) { aDBNotFoundHdl = rLink; }
-    void            SetFileIOErrorHdl( const Link &rLink ) { aFileIOErrorHdl = rLink; }
-
-    ByteString      GetName(){ return aStarName; }; // dummy function of VG
-    void            Read( String &rFileName );
-    void            Read( SolarFileList *pSOlarFiles );
-//  void            ReadXmlBuildList(const ByteString& sBuildLstPath);
-
-
-    sal_Bool            HasProject( ByteString aProjectName );
-    Prj*            GetPrj( ByteString aProjectName );
-    ByteString          GetPrjName( DirEntry &rPath );
-    sal_Bool            RemovePrj ( Prj* pPrj );
-    void            RemoveAllPrj ();
-
-    StarFile*       ReadBuildlist (const String& rFilename, sal_Bool bReadComments = sal_False, sal_Bool bExtendAlias = sal_True);
-    sal_Bool            NeedsUpdate();
-    SolarFileList*  NeedsFilesForUpdate();
-    void            ReplaceFileEntry( StarFileList *pStarFiles, StarFile* pFile );
-    void            UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersion, sal_Bool bRead = sal_False );
-    void            FullReload( GenericInformationList *pStandLst, ByteString &rVersion, sal_Bool bRead = sal_False );
-    void            GenerateFileLoadList( SolarFileList *pSolarFiles );
-    sal_Bool            CheckFileLoadList(SolarFileList *pSolarFiles);
-
-    sal_uInt16          GetMode() { return nStarMode; }
-    String          GetFileName(){ return sFileName; };
-    String          GetSourceRoot(){ return sSourceRoot; };
-    SByteStringList* GetAvailableDeps ();
-    void            ClearAvailableDeps ();
-    SByteStringList* GetCurrentDeps () {return pDepMode;}
-    void            SetCurrentDeps (SByteStringList* pDepList);
-    void            ClearCurrentDeps ();
-
-    int             GetOSType ( ByteString& aWhatOS );
-    int             GetJobType ( ByteString& JobType );
-
-    void            ClearLoadedFilesList ();
-
-    void            PutPrjIntoStream (SByteStringList* pPrjNameList, SvStream* pStream);
-    Star&           operator<<  ( SvStream& rStream );
-    Star&           operator>>  ( SvStream& rStream );
-};
-
-class StarWriter : public Star
-{
-private:
-    sal_uInt16          WritePrj( Prj *pPrj, SvFileStream& rStream );
-
-public:
-                    StarWriter( String aFileName, sal_Bool bReadComments = sal_False, sal_uInt16 nMode = STAR_MODE_SINGLE_PARSE );
-                    StarWriter( SolarFileList *pSolarFiles, sal_Bool bReadComments = sal_False );
-                    StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, ByteString &rMinor,
-                        sal_Bool bReadComments = sal_False );
-
-    void            CleanUp();
-
-    sal_Bool            InsertProject ( Prj* pNewPrj );
-    Prj*            RemoveProject ( ByteString aProjectName );
-
-    sal_uInt16          Read( String aFileName, sal_Bool bReadComments = sal_False, sal_uInt16 nMode = STAR_MODE_SINGLE_PARSE  );
-       sal_uInt16           Read( SolarFileList *pSolarFiles, sal_Bool bReadComments = sal_False );
-    sal_uInt16          Write( String aFileName );
-    sal_uInt16          WriteMultiple( String rSourceRoot );
-
-    void            InsertTokenLine ( const ByteString& rTokenLine );
-};
-
-#endif
-
-
diff --git a/soldep/inc/soldep/sdtresid.hxx b/soldep/inc/soldep/sdtresid.hxx
deleted file mode 100644
index 2fcf49d70c5e..000000000000
--- a/soldep/inc/soldep/sdtresid.hxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SOLDEV_RESID_HXX_
-#define _SOLDEV_RESID_HXX_
-#include <tools/resmgr.hxx>
-#include <tools/shl.hxx>
-#include <vcl/svapp.hxx>
-
-
-class SolDevDll
-{
-    ResMgr*             pResMgr;
-public:
-                        SolDevDll();
-                        ~SolDevDll();
-
-    ResMgr*             GetResMgr() { return pResMgr; }
-};
-
-class DtSodResId : public ResId
-{
-public:
-    DtSodResId(sal_uInt16 nId);
-};
-
-#endif
-
diff --git a/soldep/inc/soldep/soldep.hxx b/soldep/inc/soldep/soldep.hxx
deleted file mode 100644
index dccaa204e7de..000000000000
--- a/soldep/inc/soldep/soldep.hxx
+++ /dev/null
@@ -1,116 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _FMRWRK_SOLDEP_HXX
-#define _FMRWRK_SOLDEP_HXX
-
-#define SOURCEROOT "SOLARSRC"
-
-#include <tools/string.hxx>
-
-#include <soldep/depper.hxx>
-
-#define SOURCEROOT "SOLARSRC"
-
-class ObjectWin;
-
-class SolDep : public Depper
-{
-    sal_Bool            mbBServer;          //call from build server
-    sal_uIntPtr         mnMinDynXOffs;
-    sal_uIntPtr         mnLevelOffset;
-    sal_uIntPtr         mnXOffset;
-    ObjWinList*     mpTravellerList;
-
-    String      msSourceName;
-    ByteString  msVersionMajor;
-    ByteString  msVersionMinor;
-    ByteString  msProject;
-    ObjectWin*  mpFocusWin;
-    sal_Bool        mbIsHide;
-
-    GenericInformationList *mpStandLst;
-
-    DECL_LINK( ChildWindowEventListener, VclSimpleEvent* );
-    DECL_LINK( ToolSelect, SoldepToolBox* );
-
-    SolarFileList* GetPrjListFromDir();
-
-    Point       CalcPos( sal_uInt16 nSet, sal_uInt16 nIndex );
-    sal_uIntPtr       CalcXOffset( sal_uIntPtr nObjectsToFit );
-    double      CalcDistSum( ObjWinList* pObjList, DistType eDistType = TOPDOWN );
-    sal_uInt16      Impl_Traveller( ObjectWin* pWin, sal_uInt16 nDepth );
-    double      Impl_PermuteMin( ObjWinList& rObjList, Point* pPosArray, ObjWinList& rResultList,
-                    double dMinDist, sal_uIntPtr nStart, sal_uIntPtr nSize, DistType eDisType = TOPDOWN );
-    sal_uInt16      Load( const ByteString& rFileName );
-    void        WriteToErrorFile();
-    sal_Bool        MarkObjects( ObjectWin* pObjectWin );
-    void        InitContextMenueMainWnd();
-    void        InitContextMenuePrjViewWnd(DepWin* pWin);
-protected:
-    /// will be called for any VclWindowEvent events broadcasted by our VCL window
-    virtual void ProcessChildWindowEvent( const VclWindowEvent& _rVclWindowEvent );
-     inline bool isAlive() const        { return NULL != mpProcessWin; }
-
-
-public:
-    SolDep( Window* pBaseWindow );
-    ~SolDep();
-    sal_Bool                IsHideMode() { return mbIsHide;};
-    void                ToggleHideDependency();
-
-    virtual sal_uIntPtr     GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList);
-            sal_uIntPtr       GetStartPrj(SolIdMapper* pIdMapper, ObjectList* pObjList);
-    virtual sal_uInt16      ReadSource( sal_Bool bUpdater = sal_False );
-    virtual sal_uInt16      WriteSource();
-    virtual sal_uInt16      OpenSource();
-    sal_Bool                GetVersion();
-    void                Init();
-    void                Init( ByteString &rVersion, GenericInformationList *pVersionList = NULL );
-    sal_Bool                InitPrj( ByteString& rListName );
-//        using Depper::AddObject;
-    virtual sal_uIntPtr     AddObject( ByteString& rBodyText, sal_Bool Interact=sal_True );
-            sal_uIntPtr     AddPrjObject( ByteString& rBodyText, sal_Bool Interact=sal_True );
-    virtual ObjectWin*  RemoveObject( sal_uInt16 nId, sal_Bool bDelete = sal_True );
-    virtual void        RemoveAllObjects( ObjectList* pObjLst );
-    virtual sal_uInt16      AddConnector( ObjectWin* pStartWin, ObjectWin* pEndWin );
-            sal_uInt16      AddConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin );
-    virtual sal_uInt16      RemoveConnector( ObjectWin* pStartWin, ObjectWin* pEndWin );
-            sal_uInt16      RemoveConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin );
-            sal_uInt16      AutoArrange( SolIdMapper* pIdMapper, ObjectList* pObjLst, sal_uIntPtr nTopId, sal_uIntPtr nBottmId, sal_uIntPtr aObjID );
-            sal_uInt16      OptimizePos( SolIdMapper* pIdMapper, ObjectList* pObjLst, sal_uIntPtr nTopId, sal_uIntPtr nBottmId, sal_uIntPtr aObjID );
-    virtual sal_Bool        ViewContent( ByteString& rObjectName );
-    virtual sal_uInt16      CloseWindow();
-    virtual void        ShowHelp();
-    FloatingWindow*     GetTaskBarFrame() { return &maTaskBarFrame; }
-    SoldepToolBox*      GetSoldepToolBox() { return &maToolBox; }
-
-            sal_Bool        FindProject();
-            void        Resize();
-};
-
-#endif
diff --git a/soldep/inc/soldep/soldlg.hrc b/soldep/inc/soldep/soldlg.hrc
deleted file mode 100644
index 94a26514e5b2..000000000000
--- a/soldep/inc/soldep/soldlg.hrc
+++ /dev/null
@@ -1,79 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#define SOLDEPL_START   1000
-
-#define BTN_OK          (SOLDEPL_START+1)
-#define BTN_CANCEL      (SOLDEPL_START+2)
-
-#define FT_PRJNAME      (SOLDEPL_START+3)
-#define EDIT_PRJNAME    (SOLDEPL_START+4)
-#define FT_PRJSHORT     (SOLDEPL_START+5)
-#define EDIT_PRJSHORT   (SOLDEPL_START+6)
-#define FT_PRJDEPS      (SOLDEPL_START+7)
-#define EDIT_PRJDEPS    (SOLDEPL_START+8)
-
-
-#define FT_DIRNAME      (SOLDEPL_START+9)
-#define EDIT_DIRNAME    (SOLDEPL_START+10)
-#define FT_DIRFLAG      (SOLDEPL_START+11)
-#define EDIT_DIRFLAG    (SOLDEPL_START+12)
-#define FT_DIRDEPS      (SOLDEPL_START+13)
-#define EDIT_DIRDEPS    (SOLDEPL_START+14)
-#define FT_DIRACTION    (SOLDEPL_START+15)
-#define EDIT_DIRACTION  (SOLDEPL_START+16)
-#define FT_DIRENV       (SOLDEPL_START+17)
-#define EDIT_DIRENV     (SOLDEPL_START+18)
-
-#define EDIT_HELP       (SOLDEPL_START+19)
-
-#define DLG_VERSIONSELECT           (SOLDEPL_START+20)
-#define DLG_VERSIONSELECT_LISTBOX   (SOLDEPL_START+21)
-#define DLG_VERSIONSELECT_GROUP     (SOLDEPL_START+22)
-#define DLG_VERSIONSELECT_OK        (SOLDEPL_START+23)
-#define DLG_VERSIONSELECT_CANCEL    (SOLDEPL_START+24)
-#define DLG_MINORSELECT_EDIT        (SOLDEPL_START+33)
-#define DLG_MINORSELECT_GROUP       (SOLDEPL_START+34)
-#define DLG_AUTOARRANGE                 (SOLDEPL_START+25)
-#define DLG_AUTOARRANGE_GROUP           (SOLDEPL_START+26)
-#define DLG_AUTOARRANGE_TEXT_MODULE     (SOLDEPL_START+27)
-#define DLG_AUTOARRANGE_TEXT_OVERALL    (SOLDEPL_START+28)
-
-#define DLG_FIND_PROJECT                (SOLDEPL_START+29)
-#define DLG_FIND_PROJECT_OK             (SOLDEPL_START+30)
-#define DLG_FIND_PROJECT_CANCEL         (SOLDEPL_START+31)
-#define DLG_FIND_PROJECT_COMBOBOX       (SOLDEPL_START+32)
-
-#define TID_SOLDEP_MAIN                 (SOLDEPL_START+20000)
-#define TID_SOLDEP_OPEN                 (TID_SOLDEP_MAIN+1)
-#define TID_SOLDEP_SAVE                 (TID_SOLDEP_MAIN+2)
-#define TID_SOLDEP_FIND                 (TID_SOLDEP_MAIN+3)
-#define TID_SOLDEP_HIDE_INDEPENDEND     (TID_SOLDEP_MAIN+4)
-#define TID_SOLDEP_SELECT_WORKSPACE     (TID_SOLDEP_MAIN+5)
-#define TID_SOLDEP_BACK                 (TID_SOLDEP_MAIN+6)
-#define TID_SOLDEP_CREATEMETA           (TID_SOLDEP_MAIN+7)
-#define TID_SMALL_PIN_PINED             (TID_SOLDEP_MAIN+100)
-#define TID_SMALL_PIN_UNPINED           (TID_SOLDEP_MAIN+101)
diff --git a/soldep/inc/soldep/soldlg.hxx b/soldep/inc/soldep/soldlg.hxx
deleted file mode 100644
index 63423a97fdaf..000000000000
--- a/soldep/inc/soldep/soldlg.hxx
+++ /dev/null
@@ -1,160 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _FMRWRK_SOLDLG_HXX
-#define _FMRWRK_SOLDLG_HXX
-
-#include <tools/wintypes.hxx>
-#include <vcl/button.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
-#include <vcl/edit.hxx>
-#include <svtools/svmedit.hxx>
-#include <svtools/prgsbar.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/group.hxx>
-#include <vcl/combobox.hxx>
-
-// forwards
-class GenericInformationList;
-
-//
-// class SolNewProjectDlg
-//
-
-class SolNewProjectDlg : public ModalDialog
-{
-public:
-    OKButton            maOkButton;
-    CancelButton        maCancelButton;
-    FixedText           maFTName;
-    Edit                maEName;
-    FixedText           maFTShort;
-    Edit                maEShort;
-    FixedText           maFTDeps;
-    Edit                maEDeps;
-
-    SolNewProjectDlg( Window* pParent, const ResId& rResId );
-    DECL_LINK( OkHdl, Button* pOkBtn );
-    DECL_LINK( CancelHdl, Button* pCancelBtn );
-};
-
-//
-// SolNewDirectoryDlg
-//
-
-class SolNewDirectoryDlg : public ModalDialog
-{
-public:
-    OKButton            maOkButton;
-    CancelButton        maCancelButton;
-    FixedText           maFTName;
-    Edit                maEName;
-    FixedText           maFTFlag;
-    Edit                maEFlag;
-    FixedText           maFTDeps;
-    Edit                maEDeps;
-    FixedText           maFTAction;
-    Edit                maEAction;
-    FixedText           maFTEnv;
-    Edit                maEEnv;
-
-    SolNewDirectoryDlg( Window* pParent, const ResId& rResId );
-    DECL_LINK( OkHdl, Button* pOkBtn );
-    DECL_LINK( CancelHdl, Button* pCancelBtn );
-};
-
-//
-// SolHelpDlg
-//
-
-class SolHelpDlg : public ModalDialog
-{
-public:
-    OKButton            maOkButton;
-    MultiLineEdit       maMLEHelp;
-
-    SolHelpDlg( Window* pParent, const ResId& rResId );
-    DECL_LINK( OkHdl, Button* pOkBtn );
-};
-
-//
-// class SolSelectVersionDlg
-//
-
-class SolSelectVersionDlg : public ModalDialog
-{
-private:
-    ListBox maVersionListBox;
-    GroupBox maVersionGroupBox;
-    Edit     maMinorEditBox;
-    GroupBox maMinorGroupBox;
-    OKButton maOKButton;
-    CancelButton maCancelButton;
-    ByteString msVersionMajor;
-    ByteString msVersionMinor;
-
-public:
-    SolSelectVersionDlg( Window *pParent, GenericInformationList *pStandLst );
-    ByteString GetVersionMajor();
-    ByteString GetVersionMinor();
-    DECL_LINK( DoubleClickHdl, ListBox * );
-};
-
-class SolAutoarrangeDlg : public ModelessDialog
-{
-private:
-    GroupBox maGroupBox;
-    FixedText maModuleText;
-    FixedText maOverallText;
-    ProgressBar maModuleBar;
-    ProgressBar maOverallBar;
-
-public:
-    SolAutoarrangeDlg( Window *pParent );
-
-    ProgressBar *GetSubBar() { return &maModuleBar; }
-    ProgressBar *GetMainBar() { return &maOverallBar; }
-
-    FixedText *GetSubText() { return &maModuleText; }
-    FixedText *GetMainText() { return &maOverallText; }
-};
-
-class SolFindProjectDlg : public ModalDialog
-{
-private:
-    ComboBox maCombobox;
-    OKButton maOKButton;
-    CancelButton maCancelButton;
-
-public:
-    SolFindProjectDlg( Window *pParent, ObjWinList* pObjList );
-    ByteString GetProject();
-};
-
-#endif  // _FMRWRK_SOLDLG_HXX
diff --git a/soldep/inc/soldep/sstring.hxx b/soldep/inc/soldep/sstring.hxx
deleted file mode 100644
index 08eb1da71a09..000000000000
--- a/soldep/inc/soldep/sstring.hxx
+++ /dev/null
@@ -1,105 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SSTRING_HXX
-#define _SSTRING_HXX
-
-#include <tools/string.hxx>
-#include <tools/list.hxx>
-
-#define NOT_THERE       LIST_ENTRY_NOTFOUND
-
-#define  SStringList SUniStringList
-#define  StringList UniStringList
-
-DECLARE_LIST( ByteStringList, ByteString* )
-DECLARE_LIST( UniStringList, UniString* )
-
-class SvStream;
-
-// ---------------------
-// - class SStringList -
-// ---------------------
-
-class SByteStringList : public ByteStringList
-{
-public:
-                SByteStringList();
-                ~SByteStringList();
-
-                // neuen ByteString in Liste einfuegen
-    sal_uIntPtr     PutString( ByteString* );
-    ByteString*     RemoveString( const ByteString& rName );
-
-                // Position des ByteString in Liste, wenn nicht enthalten, dann
-                // return = NOT_THERE
-    sal_uIntPtr     IsString( ByteString* );
-
-                // Vorgaenger ermitteln ( auch wenn selbst noch nicht in
-                // Liste enthalten
-    sal_uIntPtr     GetPrevString( ByteString* );
-    void        CleanUp();
-
-    SByteStringList& operator<<  ( SvStream& rStream );
-    SByteStringList& operator>>  ( SvStream& rStream );
-};
-
-// ---------------------
-// - class SUniStringList -
-// ---------------------
-
-class SUniStringList : public UniStringList
-{
-public:
-                SUniStringList();
-                ~SUniStringList();
-
-                // neuen UniString in Liste einfuegen
-    sal_uIntPtr     PutString( UniString* );
-    UniString*  RemoveString( const UniString& rName );
-
-                // Position des UniString in Liste, wenn nicht enthalten, dann
-                // return = NOT_THERE
-    sal_uIntPtr     IsString( UniString* );
-
-                // Vorgaenger ermitteln ( auch wenn selbst noch nicht in
-                // Liste enthalten
-    sal_uIntPtr     GetPrevString( UniString* );
-};
-
-class Text
-{
-protected:
-    String      aString;
-
-public:
-                Text( char* pChar );
-                Text( String &rStr ) { aString = rStr; }
-    void        Stderr();
-};
-
-#endif
diff --git a/soldep/inc/soldep/tbox.hxx b/soldep/inc/soldep/tbox.hxx
deleted file mode 100644
index f8cb66b73fee..000000000000
--- a/soldep/inc/soldep/tbox.hxx
+++ /dev/null
@@ -1,102 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SOLDEPTBOX_HXX
-#define _SOLDEPTBOX_HXX
-
-#include <vcl/toolbox.hxx>
-#include <vcl/menu.hxx>
-
-class SoldepToolBox : public ToolBox
-{
-protected:
-//  sal_uInt16          nBuildServerToolBoxId;
-    sal_Bool            bDockable;
-    sal_Bool            bCloseMode;
-    sal_Bool            bOldFloatMode;
-    sal_Bool            bBoxIsVisible;
-    sal_Bool            bPin;
-    sal_Bool            bPinable;
-
-    PopupMenu       aMenu;
-
-    Rectangle       aOutRect;
-    Rectangle       aInRect;
-
-    Link            aResizeHdl;
-    Link            aMouseDownHdl;
-
-    Bitmap          aPinedBitmap;
-    Bitmap          aUnpinedBitmap;
-
-    void            InitContextMenu();
-
-public:
-                    SoldepToolBox( Window* pParent, const ResId& aId, sal_Bool bDAble = sal_True );
-                    ~SoldepToolBox();
-
-    virtual void    Command( const CommandEvent& rCEvt);
-    virtual void    CallContextMenu( Window *pWin, Point aPos );
-    virtual void    Paint( const Rectangle& rRect );
-    virtual void    MouseButtonDown(const MouseEvent& rEvent);
-    virtual void    MouseButtonUp(const MouseEvent& rEvent);
-    virtual void    MouseMove(const MouseEvent& rEvent);
-
-    virtual void    ToggleFloatingMode();
-//  void            SetFloatingWindow( FloatingWindow* pFW) { ToolBox::mpFloatWin = pFW; }
-    virtual void    StartDocking();
-    virtual void    EndDocking( const Rectangle& rRect, sal_Bool bFloatMode );
-    virtual sal_Bool    Close();
-    virtual void    CloseDockingMode();
-
-                    //Called when toolbar droped
-    virtual void    Tracking( const TrackingEvent &rTEvt ) { Invalidate(); ToolBox::Tracking( rTEvt );}
-
-    virtual void    Move();
-
-    using           DockingWindow::SetPosSizePixel;
-    void            SetPosSizePixel( const Point& rNewPos,
-                                         const Size& rNewSize );
-
-    void            SetDockingRects( const Rectangle& rOutRect,
-                                         const Rectangle& rInRect );
-
-    void            SetMouseDownHdl(const Link& rLink) { aMouseDownHdl = rLink; }
-    Link            GetMouseDownHdl() { return aMouseDownHdl; }
-    void            SetResizeHdl(const Link& rLink) { aResizeHdl = rLink; }
-
-    sal_Bool            IsBoxVisible() { return bBoxIsVisible; }
-
-    void            EnablePin( sal_Bool bEnable = sal_True ) { bPinable = bEnable; Invalidate(); }
-    sal_Bool            GetPin();
-    void            TogglePin();
-    void            SetPin(sal_Bool bP);
-    PopupMenu       *GetContextMenu();
-    DECL_LINK( MenuSelectHdl, Menu * );
-};
-
-#endif
diff --git a/soldep/prj/build.lst b/soldep/prj/build.lst
deleted file mode 100644
index 636c244ab358..000000000000
--- a/soldep/prj/build.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-dp	soldep	:	svtools NULL
-dp	soldep					usr1	-	all	dp_mkout NULL
-dp	soldep\bootstrp			nmake	-	all	dp_btstrp NULL
-dp	soldep\source				nmake	-	all	dp_soldep dp_btstrp NULL
-
diff --git a/soldep/prj/d.lst b/soldep/prj/d.lst
deleted file mode 100644
index cfd605ed3388..000000000000
--- a/soldep/prj/d.lst
+++ /dev/null
@@ -1,41 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\soldep
-mkdir: %_DEST%\inc%_EXT%\bootstrp2
-mkdir: %COMMON_DEST%\bin%_EXT%\additional
-mkdir: %COMMON_DEST%\res%_EXT%\img\additional
-
-..\inc\soldep\sdtresid.hxx %_DEST%\inc%_EXT%\soldep\sdtresid.hxx
-..\%__SRC%\bin\soldepl.exe %_DEST%\bin%_EXT%\soldepl.exe
-..\%__SRC%\bin\bootstrpdt?????.dll %_DEST%\bin%_EXT%\bootstrpdt?????.dll
-..\%__SRC%\bin\soldep?????.dll %_DEST%\bin%_EXT%\soldep?????.dll
-..\%__SRC%\lib\libbootstrpdt*.* %_DEST%\lib%_EXT%
-..\%__SRC%\lib\libsoldep*.* %_DEST%\lib%_EXT%
-..\%__SRC%\slb\*.a %_DEST%\lib%_EXT%\*.a
-
-..\util\perl.mk  %_DEST%\inc%_EXT%\soldep\perl.mk
-
-..\inc\soldep\soldep.hxx %_DEST%\inc%_EXT%\soldep\soldep.hxx
-..\inc\soldep\soldlg.hxx %_DEST%\inc%_EXT%\soldep\soldlg.hxx
-..\inc\soldep\hashtbl.hxx %_DEST%\inc%_EXT%\soldep\hashtbl.hxx
-..\inc\soldep\depper.hxx %_DEST%\inc%_EXT%\soldep\depper.hxx
-..\inc\soldep\objwin.hxx %_DEST%\inc%_EXT%\soldep\objwin.hxx
-..\inc\soldep\connctr.hxx %_DEST%\inc%_EXT%\soldep\connctr.hxx
-..\inc\soldep\depwin.hxx %_DEST%\inc%_EXT%\soldep\depwin.hxx
-..\inc\soldep\graphwin.hxx %_DEST%\inc%_EXT%\soldep\graphwin.hxx
-..\inc\soldep\tbox.hxx %_DEST%\inc%_EXT%\soldep\tbox.hxx
-..\inc\soldep\hashobj.hxx %_DEST%\inc%_EXT%\soldep\hashobj.hxx
-..\inc\minormk.hxx %_DEST%\inc%_EXT%\soldep\minormk.hxx
-..\inc\soldep\prj.hxx %_DEST%\inc%_EXT%\soldep\prj.hxx
-..\inc\dep.hxx %_DEST%\inc%_EXT%\soldep\dep.hxx
-..\inc\prodmap.hxx %_DEST%\inc%_EXT%\soldep\prodmap.hxx
-..\inc\soldep\appdef.hxx %_DEST%\inc%_EXT%\soldep\appdef.hxx
-..\inc\soldep\soldlg.hrc %_DEST%\inc%_EXT%\soldep\soldlg.hrc
-..\inc\soldep\sstring.hxx %_DEST%\inc%_EXT%\soldep\sstring.hxx
-..\inc\soldep\command.hxx %_DEST%\inc%_EXT%\soldep\command.hxx
-..\inc\soldep\listmacr.hxx %_DEST%\inc%_EXT%\soldep\listmacr.hxx
-
-..\%__SRC%\lib\soldep.lib %_DEST%\lib%_EXT%\soldep.lib
-..\%__SRC%\lib\bootstrpdt.lib %_DEST%\lib%_EXT%\bootstrpdt.lib
-
-..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib
-..\%__SRC%\bin\dep*.res %COMMON_DEST%\bin%_EXT%\additional\dep*.res
-
diff --git a/soldep/source/connctr.cxx b/soldep/source/connctr.cxx
deleted file mode 100644
index e8fba662cfb5..000000000000
--- a/soldep/source/connctr.cxx
+++ /dev/null
@@ -1,272 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifdef _MSC_VER
-#pragma warning(disable:4100)
-#endif
-#include <soldep/connctr.hxx>
-#include <soldep/objwin.hxx>
-#include <soldep/depwin.hxx>
-#include "math.h"
-
-sal_Bool Connector::msbHideMode = sal_False;
-
-Connector::Connector( DepWin* pParent, WinBits nWinStyle ) :
-mpStartWin( 0L ),
-mpEndWin( 0L ),
-mnStartId( 0 ),
-mnEndId( 0 ),
-bVisible( sal_False ),
-len( 70 )
-{
-    mpParent = pParent;
-    if ( mpParent )
-        mpParent->AddConnector( this );
-}
-
-Connector::~Connector()
-{
-    if ( mpStartWin )
-        mpStartWin->RemoveConnector( this );
-    if ( mpEndWin )
-        mpEndWin->RemoveConnector( this );
-    if ( mpParent )
-        mpParent->RemoveConnector( this );
-    mpParent->Invalidate( Rectangle( mStart, mEnd ));
-    mpParent->Invalidate( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3)));
-}
-
-void Connector::Initialize( ObjectWin* pStartWin, ObjectWin* pEndWin, sal_Bool bVis )
-{
-    mpStartWin = pStartWin;
-    mpEndWin = pEndWin;
-    mpStartWin->AddConnector( this );
-    mpEndWin->AddConnector( this );
-    mCenter = GetMiddle();
-    mStart = pStartWin->GetFixPoint( mCenter );
-    mEnd = pEndWin->GetFixPoint( mCenter );
-    mnStartId = pStartWin->GetId();
-    mnEndId = pEndWin->GetId();
-    bVisible = bVis;
-
-//  if ( mpParent->IsPaintEnabled())
-    if ( IsVisible() )
-    {
-        mpParent->DrawLine( mEnd, mStart );
-        mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2)));
-    }
-    UpdateVisibility(); //null_Project
-}
-
-void Connector::UpdateVisibility()
-{
-    bVisible = mpStartWin->IsVisible() && mpEndWin->IsVisible();
-}
-
-
-Point Connector::GetMiddle()
-{
-    Point aStartPoint = mpStartWin->GetPosPixel();
-    Size aStartSize = mpStartWin->GetSizePixel();
-    int nMoveHorz, nMoveVert;
-    aStartPoint.Move( aStartSize.Width() / 2, aStartSize.Height() / 2 );
-
-    Point aEndPoint = mpEndWin->GetPosPixel();
-    Size aEndSize = mpEndWin->GetSizePixel();
-
-    aEndPoint.Move( aEndSize.Width() / 2, aEndSize.Height() / 2 );
-
-    Point aRetPoint = aEndPoint;
-
-    nMoveHorz = aStartPoint.X() - aEndPoint.X();
-    if ( nMoveHorz )
-        nMoveHorz /= 2;
-    nMoveVert = aStartPoint.Y() - aEndPoint.Y();
-    if ( nMoveVert )
-        nMoveVert /= 2;
-    aRetPoint.Move( nMoveHorz, nMoveVert );
-    return aRetPoint;
-
-}
-
-void Connector::Paint( const Rectangle& rRect )
-{
-    //MyApp *pApp = (MyApp*)GetpApp();
-    //SolDep *pSoldep = pApp->GetSolDep();
-    if (msbHideMode)
-    {
-    if (!(mpStartWin->IsNullObject())) //null_project
-    {
-        if ( mpStartWin->GetMarkMode() == 0 || mpStartWin->GetMarkMode() == MARKMODE_DEPENDING )
-        {
-            mpStartWin->SetViewMask(0); //objwin invisible
-        } else
-        {
-            mpStartWin->SetViewMask(1); //objwin visible
-        }
-    }
-    if (!(mpEndWin->IsNullObject()))
-    {
-        if ( mpEndWin->GetMarkMode() == 0 || mpEndWin->GetMarkMode() == MARKMODE_DEPENDING )
-        {
-            mpEndWin->SetViewMask(0); //objwin invisible
-        } else
-        {
-            mpEndWin->SetViewMask(1); //objwin visible
-        }
-    }
-    UpdateVisibility();
-    } else //IsHideMode
-    {
-        //bVisible = sal_True;
-        if (!(mpStartWin->IsNullObject())) //null_project
-        {
-             mpStartWin->SetViewMask(1);
-        }
-        if (!(mpEndWin->IsNullObject())) //null_project
-        {
-             mpEndWin->SetViewMask(1);
-        }
-        UpdateVisibility();
-    }
-    if ( (mpStartWin->GetBodyText() != ByteString("null")) &&              //null_project
-         (mpEndWin->GetBodyText() != ByteString("null")) && IsVisible())  //null_project
-    {
-        mpParent->DrawLine( mEnd, mStart );
-        mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2)));
-    }
-}
-
-void Connector::DrawOutput( OutputDevice* pDevice, const Point& rOffset )
-{
-    if ( (mpStartWin->GetBodyText() != ByteString("null")) &&              //null_project
-         (mpEndWin->GetBodyText() != ByteString("null")) && IsVisible())  //null_project
-    {
-        pDevice->DrawLine( pDevice->PixelToLogic( mEnd ) - rOffset, pDevice->PixelToLogic( mStart ) - rOffset );
-        Rectangle aRect( pDevice->PixelToLogic( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2) ) ) );
-        aRect.Move( -rOffset.X(), -rOffset.Y() );
-        pDevice->DrawEllipse( aRect );
-    }
-}
-
-void Connector::UpdatePosition( ObjectWin* pWin, sal_Bool bPaint )
-{
-//  more than one call ?
-//
-    Point OldStart, OldEnd;
-    static sal_uIntPtr nCallCount = 0;
-
-    //MyApp *pApp = (MyApp*)GetpApp();
-    //SolDep *pSoldep = pApp->GetSolDep();
-    if (msbHideMode)
-        bVisible = 1;
-
-    if ( nCallCount )           // only one call
-        nCallCount++;
-    else
-    {
-        nCallCount++;
-        while ( nCallCount )
-        {
-            if ( bPaint )
-            {
-                OldStart = mStart;
-                OldEnd = mEnd;
-            }
-            mCenter = GetMiddle();
-            mStart=mpStartWin->GetFixPoint( mCenter, bPaint );
-            mEnd=mpEndWin->GetFixPoint( mCenter, bPaint );
-            if ( bPaint )
-            {
-                mpParent->Invalidate( Rectangle( OldStart, OldEnd ));
-                mpParent->Invalidate( Rectangle( OldEnd - Point( 2, 2), OldEnd + Point( 2, 2)));
-//Don't paint "null_project" connectors
-                if ( (mpStartWin->GetBodyText() != ByteString("null")) &&               //null_project
-                     (mpEndWin->GetBodyText() != ByteString("null")))                   //null_project
-                {
-                    Paint ( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3)));
-                    Paint ( Rectangle( mEnd, mStart ));
-                }
-            }
-            nCallCount--;
-        }
-    }
-}
-
-sal_uInt16 Connector::Save( SvFileStream& rOutFile )
-{
-    rOutFile << mpStartWin->GetId();
-    rOutFile << mpEndWin->GetId();
-
-    return 0;
-}
-
-sal_uInt16 Connector::Load( SvFileStream& rInFile )
-{
-    rInFile >> mnStartId;
-    rInFile >> mnEndId;
-
-    return 0;
-}
-
-ObjectWin* Connector::GetOtherWin( ObjectWin* pWin )
-{
-// get correspondent object ptr
-    if ( mpStartWin == pWin )
-        return mpEndWin;
-    else
-        if ( mpEndWin == pWin )
-            return mpStartWin;
-
-    return NULL;
-}
-
-sal_uIntPtr Connector::GetOtherId( sal_uIntPtr nId )
-{
-// get correspondent object id
-    if ( mnStartId == nId )
-        return mnEndId;
-    else
-        if ( mnEndId == nId )
-            return mnStartId;
-
-    return NULL;
-}
-
-sal_uIntPtr Connector::GetLen()
-{
-    double dx, dy;
-
-    dx = mStart.X() - mEnd.X();
-    dy = mStart.Y() - mEnd.Y();
-
-    return (sal_uIntPtr) sqrt( dx * dx + dy * dy );
-}
-
-sal_Bool Connector::IsStart( ObjectWin* pWin )
-{
-    return pWin == mpStartWin;
-}
diff --git a/soldep/source/depapp.cxx b/soldep/source/depapp.cxx
deleted file mode 100644
index 0c2b11f030be..000000000000
--- a/soldep/source/depapp.cxx
+++ /dev/null
@@ -1,147 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// -----------------------------------------------------------------------
-#include "depapp.hxx"
-#include <ucbhelper/contentbroker.hxx>
-#include <ucbhelper/configurationkeys.hxx>
-
-void MyApp::Main()
-{
-#if defined(WNT)
-    pDebugFile = fopen( "fprintf.out", "w" );
-#endif
-
-    pMyApp = GetpApp();
-    MyWin aMainWin( NULL, WB_APP | WB_STDWORK );
-    pAppWindow = &aMainWin;
-   // pToolBarFrame = new FloatingWindow( aMainWin, WB_STDWORK );
-    //pToolBox = new ToolBox(pToolBarFrame,DtSodResId(TID_SOLDEP_MAIN));
-
-    pSolDep = new SolDep( &aMainWin );
-    pSolDep->Init();
-    aMainWin.SetText( String::CreateFromAscii( SOLDEPL_NAME ));
-    pSolDep->Hide();
-    aMainWin.Show();
-    Help aHelp;
-    SetHelp(&aHelp);
-    aHelp.EnableContextHelp();
-    aHelp.EnableQuickHelp();
-    Execute();
-    delete pResMgr;
-    delete pSolDep;
-}
-
-// -----------------------------------------------------------------------
-
-MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
-    WorkWindow( pParent, nWinStyle )//,aToolBox( this, DtSodResId(TID_SOLDEP_MAIN)),
-        // depper aTaskBarFrame(this, 0)
-{
-//depper    aTaskBarFrame.EnableAlwaysOnTop();
-
-//depper    aMenuBar.InsertItem( 1, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Source" ) ) );
-//depper    aMenuBar.InsertItem( 2, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Exit" ) ) );
-//depper    SetMenuBar( &aMenuBar );
-//depper    aToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 ));
-//    aToolBox.Show();
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::MouseMove( const MouseEvent& rMEvt )
-{
-    WorkWindow::MouseMove( rMEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
-{
-    WorkWindow::MouseButtonDown( rMEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::MouseButtonUp( const MouseEvent& rMEvt )
-{
-    WorkWindow::MouseButtonUp( rMEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::KeyInput( const KeyEvent& rKEvt )
-{
-    WorkWindow::KeyInput( rKEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::KeyUp( const KeyEvent& rKEvt )
-{
-    WorkWindow::KeyUp( rKEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::Paint( const Rectangle& rRect )
-{
-    WorkWindow::Paint( rRect );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::Resize()
-{
-    ((MyApp*)GetpApp())->GetSolDep()->Resize();
-    WorkWindow::Resize();
-}
-
-SAL_IMPLEMENT_MAIN()
-{
-    //Reference< XMultiServiceFactory > xMS;
-
-    // for this to work make sure an <appname>.ini file is available, you can just copy soffice.ini
-    Reference< XComponentContext > xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext();
-
-    //xMS = cppu::createRegistryServiceFactory(
-    //              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True );
-
-    Reference< XMultiServiceFactory > xMS( xComponentContext->getServiceManager(), UNO_QUERY);
-
-    InitVCL( xMS );
-    ::comphelper::setProcessServiceFactory(xMS);
-    com::sun::star::uno::Sequence< com::sun::star::uno::Any > aArgs(2);
-    aArgs[0] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
-    aArgs[1] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
-
-    ::ucbhelper::ContentBroker::initialize( xMS, aArgs );
-
-    aMyApp.Main();
-    DeInitVCL();
-    return 0;
-}
diff --git a/soldep/source/depapp.hxx b/soldep/source/depapp.hxx
deleted file mode 100644
index e293ec7e1468..000000000000
--- a/soldep/source/depapp.hxx
+++ /dev/null
@@ -1,109 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _DEPAPP_HXX
-#define _DEPAPP_HXX
-
-
-#define EVENT_RESIZE                0x00000001
-
-
-#include <svl/solar.hrc>
-#include <tools/resmgr.hxx>
-#include <soldep/sstring.hxx>
-#include <vcl/event.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
-#include <vcl/msgbox.hxx>
-#include <vcl/help.hxx>
-#include <vcl/button.hxx>
-#include <vcl/menu.hxx>
-#include <soldep/soldep.hxx>
-//#include <soldep/soldlg.hrc>
-//#include <soldep/tbox.hxx>
-// -----------------------------------------------------------------------
-#include <sal/main.h>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <comphelper/processfactory.hxx>
-#include <cppuhelper/servicefactory.hxx>
-#include <cppuhelper/bootstrap.hxx>
-#include <cppuhelper/weak.hxx>
-#include <soldep/soldep.hxx>
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-class MyWin;
-
-class MyApp : public Application
-{
-    ResMgr*     pResMgr;
-    SolDep*     pSolDep;
-    Application* pMyApp;
-    MyWin*      pAppWindow;
-
-public:
-//                MyApp();
-//               ~MyApp() {};
-#if defined(WNT)
-        FILE*       pDebugFile;
-#endif
-
-    void        Main();
-    ResMgr*     GetResMgr() const { return pResMgr; }
-    Application* GetMyApp() { return pMyApp; }
-    MyWin*      GetAppWin() { return pAppWindow; }
-    SolDep*     GetSolDep() { return pSolDep; }
-};
-
-// -----------------------------------------------------------------------
-
-class MyWin : public WorkWindow
-{
-protected:
-    MenuBar     aMenuBar;
-//    SoldepToolBox     aToolBox; //->depper.hxx
-    Wallpaper   aWallpaper;
-//    FloatingWindow aTaskBarFrame; // For ToolBox
-
-public:
-                MyWin( Window* pParent, WinBits nWinStyle );
-
-    void        MouseMove( const MouseEvent& rMEvt );
-    void        MouseButtonDown( const MouseEvent& rMEvt );
-    void        MouseButtonUp( const MouseEvent& rMEvt );
-    void        KeyInput( const KeyEvent& rKEvt );
-    void        KeyUp( const KeyEvent& rKEvt );
-    void        Paint( const Rectangle& rRect );
-    void        Resize();
-//    FloatingWindow* GetTaskBarFrame() { return &aTaskBarFrame; }
-//    SoldepToolBox* GetSoldepToolBox() { return &aToolBox; }
-
-};
-static MyApp aMyApp;
-
-#endif
-
diff --git a/soldep/source/depper.cxx b/soldep/source/depper.cxx
deleted file mode 100644
index d34a93222a3f..000000000000
--- a/soldep/source/depper.cxx
+++ /dev/null
@@ -1,687 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include <stdio.h>
-#include <tools/stream.hxx>
-#include <tools/debug.hxx>
-#include <vcl/msgbox.hxx>
-#include <svtools/prgsbar.hxx>
-
-#include <soldep/depper.hxx>
-#include <soldep/objwin.hxx>
-
-#include "math.h"
-#include "time.h"
-#include "stdlib.h"
-#include "dtsodcmp.hrc"
-
-#include <vcl/svapp.hxx>
-
-#define MIN(a,b) (a)<(b)?(a):(b)
-#define MAX(a,b) (a)>(b)?(a):(b)
-
-ByteString sDelimiterLine("#==========================================================================");
-
-
-
-
-Depper::Depper( Window* pBaseWindow ):
-    Window( pBaseWindow ),
-    mbIsPrjView(sal_False),
-    maDefPos( 50, 50 ),
-    maDefSize( 60, 25 ),
-    mnViewMask( 1 ),
-    pSubBar( NULL ),
-    pMainBar( NULL ),
-    pSubText( NULL ),
-    pMainText( NULL ),
-    maArrangeDlg( pBaseWindow ),
-    mpPrjIdMapper( NULL ),
-    maToolBox( pBaseWindow, DtSodResId(TID_SOLDEP_MAIN) ),
-    maTaskBarFrame( pBaseWindow, 0)
-{
-    maArrangeDlg.Hide();
-
-    mpProcessWin = pBaseWindow;
-    mpGraphWin = new GraphWin( mpProcessWin, this );
-    mpGraphPrjWin = new GraphWin( mpProcessWin, this );
-    //mpBaseWin paints into virtual OutputDevice
-    mpBaseWin = new DepWin( mpGraphWin->GetBufferWindow(), WB_NOBORDER | WB_SIZEABLE | WB_AUTOSIZE );
-    mpBasePrjWin = new DepWin( mpGraphPrjWin->GetBufferWindow(), WB_NOBORDER | WB_SIZEABLE | WB_AUTOSIZE );
-
-    mpGraphWin->SetBackground( Wallpaper( Color( COL_RED )));
-    mpGraphPrjWin->SetBackground( Wallpaper( Color( COL_BLUE )));
-    mpGraphPrjWin->Hide();
-    mpBaseWin->SetBackground( Wallpaper( Color( COL_WHITE )));
-    mpBasePrjWin->SetBackground( Wallpaper( Color( COL_LIGHTGRAY )));
-/*
-    mpGraphWin->SetZOrder( NULL, WINDOW_ZORDER_FIRST );
-    mpGraphPrjWin->SetZOrder( NULL, WINDOW_ZORDER_FIRST );
-    mpBaseWin->SetZOrder( NULL, WINDOW_ZORDER_FIRST );
-*/
-    mpGraphWin->EnableClipSiblings();
-    mpGraphPrjWin->EnableClipSiblings();
-
-    mpParentProcessWin = mpProcessWin->GetParent();
-    mpBaseWin->Show();
-    nZoomed = 0;
-
-    mpBaseWin->SetPopupHdl( this );
-    mpBasePrjWin->SetPopupHdl( this );
-
-    mpObjectList = new ObjectList(); //ObjectList unbekannt
-    mpObjectPrjList = new ObjectList();
-}
-
-Depper::~Depper()
-{
-//  delete mpObjectList;
-    delete mpBaseWin;
-    delete mpGraphWin;
-}
-
-sal_Bool Depper::TogglePrjViewStatus()
-{
-    GetDepWin()->Hide();            //Hide old content window
-    GetGraphWin()->Hide();
-    mbIsPrjView = !mbIsPrjView;     //switch now
-    GetDepWin()->Invalidate();
-    GetGraphWin()->Show();
-    GetDepWin()->Show();            //Show new content window
-    return mbIsPrjView;
-}
-
-void Depper::HideObjectsAndConnections( ObjectList* pObjLst )
-{
-    for ( sal_uIntPtr i = 0; i < pObjLst->Count(); i ++ ) {
-        ObjectWin *pWin = pObjLst->GetObject( i );
-        pWin->Hide();
-    }
-    mpGraphWin->Hide();
-    mpBaseWin->Hide();
-    mpGraphPrjWin->Show();
-    mpBasePrjWin->Show();
-}
-
-void Depper::ShowObjectsAndConnections( ObjectList* pObjLst )
-{
-    for ( sal_uIntPtr i = 0; i < pObjLst->Count(); i ++ ) {
-        ObjectWin *pWin = pObjLst->GetObject( i );
-        pWin->Show();
-    }
-    mpBasePrjWin->Hide();
-    mpGraphPrjWin->Hide();
-    mpGraphWin->Show();
-    mpBaseWin->Show();
-}
-
-
-void Depper::RemoveAllObjects( ObjectList* pObjLst )
-{
-    sal_uIntPtr i;
-
-    for ( i = pObjLst->Count(); i > 0; i-- )
-        delete pObjLst->GetObject( i - 1 );
-    pObjLst->Clear();
-}
-
-sal_uInt16 Depper::Save( const ByteString& rFileName )
-{
-    DBG_ASSERT( sal_False , "you are dead!" );
-    SvFileStream aOutFile( String( rFileName, RTL_TEXTENCODING_UTF8 ), STREAM_WRITE );
-    depper_head dh;
-    sal_uInt16 i;
-    sal_uIntPtr nObjCount = mpObjectList->Count();
-
-    ConnectorList* pConList = GetDepWin()->GetConnectorList();
-    sal_uIntPtr nCnctrCount = pConList->Count();
-
-    dh.nID = DEPPER_ID;
-    dh.nObjectCount = nObjCount;
-    dh.nCnctrCount = nCnctrCount;
-
-    aOutFile.Write( &dh, sizeof( dh ));
-
-    for ( i=0; i < nObjCount ; i++ )
-    {
-        mpObjectList->GetObject( i )->Save( aOutFile );
-    }
-
-    for ( i=0; i < nCnctrCount ; i++ )
-    {
-        pConList->GetObject( i )->Save( aOutFile );
-    }
-
-    return 0;
-}
-
-
-sal_uInt16  Depper::WriteSource()
-{
-    DBG_ASSERT( sal_False , "overload it!" );
-    return 0;
-};
-
-sal_uInt16  Depper::ReadSource( sal_Bool bUpdater )
-{
-    DBG_ASSERT( sal_False , "overload it!" );
-    return 0;
-};
-
-sal_uInt16  Depper::OpenSource()
-{
-    DBG_ASSERT( sal_False , "overload it!" );
-    return 0;
-};
-
-ObjectWin* Depper::ObjIdToPtr( ObjectList* pObjLst, sal_uIntPtr nId )
-{
-    sal_uIntPtr nObjCount = pObjLst->Count();
-    sal_uIntPtr i = 0;
-    ObjectWin* pWin;
-    sal_uIntPtr nWinId = 0;
-
-    do
-    {
-        pWin = pObjLst->GetObject( i );
-        nWinId = pWin->GetId();
-        i++;
-    }
-    while( i < nObjCount && pWin->GetId() != nId );
-    if ( pWin->GetId() == nId )
-        return pWin;
-    else
-        return NULL;
-}
-
-void Depper::SetMainProgressBar( sal_uInt16 i)
-{
-    if ( pMainBar ) {
-        pMainBar->SetValue( 100 );
-        pMainBar->Update();
-    }
-}
-
-void Depper::UpdateMainProgressBar(sal_uInt16 i, sal_uInt16 nScaleVal, sal_uInt16 &nStep, sal_Bool bCountingDown )
-{
-    sal_uIntPtr val = 0;
-    if ( pMainBar ) {
- //       val = i * 50 / nScaleVal + 1;
-        val = bCountingDown ? 50 + ( nScaleVal - i ) * 50 / nScaleVal : i * 50 / nScaleVal;
-
-        pMainBar->SetValue( val );
-        pMainBar->Update();
-        String sText( String::CreateFromAscii( "Optimize step " ));
-        sText += String::CreateFromInt32( ++nStep );
-        pSubText->SetText( sText );
-    }
-}
-
-void Depper::UpdateSubProgrssBar(sal_uIntPtr i)
-{
-    if ( pSubBar )
-    {
-        pSubBar->SetValue( i );
-        pSubBar->Update();
-        GetpApp()->Reschedule();
-    }
-}
-
-
-sal_uInt16 Depper::AutoArrangeDlgStart()
-{
-    pSubBar = maArrangeDlg.GetSubBar();
-    pMainBar = maArrangeDlg.GetMainBar();
-    pSubText = maArrangeDlg.GetSubText();
-    pMainText = maArrangeDlg.GetMainText();
-    pMainText->SetText( String::CreateFromAscii( "Overall status" ));
-    maArrangeDlg.Show();
-    GetDepWin()->Enable( sal_False );
-    GetDepWin()->Hide();
-    return 0;
-}
-
-sal_uInt16 Depper::AutoArrangeDlgStop()
-{
-    maArrangeDlg.Hide();
-    GetDepWin()->Enable( sal_True );
-    GetDepWin()->Show();
-    pSubBar = NULL;
-    pMainBar = NULL;
-    pSubText = NULL;
-    pMainText = NULL;
-    return 0;
-}
-
-
-
-sal_uInt16 Depper::Zoom( MapMode& rMapMode )
-{
-    sal_uIntPtr i;
-    ObjectWin* pWin;
-    Point aPos;
-    Size aSize;
-    ObjectList* pObjList;
-    pObjList = GetObjectList();
-//  aSize = mpBaseWin->GetSizePixel();
-//  mpGraphWin->SetTotalSize( aSize );
-//  mpGraphWin->EndScroll( 0, 0 );
-
-    for ( i = pObjList->Count(); i > 0; i-- )
-    {
-        pWin = pObjList->GetObject( i - 1 );
-        aPos = pWin->PixelToLogic( pWin->GetPosPixel());
-        aSize = pWin->PixelToLogic( pWin->GetSizePixel());
-        pWin->SetMapMode( rMapMode );
-        aPos = pWin->LogicToPixel( aPos );
-        aSize = pWin->LogicToPixel( aSize );
-        pWin->SetPosSizePixel( aPos, aSize );
-    }
-    GetDepWin()->Invalidate();
-    return 0;
-}
-
-sal_uIntPtr Depper::AddObjectToList( DepWin* pParentWin, ObjectList* pObjLst, sal_uIntPtr &LastID, sal_uIntPtr &WinCount, ByteString& rBodyText, sal_Bool bInteract )
-{
-    Point aPos;
-    Size aSize = GetDefSize();
-
-    aPos = GetDepWin()->LogicToPixel( aPos );
-    aSize = GetDepWin()->LogicToPixel( aSize );
-    return AddObjectToList( pParentWin, pObjLst, LastID, WinCount, rBodyText, aPos, aSize );
-}
-
-sal_uIntPtr Depper::AddObjectToList( DepWin* pParentWin, ObjectList* pObjLst, sal_uIntPtr &LastID, sal_uIntPtr &WinCount, ByteString& rBodyText, Point& rPos, Size& rSize )
-{
-    ObjectWin* pWin = new ObjectWin( pParentWin, WB_BORDER );
-    //pWin->mpDepperDontuseme = this;
-    pWin->SetGlobalViewMask(mnViewMask);    // Set ViewMask for all ObjectWin and Connector objects
-
-    Size aNewSize;
-    aNewSize.Width() = pWin->GetTextWidth( String( rBodyText, RTL_TEXTENCODING_UTF8 ));
-    aNewSize.Height() = pWin->GetTextHeight();
-    if ( aNewSize.Width() > rSize.Width() - 8 )
-    {
-        aNewSize.Width() = aNewSize.Width() + 8;
-        aNewSize.Height() = rSize.Height();
-    }
-    else
-        aNewSize = rSize;
-    pWin->SetPosSizePixel( rPos,aNewSize);
-
-    MapMode aMapMode = mpBaseWin->GetMapMode();
-    pWin->SetMapMode( aMapMode );
-
-    pObjLst->Insert( pWin, LIST_APPEND );
-    pWin->SetId( LastID );
-    LastID++;
-    WinCount++;
-    pWin->SetBodyText( rBodyText );
-//  pWin->Show();
-    return pWin->GetId();
-}
-
-/*void Depper::DrawOutput( OutputDevice* pDevice )
-{
-    GetDepWin()->DrawOutput( pDevice );
-    ObjectList* pObjList = GetObjectList();
-    for ( sal_uInt16 i = pObjList->Count(); i > 0; i-- )
-    {
-        ObjectWin* pWin = pObjList->GetObject( i - 1 );
-        pWin->DrawOutput( pDevice );
-    }
-}*/
-
-ObjectWin* Depper::RemoveObjectFromList( ObjectList* pObjLst, sal_uIntPtr &WinCount, sal_uInt16 nId, sal_Bool bDelete )
-{
-    ObjectWin* pWin = ObjIdToPtr( pObjLst, nId );
-
-    if ( pWin )
-    {
-        pObjLst->Remove( pWin );
-        WinCount--;
-        if( bDelete )
-            delete pWin;
-        return pWin;
-    }
-    else
-        return NULL;
-}
-sal_uInt16 Depper::AddConnectorToObjects( ObjectList* pObjLst, sal_uIntPtr nStartId, sal_uIntPtr nEndId )
-{
-    ObjectWin* pStartWin = ObjIdToPtr( pObjLst, nStartId );
-
-    if ( !pStartWin )
-        return DEP_STARTID_NOT_FOUND;
-
-    ObjectWin* pEndWin = ObjIdToPtr( pObjLst, nEndId );
-
-    if ( !pEndWin )
-        return DEP_STARTID_NOT_FOUND;
-
-    return AddConnectorToObjects( pStartWin, pEndWin );
-}
-
-sal_uInt16 Depper::RemoveConnectorFromObjects( ObjectList* pObjLst, sal_uIntPtr nStartId, sal_uIntPtr nEndId )
-{
-//  DBG_ASSERT( FALSE , "noch nicht" );
-    ObjectWin* pStartWin = ObjIdToPtr( pObjLst, nStartId );
-
-    if ( !pStartWin )
-        return DEP_STARTID_NOT_FOUND;
-
-    ObjectWin* pEndWin = ObjIdToPtr( pObjLst, nEndId );
-
-    if ( !pEndWin )
-        return DEP_STARTID_NOT_FOUND;
-
-    return RemoveConnectorFromObjects( pStartWin, pEndWin );
-}
-
-sal_uInt16 Depper::AddConnectorToObjects( ObjectWin* pStartWin, ObjectWin* pEndWin )
-{
-    if ( pStartWin->ConnectionExistsInAnyDirection( pEndWin ))
-        return 0;
-
-    Connector* pCon = new Connector( GetDepWin(), WB_NOBORDER );
-//  pCon->Initialize( pStartWin, pEndWin );
-    if (pStartWin->IsNullObject()) //null_project
-        pCon->Initialize( pStartWin, pEndWin, sal_False );
-    else
-        pCon->Initialize( pStartWin, pEndWin, sal_True );
-    return 0;
-}
-
-sal_uInt16 Depper::RemoveConnectorFromObjects( ObjectWin* pStartWin, ObjectWin* pEndWin )
-{
-    Connector* pCon = pStartWin->GetConnector( pStartWin->GetId(), pEndWin->GetId() );
-
-    if ( !pCon )
-        return DEP_CONNECTOR_NOT_FOUND;
-    else
-    {
-        delete pCon;
-        return DEP_OK;
-    }
-}
-
-sal_uIntPtr Depper::HandleNewPrjDialog( ByteString &rBodyText )
-{
-        SolNewProjectDlg aNewProjectDlg( GetDepWin(), DtSodResId( RID_SD_DIALOG_NEWPROJECT ));
-        if ( aNewProjectDlg.Execute() )
-        {
-            rBodyText = ByteString( aNewProjectDlg.maEName.GetText(), RTL_TEXTENCODING_UTF8);
-//hashtable auf stand halten
-            MyHashObject* pHObject;
-            sal_uIntPtr nObjectId = AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, rBodyText, sal_False );
-            pHObject = new MyHashObject( nObjectId, ObjIdToPtr( mpObjectList, nObjectId ));
-            mpSolIdMapper->Insert( rBodyText, pHObject );
-
-            ByteString sTokenLine( aNewProjectDlg.maEShort.GetText(), RTL_TEXTENCODING_UTF8 );
-            sTokenLine += '\t';
-            sTokenLine += ByteString( aNewProjectDlg.maEName.GetText(), RTL_TEXTENCODING_UTF8 );
-            sTokenLine += "\t:\t";
-
-            ByteString sDeps = ByteString( aNewProjectDlg.maEDeps.GetText(), RTL_TEXTENCODING_UTF8 );
-
-            if ( sDeps != "" )
-            {
-                sal_uInt16 i;
-                ByteString sDepName;
-                sal_uInt16 nToken = sDeps.GetTokenCount(' ');
-                for ( i = 0 ; i < nToken ; i++)
-                {
-                    sDepName =  sDeps.GetToken( i, ' ' );
-                    sTokenLine += sDepName;
-                    sTokenLine +='\t';
-                }
-            }
-            sTokenLine +="NULL";
-
-            mpStarWriter->InsertTokenLine( sTokenLine );
-            mpStarWriter->InsertTokenLine( sDelimiterLine );
-
-            if ( sDeps != "" )
-            {
-                sal_uInt16 i;
-                ByteString sDepName;
-                sal_uIntPtr nObjectId_l, nHashedId;
-                MyHashObject* pHObject_l;
-                sal_uInt16 nToken = sDeps.GetTokenCount(' ');
-                for ( i = 0 ; i < nToken ; i++)
-                {
-                    sDepName =  sDeps.GetToken( i, ' ' );
-
-                    pHObject_l = mpSolIdMapper->Find( sDepName );
-                    if ( !pHObject_l )
-                    {
-                        String sMessage;
-                        sMessage += String::CreateFromAscii("can't find ");
-                        sMessage += String( sDepName, RTL_TEXTENCODING_UTF8 );
-                        sMessage += String::CreateFromAscii(".\ndependency ignored");
-                        WarningBox aBox( GetDepWin(), WB_OK, sMessage);
-                        aBox.Execute();
-                    }
-                    else
-                    {
-                        nHashedId = pHObject_l->GetId();
-                        pHObject_l = mpSolIdMapper->Find( rBodyText );
-                        nObjectId_l = pHObject_l->GetId();
-                        AddConnectorToObjects( mpObjectList, nHashedId, nObjectId_l );
-                    }
-                }
-            }
-            return nObjectId;
-        }
-        return 0;
-}
-
-sal_uIntPtr Depper::HandleNewDirectoryDialog(ByteString &rBodyText)
-{
-        SolNewDirectoryDlg aNewDirectoryDlg( GetDepWin(), DtSodResId( RID_SD_DIALOG_NEWDIRECTORY ));
-//todo: set defaults
-        if ( aNewDirectoryDlg.Execute() )
-        {
-            rBodyText = ByteString( aNewDirectoryDlg.maEFlag.GetText(), RTL_TEXTENCODING_UTF8 );
-//hashtable auf stand halten
-            MyHashObject* pHObject;
-            sal_uIntPtr nObjectId = AddObjectToList( GetDepWin(), mpObjectPrjList, mnSolLastId, mnSolWinCount, rBodyText );
-            pHObject = new MyHashObject( nObjectId, ObjIdToPtr( mpObjectPrjList, nObjectId ));
-            mpPrjIdMapper->Insert( rBodyText, pHObject ); // mpPrjIdMapper
-
-            String sTokenLine;
-            sTokenLine = String( mpPrj->GetPreFix(), RTL_TEXTENCODING_UTF8 );
-            sTokenLine += '\t';
-            String sNameConvert = aNewDirectoryDlg.maEName.GetText();
-            sNameConvert.SearchAndReplaceAll( '/', '\\' );
-            if ( sNameConvert.GetToken( 0, 0x5c ) != String( mpPrj->GetProjectName(), RTL_TEXTENCODING_UTF8 ))
-            {
-                sTokenLine += String( mpPrj->GetProjectName(), RTL_TEXTENCODING_UTF8 );
-                sTokenLine += String("\\", RTL_TEXTENCODING_UTF8 );
-                sTokenLine += sNameConvert;
-            }
-            else
-                sTokenLine += sNameConvert;
-            sTokenLine += '\t';
-            sTokenLine += aNewDirectoryDlg.maEAction.GetText();
-            sTokenLine += String( "\t-\t", RTL_TEXTENCODING_UTF8 );
-            sTokenLine += aNewDirectoryDlg.maEEnv.GetText();
-            sTokenLine += '\t';
-            sTokenLine += aNewDirectoryDlg.maEFlag.GetText();
-            sTokenLine += '\t';
-
-            sTokenLine += String( "NULL", RTL_TEXTENCODING_UTF8 );
-
-            ByteString bsTokenLine = ByteString( sTokenLine, RTL_TEXTENCODING_UTF8 );
-            mpStarWriter->InsertTokenLine( bsTokenLine );
-
-            if ( aNewDirectoryDlg.maEDeps.GetText() != String( "", RTL_TEXTENCODING_UTF8 ))
-            {
-                sal_uInt16 i;
-                ByteString sDeps = ByteString( aNewDirectoryDlg.maEDeps.GetText(), RTL_TEXTENCODING_UTF8 );
-                ByteString sDepName;
-                sal_uIntPtr nObjectId_l, nHashedId;
-                MyHashObject* pHObject_l;
-                sal_uInt16 nToken = sDeps.GetTokenCount(' ');
-                for ( i = 0 ; i < nToken ; i++)
-                {
-                    sDepName =  sDeps.GetToken( i, ' ' );
-
-                    pHObject_l = mpPrjIdMapper->Find( sDepName ); // mpPrjIdMapper
-                    if ( !pHObject_l )
-                    {
-                        String sMessage;
-                        sMessage += String::CreateFromAscii("can't find ");
-                        sMessage += String( sDepName, RTL_TEXTENCODING_UTF8 );
-                        sMessage += String::CreateFromAscii(".\ndependency ignored");
-                        WarningBox aBox( mpBaseWin, WB_OK, sMessage);
-                        aBox.Execute();
-                    }
-                    else
-                    {
-                        sTokenLine += String( sDepName, RTL_TEXTENCODING_UTF8 );
-                        sTokenLine +='\t';
-                        nHashedId = pHObject_l->GetId();
-                        pHObject_l = mpPrjIdMapper->Find( rBodyText ); // mpPrjIdMapper
-                        nObjectId_l = pHObject_l->GetId();
-                        AddConnectorToObjects( mpObjectPrjList, nHashedId, nObjectId_l );
-                    }
-                }
-            }
-
-            if ( mpPrj->Count() > 1 )
-            {
-                CommandData* pData = mpPrj->GetObject( mpPrj->Count() - 1 );
-                pData = mpPrj->Replace( pData, mpPrj->Count() - 2 );
-                mpPrj->Replace( pData, mpPrj->Count() - 1 );
-            }
-
-            return nObjectId;
-        }
-        return 0;
-}
-
-// Context-Menue
-IMPL_LINK( Depper, PopupSelected, PopupMenu*, mpPopup )
-{
-    sal_uInt16 nItemId = mpPopup->GetCurItemId();
-
-    switch( nItemId )
-    {
-        case DEPPOPUP_NEW :
-                {
-                    ByteString sNewItem = ByteString("new");
-                     //AddObject( mpObjectList, sNewItem , sal_True );
-                 }
-                break;
-        case DEPPOPUP_AUTOARRANGE :
-                //AutoArrange( mpObjectList, mpObjectList, GetStart(), 0 );
-                break;
-        case DEPPOPUP_LOAD :
-                //Load( ByteString("test.dep"));
-                break;
-        case DEPPOPUP_SAVE :
-                Save( ByteString("test.dep"));
-                break;
-        case DEPPOPUP_WRITE_SOURCE :
-                WriteSource();
-                break;
-        case DEPPOPUP_READ_SOURCE :
-                ReadSource(sal_True);
-                break;
-        case DEPPOPUP_OPEN_SOURCE :
-                OpenSource();
-                break;
-        case DEPPOPUP_ZOOMIN :
-        {
-//          DBG_ASSERT( FALSE,"zoomin");
-                MapMode aMapMode = GetDepWin()->GetMapMode();
-                aMapMode.SetScaleX( aMapMode.GetScaleX() * Fraction( 1.25 ));
-                aMapMode.SetScaleY( aMapMode.GetScaleY() * Fraction( 1.25 ));
-                GetDepWin()->SetMapMode( aMapMode );
-
-                if ( nZoomed < 1 )
-                {
-                    Size aZoomInSize( GetDepWin()->GetSizePixel());
-                    aZoomInSize.Width() *= 1.25;
-                    aZoomInSize.Height() *= 1.25;
-                    GetDepWin()->SetSizePixel( aZoomInSize );
-                }
-                nZoomed--;
-
-                Zoom( aMapMode );
-        };
-                break;
-        case DEPPOPUP_ZOOMOUT :
-        {
-//          DBG_ASSERT( FALSE,"zoomout");
-                MapMode aMapMode = GetDepWin()->GetMapMode();
-                if ( aMapMode.GetScaleX() > Fraction( 0.25 ))
-                {
-                    aMapMode.SetScaleX( aMapMode.GetScaleX() * Fraction( 0.8 ));
-                    aMapMode.SetScaleY( aMapMode.GetScaleY() * Fraction( 0.8 ));
-                    GetDepWin()->SetMapMode( aMapMode );
-
-                    if ( nZoomed < 0 )
-                    {
-                        Size aZoomOutSize( mpBaseWin->GetSizePixel());
-                        aZoomOutSize.Width() *= 0.8;
-                        aZoomOutSize.Height() *= 0.8;
-                        GetDepWin()->SetSizePixel( aZoomOutSize );
-                    }
-                    nZoomed++;
-
-                    Zoom( aMapMode );
-                }
-        };
-                break;
-        case DEPPOPUP_CLEAR :
-//          DBG_ASSERT( FALSE,"clear");
-//              RemoveAllObjects( mpObjectList );
-                break;
-        case DEPPOPUP_CLOSE :
-//          DBG_ASSERT( FALSE,"close");
-            CloseWindow();
-                break;
-        case DEPPOPUP_HELP :
-//          DBG_ASSERT( FALSE,"help");
-            ShowHelp();
-                break;
-        case DEPPOPUP_TEST :
-//          DBG_ASSERT( FALSE,"TEST!");
-//          test();
-                break;
-        case DEPPOPUP_SHOW_TOOLBOX:
-            maToolBox.Show();
-            break;
-        default :
-            DBG_ASSERT( sal_False, "default" );
-                break;
-    }
-    return 0;
-}
diff --git a/soldep/source/depwin.cxx b/soldep/source/depwin.cxx
deleted file mode 100644
index f3bb1875724a..000000000000
--- a/soldep/source/depwin.cxx
+++ /dev/null
@@ -1,164 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <tools/debug.hxx>
-
-#include <soldep/depwin.hxx>
-#include <soldep/depper.hxx>
-#include <soldep/connctr.hxx>
-#include <soldep/objwin.hxx>
-
-Bitmap* pWinCopy;
-
-DepWin::DepWin( Window* pParent, WinBits nWinStyle ) :
-    Window( pParent, nWinStyle ),
-    mbStartNewCon( sal_False ),
-    maNewConStart( 0, 0 ),
-    maNewConEnd( 0, 0 )
-//    mpSelectedProject( NULL ) unbekannt
-//  mpCapturer( NULL )
-{
-    if ( !pParent->IsChildNotify() )
-        pParent->EnableChildNotify( sal_True );
-//  if ( !pParent->IsAllResizeEnabled())
-//      pParent->EnableAllResize( sal_True );
-    SetUpdateMode( sal_True );
-    SetPosSizePixel( Point(0,0), Size( 2000, 2000 )); //Size of the scrollable Window
-    mpPopup = new PopupMenu();
-}
-
-DepWin::~DepWin()
-{
-    Hide();
-    while( ConList.Count() > 0 )
-    {
-        delete ConList.GetObject( 0 );
-    }
-//  if ( mpPopup )
-///     delete mpPopup;
-}
-
-void DepWin::AddConnector( Connector* pNewCon )
-{
-    ConList.Insert( pNewCon );
-}
-
-void DepWin::RemoveConnector( Connector* pOldCon )
-{
-    ConList.Remove( pOldCon );
-}
-
-void DepWin::NewConnector( ObjectWin* pWin )
-{
-    if ( !mbStartNewCon )
-    {
-        mpNewConWin = pWin;
-        mbStartNewCon = sal_True;
-        maNewConStart = pWin->GetFixPoint(Point(0,0));
-    }
-    else
-    {
-        Invalidate( Rectangle( maNewConStart, maNewConEnd ));
-        if ( pWin != mpNewConWin )
-        {
-//          Connector* pConctr;
-//          pConctr = new Connector( this, WB_NOBORDER );
-//          pConctr->Initialize( mpNewConWin, pWin );
-
-// AddConnector has been moved to soldep
-//          mpDepperDontuseme->AddConnector( mpNewConWin, pWin );
-        }
-        mpNewConWin = 0L;
-        mbStartNewCon = sal_False;
-    }
-
-}
-
-void DepWin::Paint( const Rectangle& rRect )
-{
-    sal_uIntPtr i = 0;
-    sal_uIntPtr nListCount = ConList.Count();
-
-    for ( i=0 ; i < nListCount ; i++ )
-    {
-        ConList.GetObject( i )->Paint( aEmptyRect );
-    }
-    if ( mbStartNewCon )
-    {
-        DrawLine( maNewConStart, maNewConEnd );
-    }
-}
-
-void DepWin::DrawOutput( OutputDevice* pDevice, const Point& rOffset  )
-{
-    sal_uIntPtr i = 0;
-    sal_uIntPtr nListCount = ConList.Count();
-
-    for ( i=0 ; i < nListCount ; i++ )
-    {
-        ConList.GetObject( i )->DrawOutput( pDevice, rOffset );
-    }
-    if ( mbStartNewCon )
-    {
-        pDevice->DrawLine( maNewConStart, maNewConEnd );
-    }
-}
-
-void DepWin::MouseButtonUp( const MouseEvent& rMEvt )
-{
-    if ( rMEvt.IsRight() )
-    {
-        mpPopup->Execute( this, rMEvt.GetPosPixel());
-    }
-}
-
-void DepWin::MouseMove( const MouseEvent& rMEvt )
-{
-    if ( mbStartNewCon )
-    {
-        Invalidate( Rectangle( maNewConStart, maNewConEnd ));
-        maNewConEnd = PixelToLogic(rMEvt.GetPosPixel());
-        maNewConStart = mpNewConWin->GetFixPoint( maNewConEnd );
-    }
-}
-
-
-ConnectorList*  DepWin::GetConnectorList()
-{
-    return &ConList;
-}
-
-void DepWin::SetPopupHdl( void* pHdl )
-{
-    mpPopup->SetSelectHdl( LINK( pHdl, Depper, PopupSelected ));
-}
-
-void DepWin::Command( const CommandEvent& rEvent)
-{
-    //mpDepperDontuseme->GetGraphWin()->Command( rEvent );
-    GetParent()->Command( rEvent );
-}
diff --git a/soldep/source/graphwin.cxx b/soldep/source/graphwin.cxx
deleted file mode 100644
index 7450d654ab38..000000000000
--- a/soldep/source/graphwin.cxx
+++ /dev/null
@@ -1,77 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <soldep/graphwin.hxx>
-//#include "depapp.hxx"
-#include <soldep/soldep.hxx>
-
-
-GraphWin::GraphWin( Window * pParent, void * pClass )
-: ScrollableWindow( pParent, 0L, SCRWIN_DEFAULT | SCRWIN_VCENTER | SCRWIN_HCENTER )
-, aBufferWindow( this )
-{
-    mpClass = pClass;
-    SetSizePixel( pParent->GetSizePixel());
-    SetPosPixel( pParent->GetPosPixel());
-    SetTotalSize( Size( 2000,2000 ));
-
-    aBufferWindow.SetBackground( Wallpaper( Color( COL_WHITE )));
-    aBufferWindow.SetPosSizePixel( PIXELS( 0, 0, 2000, 2000 ) );
-    aBufferWindow.Show(); // Content
-    Show();               // Window with Scrollbars
-}
-
-void GraphWin::EndScroll( long nDeltaX, long nDeltaY )
-{
-    // get the visible area
-    Rectangle aArea( GetVisibleArea());
-    long nX = aArea.Right();
-    long nY = aArea.Bottom();
-
-    // set the new pos and size by using LogicToPixel (this is mandatory)
-    aBufferWindow.SetPosSizePixel( LogicToPixel( Point( 0, 0 )),
-        LogicToPixel( Size( nX, nY )));
-    aBufferWindow.Invalidate();
-}
-
-void GraphWin::Resize()
-{
-    // get the visible area
-    ScrollableWindow::Resize();
-    Rectangle aArea( GetVisibleArea());
-    long nX = aArea.Right();
-    long nY = aArea.Bottom();
-
-    // set the new pos and size by using LogicToPixel (this is mandatory)
-    aBufferWindow.SetPosSizePixel( LogicToPixel( Point( 0, 0 )),
-        LogicToPixel( Size( nX, nY )));
-}
-
-void GraphWin::Command( const CommandEvent& rEvent)
-{
-    ScrollableWindow::Command( rEvent );
-}
diff --git a/soldep/source/makefile.mk b/soldep/source/makefile.mk
deleted file mode 100644
index 25cc78adeeba..000000000000
--- a/soldep/source/makefile.mk
+++ /dev/null
@@ -1,134 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=soldep
-TARGET=soldep
-
-
-# --- Settings -----------------------------------------------------
-#.INCLUDE :  $(PRJ)$/util$/perl.mk
-.INCLUDE :  settings.mk
-
-# fixme, code is not yet 64 bit clean
-.IF "$(OS)$(CPU)"=="LINUXX" || ("$(COM)"=="C52" && "$(CPU)"=="U")
-all:
-    @echo nothing to do
-.ENDIF
-
-
-# --- Files --------------------------------------------------------
-
-SLOFILES        = \
-    $(SLO)$/soldep.obj		\
-    $(SLO)$/soldlg.obj		\
-    $(SLO)$/depper.obj		\
-    $(SLO)$/hashobj.obj		\
-    $(SLO)$/connctr.obj		\
-    $(SLO)$/depwin.obj		\
-    $(SLO)$/graphwin.obj	\
-    $(SLO)$/tbox.obj		\
-    $(SLO)$/sdtresid.obj		\
-    $(SLO)$/objwin.obj
-
-SHL1TARGET	=$(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB	=$(TARGET)
-SHL1LIBS	=$(SLB)$/$(TARGET).lib \
-            $(SLB)$/bootstrpdt.lib
-SHL1DEF		=$(MISC)$/$(SHL1TARGET).def
-SHL1DEPN	=$(SHL1LIBS)
-SHL1STDLIBS     = $(SVTOOLLIB)		\
-                $(CPPUHELPERLIB)	\
-                $(COMPHELPERLIB)	\
-                $(VCLLIB)			\
-                $(UCBHELPERLIB)	\
-                $(SOTLIB)			\
-                $(TOOLSLIB) 		\
-                $(VOSLIB)			\
-                $(SALLIB)           \
-                $(CPPULIB)  \
-                   $(PERL_LIB)
-
-#.IF "$(GUI)" == "UNX"
-#SHL1STDLIBS+=\
-#		$(SALLIB)
-#.ENDIF
-
-
-DEF1NAME    =$(SHL1TARGET)
-DEF1DEPN	=$(MISC)$/$(SHL1TARGET).flt
-DEFLIB1NAME	=$(TARGET)
-
-SRC1FILES = \
-    soldlg.src
-RES1TARGET = dep
-SRS1NAME=$(TARGET)
-SRS1FILES = \
-    $(SRS)$/$(TARGET).srs
-
-RESLIB1NAME = dep
-RESLIB1SRSFILES = \
-    $(SRS)$/$(TARGET).srs
-
-
-#------------- Application ---------------
-APP1TARGET=soldepl
-
-APP1ICON=soldep.ico
-
-APP1STDLIBS= \
-            $(SVTOOLLIB)		\
-            $(CPPUHELPERLIB)	\
-            $(COMPHELPERLIB)	\
-            $(UCBHELPERLIB)	\
-            $(VCLLIB)			\
-            $(SOTLIB)			\
-            $(TOOLSLIB) 		\
-            $(VOSLIB)			\
-            $(SALLIB)           \
-               $(CPPULIB)  \
-               $(PERL_LIB)
-
-APP1LIBS=\
-    $(SLB)$/bootstrpdt.lib \
-    $(SLB)$/soldep.lib
-
-APP1OBJS= \
-    $(SLO)$/depapp.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-    @echo ------------------------------
-    @echo Making: $@
-    @echo WEP > $@
-    @echo LIBMAIN >> $@
-    @echo LibMain >> $@
-    @echo __CT >> $@
diff --git a/soldep/source/objwin.cxx b/soldep/source/objwin.cxx
deleted file mode 100644
index f87101254a96..000000000000
--- a/soldep/source/objwin.cxx
+++ /dev/null
@@ -1,821 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <tools/list.hxx>
-#include <tools/debug.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/help.hxx>
-#include <vcl/wall.hxx>
-
-#include <soldep/objwin.hxx>
-#include <soldep/depwin.hxx>
-//#include "depapp.hxx"
-#include <soldep/depper.hxx>
-//#include "prjdep.hxx"
-#include <soldep/connctr.hxx>
-#include <stdio.h>
-
-static Color aDefaultColor = 0L;
-static Wallpaper* pDefaultWallpaper = 0L;
-
-// Initialize static class member
-sal_Bool ObjectWin::msbHideMode = sal_False;
-sal_uIntPtr ObjectWin::msnGlobalViewMask = 0;
-
-
-sal_uInt32 aColorMap[] = {
-    RGB_COLORDATA( 0xFF, 0xFF, 0x80 ),             //MARKMODE_DEFAULT    0
-    COL_GREEN,              //MARKMODE_DEPENDING  1
-    COL_RED,                //MARKMODE_NEEDED     2
-    COL_MAGENTA,            //1+2
-    COL_GRAY,               //MARKMODE_ACTIVATED  4
-    COL_LIGHTGREEN,         //1+4
-    COL_LIGHTRED,           //2+4
-    COL_LIGHTMAGENTA,       //1+2+4
-    COL_BLUE,               //MARKMODE_SELECTED   8
-    COL_LIGHTGRAY,          //1+8
-    COL_CYAN,               //2+8
-    COL_LIGHTCYAN,          //1+2+8
-    COL_LIGHTBLUE,          //4+8
-    COL_BROWN,              //1+4+8
-    COL_BLACK,              //2+4+8
-    COL_BLUE                //1+2+4+8
-};
-
-
-//
-// class ObjectWin
-//
-
-/*****************************************************************************/
-ObjectWin::ObjectWin( Window* pParent, WinBits nWinStyle )
-/*****************************************************************************/
-                : Window( pParent, nWinStyle ),
-                msBodyText( "" ),
-                msTipText( "" ),
-                mnObjectId( 0 ),
-                mnMarkMode( 0 ),
-                mnViewMask( 0 ),
-                mbVisible( sal_False ),
-                mbMenuExecute( sal_False ),
-                mbVisited( sal_False ),
-                mnRootDist( 0 ),
-                mnHeadDist( 0 ),
-                mbFixed( sal_False )
-{
-    SetBackground( Wallpaper( aColorMap[0] ));
-
-    aTipTimer.SetTimeout( 500 );
-    aTipTimer.SetTimeoutHdl(
-    LINK( this, ObjectWin, TipHdl ));
-
-    SetFont( Font( GetFont() ) );
-    Font aFont( GetFont() );
-    Size aSize = aFont.GetSize();
-    aFont.SetSize( aSize );
-    SetFont( aFont );
-
-    EnableClipSiblings();
-    SetZOrder( NULL, WINDOW_ZORDER_FIRST );
-    mpPopup = new PopupMenu();
-    mpPopup->InsertItem( OBJWIN_EDIT_TEXT, String::CreateFromAscii( "Details" ));
-    mpPopup->InsertItem( OBJWIN_ADD_CONNECTOR, String::CreateFromAscii( "New connection" ));
-    mpPopup->InsertItem( OBJWIN_REMOVE_WIN, String::CreateFromAscii( "Remove object" ));
-    mpPopup->InsertItem( OBJWIN_VIEW_CONTENT, String::CreateFromAscii( "View content" ));
-//  mpPopup->InsertSeparator();
-    mpPopup->SetSelectHdl( LINK( this, ObjectWin, PopupSelected ));
-    mpPopup->SetDeactivateHdl( LINK( this, ObjectWin, PopupDeactivated ));
-    mnPopupStaticItems = mpPopup->GetItemCount();
-
-    if ( ! pDefaultWallpaper )
-    {
-        pDefaultWallpaper = new Wallpaper( GetBackground() );
-        aDefaultColor = GetTextColor();
-    }
-    Hide();
-}
-
-/*****************************************************************************/
-ObjectWin::~ObjectWin()
-/*****************************************************************************/
-{
-    while ( mConnections.Count() > 0 )
-    {
-        delete mConnections.GetObject( 0 );
-    }
-}
-
-void ObjectWin::SetHideMode(sal_Bool bHide)
-{
-    msbHideMode = bHide;
-    mConnections.GetObject(0)->SetHideMode(msbHideMode);
-}
-
-sal_Bool ObjectWin::ToggleHideMode()
-{
-    msbHideMode = !msbHideMode;
-    mConnections.GetObject(0)->SetHideMode(msbHideMode);
-    return msbHideMode;
-}
-
-/*****************************************************************************/
-void ObjectWin::SetViewMask( sal_uIntPtr nMask )
-/*****************************************************************************/
-{
-    mnViewMask = nMask;
-    // Compares
-    if ( mnViewMask & msnGlobalViewMask) {
-        mbVisible = sal_True;
-        Show();
-    }
-    else {
-        Hide();
-        mbVisible = sal_False;
-    }
-    for ( sal_uIntPtr i = 0; i < mConnections.Count(); i++ )
-        mConnections.GetObject( i )->UpdateVisibility();
-}
-
-/*****************************************************************************/
-void ObjectWin::SetBodyText( const ByteString& rNewString )
-/*****************************************************************************/
-{
-    msBodyText = rNewString;
-}
-
-/*****************************************************************************/
-ByteString& ObjectWin::GetBodyText()
-/*****************************************************************************/
-{
-    return msBodyText;
-}
-
-/*****************************************************************************/
-void ObjectWin::SetTipText( const ByteString& rNewString )
-/*****************************************************************************/
-{
-    msTipText = rNewString;
-}
-
-/*****************************************************************************/
-ByteString& ObjectWin::GetTipText()
-/*****************************************************************************/
-{
-    return msTipText;
-}
-
-/*****************************************************************************/
-Point ObjectWin::GetFixPoint( const Point& rRefPoint, sal_Bool bUseRealPos )
-/*****************************************************************************/
-{
-    Point aLocalPoint;
-    if ( bUseRealPos )
-        aLocalPoint = GetPosPixel();
-    else
-        aLocalPoint = GetCalcPosPixel();
-
-    Size aLocalSize = GetSizePixel();
-    Point aRetPoint;
-
-    sal_uInt16 nRefX = aLocalPoint.X() + aLocalSize.Width() / 2 ;
-    sal_uInt16 nRefY = aLocalPoint.Y() + aLocalSize.Height() / 2 ;
-
-    // always false...
-    //if ( nRefX < 0 ) nRefX = 0;
-    //if ( nRefY < 0 ) nRefY = 0;
-
-    if ( rRefPoint.X() > nRefX )
-    {
-        if ( rRefPoint.Y() > nRefY )
-        {
-            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
-            {
-                aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width();
-                aRetPoint.Y() = nRefY;
-            }
-            else
-            {
-                aRetPoint.X() = nRefX;
-                aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height();
-            }
-        }
-        else
-        {
-            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
-            {
-                aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width();
-                aRetPoint.Y() = nRefY;
-            }
-            else
-            {
-                aRetPoint.X() = nRefX;
-                aRetPoint.Y() = aLocalPoint.Y();
-            }
-        }
-    }
-    else
-    {
-        if ( rRefPoint.Y() > nRefY )
-        {
-            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
-            {
-                aRetPoint.X() = aLocalPoint.X();
-                aRetPoint.Y() = nRefY;
-            }
-            else
-            {
-                aRetPoint.X() = nRefX;
-                aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height();
-            }
-        }
-        else
-        {
-            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
-            {
-                aRetPoint.X() = aLocalPoint.X();
-                aRetPoint.Y() = nRefY;
-            }
-            else
-            {
-                aRetPoint.X() = nRefX;
-                aRetPoint.Y() = aLocalPoint.Y();
-            }
-        }
-    }
-
-    return PixelToLogic(aRetPoint);
-
-}
-
-/*****************************************************************************/
-void ObjectWin::AddConnector( Connector* pNewCon )
-/*****************************************************************************/
-{
-    mConnections.Insert( pNewCon );
-}
-
-/*****************************************************************************/
-sal_Bool ObjectWin::ConnectionExistsInAnyDirection( ObjectWin *pWin )
-/*****************************************************************************/
-{
-    for ( sal_uIntPtr i = 0; i < mConnections.Count(); i++ )
-        if ( mConnections.GetObject( i )->GetOtherWin( this ) == pWin )
-            return sal_True;
-
-    return sal_False;
-}
-
-/*****************************************************************************/
-void ObjectWin::RemoveConnector( Connector* pOldCon )
-/*****************************************************************************/
-{
-    mConnections.Remove( pOldCon );
-}
-
-/*****************************************************************************/
-Connector* ObjectWin::GetConnector( sal_uIntPtr nIndex )
-/*****************************************************************************/
-{
-    sal_uIntPtr nConCount = mConnections.Count();
-
-    if ( nIndex < nConCount )
-        return mConnections.GetObject( nIndex );
-    return NULL;
-}
-
-/*****************************************************************************/
-Connector* ObjectWin::GetConnector( sal_uIntPtr nStartId, sal_uIntPtr nEndId )
-/*****************************************************************************/
-{
-    if ( mnObjectId != nStartId )
-        return NULL;
-
-    sal_uInt16 i;
-    Connector* pCon;
-    sal_uIntPtr nConCount = mConnections.Count();
-
-    for ( i = 0; i < nConCount; i++ )
-    {
-        pCon = mConnections.GetObject( i );
-        if ( pCon->GetOtherWin( this )->GetId() == nEndId )
-            return pCon;
-    }
-    return NULL;
-}
-
-void ObjectWin::SetAllConnectorsUnvisible()
-{
-    Connector* pCon;
-    sal_uIntPtr nConCount = mConnections.Count();
-    for ( sal_uIntPtr i = 0; i < nConCount; i++ )
-    {
-        pCon = mConnections.GetObject( i );
-        if (pCon) pCon->SetVisibility( sal_False );
-    }
-}
-
-/*****************************************************************************/
-void ObjectWin::SetMarkMode( sal_uIntPtr nMarkMode )
-/*****************************************************************************/
-{
-    //Wallpaper aWallpaper;
-
-    if ( nMarkMode == MARKMODE_DEFAULT )
-    {
-        if ( pDefaultWallpaper )
-        {
-            maObjWallpaper = GetBackground();
-            maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() );
-            SetBackground( maObjWallpaper );
-            SetTextColor( aDefaultColor );
-        }
-    }
-    else
-    {
-        mnMarkMode |= nMarkMode;
-        maObjWallpaper = GetBackground();
-        maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] );
-        SetBackground( maObjWallpaper );
-        SetTextColor( COL_WHITE );
-    }
-
-    Invalidate();
-}
-
-/*****************************************************************************/
-void ObjectWin::UnsetMarkMode( sal_uIntPtr nMarkMode )
-/*****************************************************************************/
-{
-    //Wallpaper aWallpaper;
-
-    sal_uIntPtr nOldMode = mnMarkMode;
-    mnMarkMode &= ( !nMarkMode );
-
-    if ( nOldMode != mnMarkMode ) {
-        if ( mnMarkMode == MARKMODE_DEFAULT )
-        {
-            if ( pDefaultWallpaper )
-            {
-                maObjWallpaper = GetBackground();
-                maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() );
-                SetBackground( maObjWallpaper );
-                SetTextColor( aDefaultColor );
-            }
-        }
-        else
-        {
-            maObjWallpaper = GetBackground();
-            maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] ); //mnMarkMode
-            SetBackground( maObjWallpaper );
-            SetTextColor( COL_WHITE );
-        }
-        Invalidate();
-    }
-}
-
-/*****************************************************************************/
-void ObjectWin::MarkNeeded( sal_Bool bReset )
-/*****************************************************************************/
-{
-    Connector* pCon;
-    ObjectWin* pWin;
-
-    sal_uIntPtr nConCount = mConnections.Count();
-    sal_uIntPtr i;
-
-    for ( i = 0; i < nConCount; i++ )
-    {
-        pCon = mConnections.GetObject( i );
-        if ( pCon && !pCon->IsStart( this))
-        {
-            pWin = pCon->GetOtherWin( this );
-            if ( pWin )
-            {
-                if ( bReset )
-                    pWin->UnsetMarkMode( MARKMODE_NEEDED );
-                else
-                    pWin->SetMarkMode( MARKMODE_NEEDED );
-                pWin->MarkNeeded( bReset );                    // recursive call
-            }
-        }
-    }
-}
-
-/*****************************************************************************/
-void ObjectWin::MarkDepending( sal_Bool bReset )
-/*****************************************************************************/
-{
-    //if ( !bReset )
-    //  return;
-
-    Connector* pCon;
-    ObjectWin* pWin;
-
-    sal_uIntPtr nConCount = mConnections.Count();
-    sal_uIntPtr i;
-
-    for ( i = 0; i < nConCount; i++ )
-    {
-        pCon = mConnections.GetObject( i );
-        if ( pCon && pCon->IsStart( this) )
-        {
-            pWin = pCon->GetOtherWin( this );
-            if ( pWin )
-            {
-                if ( bReset )
-                    pWin->UnsetMarkMode( MARKMODE_DEPENDING );
-                else
-                    pWin->SetMarkMode( MARKMODE_DEPENDING );
-                pWin->MarkDepending( bReset );                  // recursive call
-            }
-        }
-    }
-}
-
-/*****************************************************************************/
-void ObjectWin::Paint( const Rectangle& rRect )
-/*****************************************************************************/
-{
-    Size  aWinSize  = PixelToLogic( GetOutputSizePixel() );
-    Size  aTextSize;
-    ByteString sbt = msBodyText;                         //debug
-    //sbt += " ";                                         //debug
-    //sbt += ByteString::CreateFromInt32(mnMarkMode);     //debug
-    aTextSize.Width() = GetTextWidth( String( msBodyText, RTL_TEXTENCODING_UTF8 ));
-    aTextSize.Height() = GetTextHeight();
-    Point aPos( aWinSize.Width() / 2  - aTextSize.Width() / 2,
-                aWinSize.Height() / 2 - aTextSize.Height() / 2 );
-
-    //DrawText( aPos , String( sBodyText, RTL_TEXTENCODING_UTF8 ));
-    if (msBodyText =="null") //don't paint this "window"
-    {
-        Hide();
-        Invalidate();
-    } else
-        DrawText( aPos , String( sbt, RTL_TEXTENCODING_UTF8 )); //debug
-}
-
-void ObjectWin::DrawOutput( OutputDevice* pDevice, const Point& rOffset )
-/*****************************************************************************/
-{
-    Size aWinSize  = PixelToLogic( GetSizePixel() );
-    Size aTextSize;
-    ByteString sbt = msBodyText;
-    aTextSize.Width() = GetTextWidth( String( msBodyText, RTL_TEXTENCODING_UTF8 ));
-    aTextSize.Height() = GetTextHeight();
-    Point aPos = GetPosPixel();
-    Point aTextPos( aWinSize.Width() / 2  - aTextSize.Width() / 2,
-                aWinSize.Height() / 2 - aTextSize.Height() / 2 );
-    aTextPos += aPos;
-    aPos = pDevice->PixelToLogic( aPos ) - rOffset;
-    aTextPos = pDevice->PixelToLogic( aTextPos ) - rOffset;
-    if ( msBodyText !="null" )
-    {
-        pDevice->SetFillColor( GetBackground().GetColor() );
-        pDevice->DrawRect( Rectangle( aPos, pDevice->PixelToLogic( GetSizePixel() ) ) );
-        Font aFont( GetFont() );
-        Size aSize = aFont.GetSize();
-        aSize = pDevice->PixelToLogic( aSize );
-        aFont.SetSize( aSize );
-        pDevice->SetFont( aFont );
-        pDevice->SetTextColor( GetTextColor() );
-        pDevice->DrawText( aTextPos, String( sbt, RTL_TEXTENCODING_UTF8 ) );
-    }
-}
-
-/*****************************************************************************/
-void ObjectWin::MouseButtonDown( const MouseEvent& rMEvt )
-/*****************************************************************************/
-{
-    //Notify Soldep to clear ObjectList
-    SetZOrder( NULL, WINDOW_ZORDER_FIRST );
-    GrabFocus();
-
-    // workaround fuer vcl-bug
-//  GetWindow( WINDOW_REALPARENT)->Invalidate();
-//    MyApp *pApp = (MyApp*)GetpApp();
-//    SolDep *pSoldep = pApp->GetSolDep();
-
-    maMouseOffset = rMEvt.GetPosPixel();
-    if ( rMEvt.IsLeft() )
-    {
-
-        if ( rMEvt.IsMod2() )               // alt + mouse click left
-        {
-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT, this );
-        }
-        else {
-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN, this );
-        }
-        if( rMEvt.GetClicks() == 2 )
-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK, this );
-        else if ( !rMEvt.IsShift() && !((DepWin*)GetParent())->IsStartNewCon())
-        {
-            //((DepWin*)GetParent())->SaveSelectedObjWin(&this);
-            CaptureMouse();
-        }
-    }
-}
-
-/*****************************************************************************/
-void ObjectWin::MouseButtonUp( const MouseEvent& rMEvt )
-/*****************************************************************************/
-{
-    fprintf(stdout,"ObjectWin::MouseButtonUp\n");
-    if ( rMEvt.IsLeft() )
-    {
-        if ( rMEvt.IsShift() || ((DepWin*)GetParent())->IsStartNewCon())
-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP_SHFT, this );
-//          ((DepWin*)GetParent())->NewConnector( this );
-        else
-        {
-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP, this );
-            if ( IsMouseCaptured() ) ReleaseMouse();
-        }
-    }
-    else if ( rMEvt.IsRight() )
-    {
-        sal_uInt16 i;
-
-        while ( mnPopupStaticItems < mpPopup->GetItemCount() )
-        {
-            mpPopup->RemoveItem( mnPopupStaticItems );
-        }
-
-        if ( mConnections.Count()) {
-            mpPopup->InsertSeparator();
-
-            for( i = 0; i < mConnections.Count() ; i++ )
-            {
-                mpPopup->InsertItem( mnPopupStaticItems + i + 1, String( ((mConnections.GetObject( i ))->GetOtherWin( this ))->GetBodyText(), RTL_TEXTENCODING_UTF8 ));
-            }
-        }
-        mbMenuExecute = sal_True;
-        mpPopup->Execute( GetParent(), rMEvt.GetPosPixel() + GetPosPixel());
-    }
-}
-
-/*****************************************************************************/
-void ObjectWin::MouseMove( const MouseEvent& rMEvt )
-/*****************************************************************************/
-{
-    if ( IsMouseCaptured() )
-    {
-        sal_uInt16 i;
-
-        Point aNewWinPos( GetPosPixel() + rMEvt.GetPosPixel() - maMouseOffset );
-
-        aNewWinPos.X() = Max( 0L, aNewWinPos.X());
-        aNewWinPos.Y() = Max( 0L, aNewWinPos.Y());
-        SetPosPixel( aNewWinPos );
-        //int t = mConnections.Count();
-
-        for ( i=0; i < mConnections.Count();i++)
-        {
-            mConnections.GetObject( i )->UpdatePosition( this );
-        }
-    }
-    else // !IsMouseCaptured()
-    {
-        if ( rMEvt.IsLeaveWindow() )
-            aTipTimer.Stop();
-        else
-            aTipTimer.Start();
-
-        MouseEvent aNewMEvt( rMEvt.GetPosPixel() + GetPosPixel());
-
-        GetParent()->MouseMove( aNewMEvt ); //call to DepWin::MouseMove
-    }
-}
-
-/*****************************************************************************/
-sal_uInt16 ObjectWin::Save( SvFileStream& rOutFile )
-/*****************************************************************************/
-{
-    return 0;
-}
-
-/*****************************************************************************/
-sal_uInt16 ObjectWin::Load( SvFileStream& rInFile )
-/*****************************************************************************/
-{
-    return 0;
-}
-
-/*****************************************************************************/
-void ObjectWin::SetId( sal_uIntPtr nId )
-/*****************************************************************************/
-{
-    mnObjectId = nId;
-}
-
-/*****************************************************************************/
-sal_uIntPtr ObjectWin::GetId()
-/*****************************************************************************/
-{
-    return mnObjectId;
-}
-
-/*****************************************************************************/
-void ObjectWin::UpdateConnectors()
-/*****************************************************************************/
-{
-    sal_uInt16 i;
-
-    for ( i = 0; i < mConnections.Count(); i++ )
-    {
-        mConnections.GetObject( i )->UpdatePosition( this );
-    }
-}
-
-IMPL_LINK( ObjectWin, PopupSelected, PopupMenu*, mpPopup_l )
-{
-    sal_uInt16 nItemId = mpPopup_l->GetCurItemId();
-
-    switch( nItemId )
-    {
-        case OBJWIN_EDIT_TEXT :
-            DBG_ASSERT( sal_False,"edit");
-                break;
-        case OBJWIN_REMOVE_WIN :
-//          DBG_ASSERT( FALSE,"remove");
-//          DBG_ASSERT( mpDepperDontuseme,"remove");
-            //mpDepperDontuseme->RemoveObject(mpDepperDontuseme->mpObjectList, ( sal_uInt16 ) GetId());
-                break;
-        case OBJWIN_ADD_CONNECTOR :
-//          DBG_ASSERT( FALSE,"add con");
-            ((DepWin*)GetParent())->NewConnector( this );
-                break;
-        case OBJWIN_VIEW_CONTENT :
-//          DBG_ASSERT( FALSE,"view cnt");
-//          mpDepperDontuseme->ViewContent( msBodyText );
-//          TBD: CallEventListener
-                break;
-        default :
-//          DBG_ASSERT( sal_False, String (nItemId) );
-            Connector* pCon = mConnections.GetObject( nItemId - mnPopupStaticItems - 1);
-            pCon = 0;
-//          delete pCon;
-//          mpDepperDontuseme->RemoveConnector( pCon->GetStartId(), pCon->GetEndId());
-//          TBD: CallEventListener
-
-                break;
-    }
-    return 0;
-}
-
-/*****************************************************************************/
-IMPL_LINK( ObjectWin, TipHdl, void *, EMTY_ARG )
-/*****************************************************************************/
-{
-    aTipTimer.Stop();
-
-    if ( msTipText.Len()) {
-        Point aPos( GetpApp()->GetAppWindow()->GetPointerPosPixel());
-        Help::ShowBalloon( GetpApp()->GetAppWindow(),
-            Point( aPos.X(), aPos.Y()),
-            String( msTipText, RTL_TEXTENCODING_UTF8 ));
-    }
-    return 0;
-}
-
-/*****************************************************************************/
-//void ObjectWin::GetFocus()
-/*****************************************************************************/
-//{
-    //SetMarkMode( MARKMODE_SELECTED );
-//}
-
-/*****************************************************************************/
-void ObjectWin::LoseFocus()
-/*****************************************************************************/
-{
-    if ( !mbMenuExecute && !msbHideMode ) {
-        UnsetMarkMode( MARKMODE_SELECTED );
-        UnsetMarkMode( MARKMODE_ACTIVATED );
-        MarkNeeded( sal_True );
-        MarkDepending( sal_True );
-    }
-    else
-        mbMenuExecute = sal_False;
-}
-
-/*****************************************************************************/
-IMPL_LINK( ObjectWin, PopupDeactivated, PopupMenu*, mpPopup_l )
-/*****************************************************************************/
-{
-    mbMenuExecute = sal_False;
-
-    if ( !HasFocus()) {
-        UnsetMarkMode( MARKMODE_SELECTED );
-        UnsetMarkMode( MARKMODE_ACTIVATED );
-           MarkNeeded( sal_True );
-        MarkDepending( sal_True );
-    }
-
-    return 0;
-}
-
-/*****************************************************************************/
-void ObjectWin::Command( const CommandEvent& rEvent)
-/*****************************************************************************/
-{
-    fprintf(stdout, "ObjectWin::Command");
-//  mpDepperDontuseme->GetGraphWin()->Command( rEvent );
-//          TBD: CallEventListener
-
-}
-
-/*****************************************************************************/
-/*****************************************************************************/
-
-ObjectList::ObjectList() : ObjWinList()
-{
-}
-
-/*****************************************************************************/
-void ObjectList::ResetSelectedObject()
-/*****************************************************************************/
-{
-//    return;
-
-    sal_uIntPtr nCount_l = Count();
-    ObjectWin* pObjectWin = NULL;
-    for (sal_uIntPtr i=0; i < nCount_l; i++ )
-    {
-        pObjectWin = GetObject( i );
-        pObjectWin->UnsetMarkMode( MARKMODE_SELECTED );
-        pObjectWin->UnsetMarkMode( MARKMODE_NEEDED );
-        pObjectWin->UnsetMarkMode( MARKMODE_DEPENDING );
-        pObjectWin->SetActualWallpaper(*pDefaultWallpaper);
-        pObjectWin->SetAllConnectorsUnvisible();
-    }
-    return;
-}
-
-/*****************************************************************************/
-ObjectWin* ObjectList::GetPtrByName( const ByteString& rText )
-/*****************************************************************************/
-{
-    sal_uIntPtr i = 0;
-    sal_uIntPtr nCount_l = Count();
-    ObjectWin* pObjectWin = NULL;
-    while ( i < nCount_l )
-    {
-       pObjectWin = GetObject( i );
-       ByteString sPrj = pObjectWin->GetBodyText();
-       if (sPrj == rText) return pObjectWin;
-       i++;
-    }
-    return 0;
-}
-
-ObjectList* ObjectList::FindTopLevelModules()
-{
-    ObjectList* pList = new ObjectList;
-    for ( sal_uInt16 i=0; i<Count(); i++ )
-    {
-       ObjectWin* pObjectWin = GetObject( i );
-       if ( pObjectWin->IsTop() )
-           pList->Insert( pObjectWin );
-    }
-
-    return pList;
-}
-
-sal_Bool ObjectWin::IsTop()
-{
-    sal_uIntPtr nConCount = mConnections.Count();
-    for ( sal_uIntPtr i = 0; i < nConCount; i++ )
-    {
-        Connector* pCon = mConnections.GetObject( i );
-        if ( pCon && pCon->IsStart( this) )
-            return sal_False;
-    }
-
-    return sal_True;
-}
diff --git a/soldep/source/sdtresid.cxx b/soldep/source/sdtresid.cxx
deleted file mode 100644
index 60d550982ba1..000000000000
--- a/soldep/source/sdtresid.cxx
+++ /dev/null
@@ -1,49 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <soldep/sdtresid.hxx>
-
-SolDevDll::SolDevDll()
-{
-    *(SolDevDll**)GetAppData( SHL_SCH ) = this;
-
-    ByteString aResMgrName( "dep" );
-
-    pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(),
-            Application::GetSettings().GetUILocale() );
-}
-
-SolDevDll::~SolDevDll()
-{
-    delete pResMgr;
-}
-
-DtSodResId::DtSodResId( sal_uInt16 nId ) :
-ResId(nId, *(*(SolDevDll**)GetAppData( SHL_SCH ))->GetResMgr())
-{
-}
-
diff --git a/soldep/source/soldep.cxx b/soldep/source/soldep.cxx
deleted file mode 100644
index 2ab3afefd92c..000000000000
--- a/soldep/source/soldep.cxx
+++ /dev/null
@@ -1,1807 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-//TBD: ToolBox handling prjview/back
-
-#include <osl/file.hxx>
-#include <rtl/ustring.hxx>
-#include <tools/debug.hxx>
-#include <soldep/sstring.hxx>
-#include <svtools/filedlg.hxx>
-#include <tools/iparser.hxx>
-#include <tools/geninfo.hxx>
-#include <vcl/gdimtf.hxx>
-#include <vcl/bitmap.hxx>
-#include <soldep/appdef.hxx>
-#include "time.h"
-#include <soldep/depper.hxx>
-#include <soldep/soldep.hxx>
-#include <soldep/soldlg.hxx>
-#include "dtsodcmp.hrc"
-
-IMPLEMENT_HASHTABLE_OWNER( SolIdMapper, ByteString, sal_uIntPtr* );
-//IMPLEMENT_HASHTABLE_OWNER( PrjIdMapper, ByteString, sal_uIntPtr* );
-#define EVENT_RESIZE                0x00000001
-#define MIN(a,b) (a)<(b)?(a):(b)
-#define MAX(a,b) (a)>(b)?(a):(b)
-
-
-//ByteString sDelimiterLine("#==========================================================================");
-
-
-//
-// class SolDep
-//
-
-/*****************************************************************************/
-SolDep::SolDep( Window* pBaseWindow )
-/*****************************************************************************/
-                : Depper( pBaseWindow ),
-                mbBServer(sal_False),
-                mpTravellerList( NULL ),
-                mbIsHide( sal_False )
-{
-    mnSolWinCount = 0;
-    mnSolLastId = 0;
-//    mpPrjIdMapper = new SolIdMapper( 63997 );
-    maTaskBarFrame.EnableAlwaysOnTop();
-    maTaskBarFrame.Show();
-    maToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 ));
-    maToolBox.SetSelectHdl( LINK ( this, SolDep, ToolSelect ));
-    maToolBox.Show();
-
-    mpBaseWin->AddChildEventListener( LINK( this, SolDep, ChildWindowEventListener ));
-
-    // Kontext-Menue (geh�rt zu soldep.cxx)
-    InitContextMenueMainWnd();
-    InitContextMenuePrjViewWnd( mpBasePrjWin );
-}
-
-/*****************************************************************************/
-SolDep::~SolDep()
-/*****************************************************************************/
-{
-    mpBaseWin->RemoveChildEventListener( LINK( this, SolDep, ChildWindowEventListener ) );
-    delete mpSolIdMapper;
-    delete mpStarWriter;
-    delete mpStandLst;
-}
-
-/*****************************************************************************/
-void SolDep::Init()
-/*****************************************************************************/
-{
-    InformationParser aParser;
-    String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US );
-    mpStandLst = aParser.Execute( sStandLst );
-    ByteString aUpdater( getenv("UPDATER") );
-    if ( mpStandLst && (aUpdater == "YES") ) {
-        if ( GetVersion() )
-            ReadSource( sal_True );
-    } else
-    {
-        ReadSource();   // if stand.lst isn't available
-    }
-}
-
-/*****************************************************************************/
-void SolDep::Init( ByteString &rVersion, GenericInformationList *pVersionList )
-/*****************************************************************************/
-{
-    // Interface for bs
-    mbBServer=sal_True;
-    if ( pVersionList )
-        mpStandLst = new GenericInformationList( *pVersionList );
-    else {
-        InformationParser aParser;
-        String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US );
-        mpStandLst = aParser.Execute( sStandLst );
-    }
-    if ( mpStandLst ) {
-        msVersionMajor = ByteString( rVersion );
-        ReadSource(sal_True); //call from build server set UPDATER to TRUE
-    }
-}
-
-/*****************************************************************************/
-IMPL_LINK( SolDep, ChildWindowEventListener, VclSimpleEvent*, pEvent )
-/*****************************************************************************/
-{
-    if ( pEvent && pEvent->ISA( VclWindowEvent ) )
-    {
-        ProcessChildWindowEvent( *static_cast< VclWindowEvent* >( pEvent ) );
-    }
-    return 0;
-}
-
-
-/*****************************************************************************/
-void SolDep::ProcessChildWindowEvent( const VclWindowEvent& _rVclWindowEvent )
-/*****************************************************************************/
-{
-    Window* pChildWin = _rVclWindowEvent.GetWindow();
-//    Window* pParentWin = pChildWin->GetParent();
-//Resize();
-    if ( isAlive() )
-        {
-            sal_uIntPtr id = _rVclWindowEvent.GetId();
-            switch ( id )
-            {
-                case VCLEVENT_USER_MOUSEBUTTON_DOWN:
-                    {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            // handle mouse click on ObjectWin object
-                            ObjectWin* pWin = (ObjectWin*) pChildWin;
-                            //GetObjectList()->ResetSelectedObject();
-                            if (IsHideMode())      // simple mouse click left
-                            {
-                                pWin->CaptureMouse();
-                                pWin->SetMarkMode( MARKMODE_SELECTED );
-                                pWin->MarkNeeded();
-                                pWin->MarkDepending();
-                                pWin->Invalidate();
-                            } else
-                            {
-                                pWin->LoseFocus();
-                                pWin->SetMarkMode( MARKMODE_SELECTED );
-                                pWin->UnsetMarkMode( MARKMODE_ACTIVATED );
-                                pWin->MarkNeeded( sal_True );
-                                pWin->MarkDepending( sal_True );
-                            }
-
-                        }
-                    }
-                    break;
-                case VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT:
-                    {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            ObjectWin* pWin = (ObjectWin*) pChildWin;
-                            MarkObjects( pWin );
-                        }
-                    }
-                    break;
-                case VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK:
-                    {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            if (IsHideMode()) ToggleHideDependency();
-                            ByteString text = ((ObjectWin*) pChildWin)->GetBodyText();
-                            ViewContent(text);
-                        }
-                    }
-                    break;
-                case VCLEVENT_USER_MOUSEBUTTON_UP_SHFT:
-                    {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            ObjectWin* pWin = (ObjectWin*) pChildWin;
-                            GetDepWin()->NewConnector( pWin );
-                        }
-                    }
-                    break;
-                case VCLEVENT_USER_MOUSEBUTTON_UP:
-                     {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            ObjectWin* pWin = (ObjectWin*) pChildWin;
-                            pWin->ReleaseMouse();
-                            pWin->SetMarkMode(MARKMODE_SELECTED);
-                            GetDepWin()->Invalidate();
-                        }
-                     }
-                     break;
-            }    // switch
-        }  // if isAlive
-        //fprintf(stdout,"BLA::Resize: %d\n",pChildWin);
-}
-
-/*****************************************************************************/
-IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox)
-/*****************************************************************************/
-{
-    sal_uInt16 nItemId = pBox->GetCurItemId();
-    switch ( nItemId )
-    {
-        case TID_SOLDEP_FIND:
-            FindProject();
-            break;
-        case TID_SOLDEP_CREATEMETA :
-        {
-            VirtualDevice   aVDev;
-            aVDev.SetMapMode( MAP_100TH_MM );
-            GDIMetaFile     aMtf;
-            aVDev.EnableOutput( sal_False );
-            aMtf.Record( &aVDev );
-
-            aVDev.SetLineColor( Color( COL_BLACK ) );
-            aVDev.SetTextAlign( ALIGN_TOP );
-
-            Size aSize( GetDepWin()->GetOutputSizePixel() );
-            long nXMin = aSize.Width();
-            long nXMax = 0;
-            long nYMax = 0;
-            long nYMin = aSize.Height();
-
-            for ( sal_uInt16 i=0; i<mpObjectList->Count(); i++ )
-            {
-                Point aPoint = mpObjectList->GetObject(i)->GetPosPixel();
-                Size aSize = mpObjectList->GetObject(i)->GetSizePixel();
-                nXMin = MIN( aPoint.X(), nXMin );
-                nXMax = MAX( aPoint.X() + aSize.Width(), nXMax );
-                nYMin = MIN( aPoint.Y(), nYMin );
-                nYMax = MAX( aPoint.Y() + aSize.Height(), nYMax );
-            }
-
-            Point aOffset( nXMin, nYMin );
-            aOffset = aVDev.PixelToLogic( aOffset );
-
-            GetDepWin()->DrawOutput( &aVDev, aOffset );
-            for ( sal_uInt16 i=0; i<mpObjectList->Count(); i++ )
-                if ( mpObjectList->GetObject(i)->IsVisible() )
-                    mpObjectList->GetObject(i)->DrawOutput( &aVDev, aOffset );
-
-            aMtf.Stop();
-            aMtf.WindStart();
-            aMtf.SetPrefMapMode( aVDev.GetMapMode() );
-            Size aDevSize( nXMax-nXMin + 10, nYMax-nYMin + 10);
-            aDevSize =  aVDev.PixelToLogic( aDevSize );
-            aMtf.SetPrefSize( aDevSize );
-            SvFileStream aStream( String::CreateFromAscii("d:\\out.svm"), STREAM_STD_READWRITE );
-            aMtf.Write( aStream );
-            break;
-        }
-        case TID_SOLDEP_HIDE_INDEPENDEND:
-            {
-                ToggleHideDependency();
-                for ( sal_uInt16 i=0; i<mpObjectList->Count(); i++ )
-                    mpObjectList->GetObject(i)->SetViewMask(!mbIsHide);
-
-                   maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());
-                   GetDepWin()->Invalidate(); //repaint Main-View
-            }
-            break;
-        case TID_SOLDEP_SELECT_WORKSPACE:
-            if (mpStandLst)
-            {
-                if (GetVersion()) // Version dialog box
-                {
-                    delete mpSolIdMapper;
-                    delete mpStarWriter;
-                    mpObjectList->ClearAndDelete();
-                    ReadSource(sal_True);
-                }
-            }
-            break;
-        case TID_SOLDEP_BACK:
-            maToolBox.HideItem(TID_SOLDEP_BACK);
-            maToolBox.ShowItem(TID_SOLDEP_SELECT_WORKSPACE);  //disabled for prj view (doubleclick ObjWin)
-            maToolBox.ShowItem(TID_SOLDEP_HIDE_INDEPENDEND);  //disabled for prj view (doubleclick ObjWin)
-            maToolBox.ShowItem(TID_SOLDEP_FIND);              //disabled for prj view (doubleclick ObjWin)
-            maToolBox.Resize();
-            TogglePrjViewStatus();
-            break;
-    }
-    return 0;
-}
-
-/*****************************************************************************/
-void SolDep::ToggleHideDependency()
-/*****************************************************************************/
-{
-    mbIsHide = !mbIsHide;
-    maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());
-    ObjectWin* pWin = GetObjectList()->GetObject( 0 );
-    pWin->ToggleHideMode();
-};
-
-/*****************************************************************************/
-sal_Bool SolDep::GetVersion()
-/*****************************************************************************/
-{
-    SolSelectVersionDlg aVersionDlg( GetDepWin(), mpStandLst );
-    if ( aVersionDlg.Execute() == RET_OK ) {
-        msVersionMajor = aVersionDlg.GetVersionMajor();
-        msVersionMinor = aVersionDlg.GetVersionMinor();
-        return sal_True;
-    }
-    return sal_False;
-}
-
-void SolDep::InitContextMenueMainWnd()
-{
-    InitContextMenuePrjViewWnd( mpBaseWin );
-    return; // Disable not actually supported items
-
-    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_AUTOARRANGE, String::CreateFromAscii("Autoarrange")) ;
-    mpBaseWin->mpPopup->InsertSeparator();
-    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_READ_SOURCE, String::CreateFromAscii("Revert all changes") );
-    mpBaseWin->mpPopup->InsertSeparator();
-    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_OPEN_SOURCE, String::CreateFromAscii("Open") );
-    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_WRITE_SOURCE, String::CreateFromAscii("Save") );
-}
-
-void SolDep::InitContextMenuePrjViewWnd(DepWin* pBaseWin )
-{
-    // temp. disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_NEW, String::CreateFromAscii("New object") );
-    pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMIN, String::CreateFromAscii("Zoom in") );
-    pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMOUT, String::CreateFromAscii("Zoom out") );
-    pBaseWin->mpPopup->InsertSeparator();
-    // temp disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_CLEAR, String::CreateFromAscii("Clear") );
-    pBaseWin->mpPopup->InsertItem( DEPPOPUP_SHOW_TOOLBOX, String::CreateFromAscii("Show Toolbox") );
-}
-
-/*****************************************************************************/
-ObjectWin *SolDep::RemoveObject( sal_uInt16 nId, sal_Bool bDelete )
-/*****************************************************************************/
-{
-    Prj* pPrj;
-
-//hshtable auf stand halten
-    ObjectWin* pWin = RemoveObjectFromList( mpObjectList, mnSolWinCount, nId, sal_False );
-    if ( pWin )
-    {
-        ByteString aBodyText( pWin->GetBodyText() );
-        if( (pPrj = mpStarWriter->GetPrj( aBodyText )) )
-        {
-            mpStarWriter->Remove( pPrj );
-//cleanup ist teuer...
-            mpStarWriter->CleanUp();
-            delete pPrj;
-        }
-        else
-            DBG_ASSERT( sal_False, "project not found - write" );
-
-        mpSolIdMapper->Delete( aBodyText );
-        if ( bDelete )
-            delete pWin;
-        return pWin;
-    }
-    else
-        return NULL;
-}
-
-/*****************************************************************************/
-sal_uIntPtr SolDep::AddObject( ByteString& rBodyText, sal_Bool bInteract )
-/*****************************************************************************/
-{
-    sal_uIntPtr nObjectId;
-    if ( bInteract )
-    {
-        nObjectId = HandleNewPrjDialog( rBodyText );
-    }
-    else
-    {
-//hashtable auf stand halten
-        MyHashObject* pHObject;
-        nObjectId = AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, rBodyText, sal_False );
-        pHObject = new MyHashObject( nObjectId, ObjIdToPtr(mpObjectList, nObjectId ));
-        mpSolIdMapper->Insert( rBodyText, pHObject );
-    }
-    return nObjectId;
-}
-
-/*****************************************************************************/
-sal_uIntPtr SolDep::AddPrjObject( ByteString& rBodyText, sal_Bool bInteract )
-/*****************************************************************************/
-{
-    sal_uIntPtr nObjectId;
-    if ( bInteract )
-    {
-        nObjectId = HandleNewDirectoryDialog( rBodyText );
-    }
-    else
-    {
-//hshtable auf stand halten
-        MyHashObject* pHObject;
-        nObjectId = AddObjectToList( mpBasePrjWin, mpObjectPrjList, mnPrjLastId, mnPrjWinCount, rBodyText );
-        pHObject = new MyHashObject( nObjectId, ObjIdToPtr( mpObjectPrjList, nObjectId ));
-        mpPrjIdMapper->Insert( rBodyText, pHObject ); // mpPrjIdMapper
-    }
-    return nObjectId;
-}
-
-/*****************************************************************************/
-sal_uInt16 SolDep::AddConnector( ObjectWin* pStartWin, ObjectWin* pEndWin )
-/*****************************************************************************/
-{
-//  DBG_ASSERT( FALSE , "not yet" );
-    ByteString sEndName = pEndWin->GetBodyText();
-    ByteString sStartName = pStartWin->GetBodyText();
-
-    Prj* pPrj = mpStarWriter->GetPrj( sEndName );
-    if ( pPrj )
-    {
-        pPrj->AddDependencies( sStartName );
-        return AddConnectorToObjects( pStartWin, pEndWin );
-    }
-    else
-    {
-        DBG_ASSERT( sal_False , "non existing Project" );
-        return 1;
-    }
-}
-
-/*****************************************************************************/
-sal_uInt16 SolDep::RemoveConnector( ObjectWin* pStartWin, ObjectWin* pEndWin )
-/*****************************************************************************/
-{
-    SByteStringList* pPrjDeps = NULL;
-    ByteString sEndName = pEndWin->GetBodyText();
-    ByteString sStartName = pStartWin->GetBodyText();
-
-    Prj* pPrj = mpStarWriter->GetPrj( sEndName );
-    pPrjDeps = pPrj->GetDependencies( sal_False );
-    if ( pPrjDeps )
-    {
-        ByteString* pString;
-        sal_uIntPtr nPrjDepsCount = pPrjDeps->Count();
-        for ( sal_uIntPtr j = nPrjDepsCount; j > 0; j-- )
-        {
-            pString = pPrjDeps->GetObject( j - 1 );
-            if ( pString->GetToken( 0, '.') == sStartName )
-                pPrjDeps->Remove( pString );
-        }
-    }
-
-    return RemoveConnectorFromObjects( pStartWin, pEndWin );
-}
-
-/*****************************************************************************/
-void SolDep::RemoveAllObjects( ObjectList* pObjLst )
-/*****************************************************************************/
-{
-
-    Depper::RemoveAllObjects( pObjLst );
-
-    if ( mpSolIdMapper )
-    {
-        delete mpSolIdMapper;
-        mpSolIdMapper = NULL;
-    }
-    if ( mpStarWriter )
-    {
-        delete mpStarWriter;
-        mpStarWriter = NULL;
-    }
-}
-
-/*****************************************************************************/
-sal_uIntPtr SolDep::GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList)
-/*****************************************************************************/
-{
-//  DBG_ASSERT( FALSE , "soldep" );
-    MyHashObject* pHObject = pIdMapper->Find( "null" );//null_project
-
-    if ( !pHObject ) {
-        ByteString sNullPrj = "null";//null_project
-        sal_uIntPtr nObjectId = AddObject( sNullPrj, sal_False );
-        ObjIdToPtr( pObjList, nObjectId )->SetViewMask( 1 );
-        return nObjectId;
-    }
-
-    return pHObject->GetId();
-}
-
-/*****************************************************************************/
-sal_uIntPtr SolDep::GetStartPrj(SolIdMapper* , ObjectList* )
-/*****************************************************************************/
-{
-//  DBG_ASSERT( FALSE , "prjdep" );
-    MyHashObject* pHObject = mpPrjIdMapper->Find( ByteString( "null" ) ); //null_dir
-    if ( !pHObject )
-    {
-        ByteString bsNull("null");
-        sal_uIntPtr nObjectId = AddPrjObject( bsNull, sal_False); //null_dir
-        return nObjectId;
-    }
-    else
-        return pHObject->GetId();
-}
-
-/*****************************************************************************/
-sal_uInt16 SolDep::OpenSource()
-/*****************************************************************************/
-{
-    if ( mpStandLst ) {
-        if ( GetVersion())
-            return ReadSource();
-    }
-    return 0;
-}
-
-/*****************************************************************************/
-sal_uInt16 SolDep::ReadSource(sal_Bool bUpdater)
-/*****************************************************************************/
-{
-    mpBaseWin->EnablePaint( sal_False );
-    mpBaseWin->Hide();
-    sal_uIntPtr nObjectId, nHashedId;
-    sal_uIntPtr i;
-    MyHashObject* pHObject;
-    ByteString* pStr;
-    ObjectWin *pStartWin, *pEndWin;
-
-    mpSolIdMapper = new SolIdMapper( 63997 );
-    if (mpStandLst && bUpdater)
-    {
-        mpStarWriter = new StarWriter( mpStandLst, msVersionMajor, msVersionMinor, sal_True );
-    } else
-    {
-        SolarFileList* pSolarFileList;
-        pSolarFileList = GetPrjListFromDir();
-        mpStarWriter = new StarWriter( pSolarFileList, sal_True );
-    }
-    ByteString sTitle( SOLDEPL_NAME );
-    if ( mpStarWriter->GetMode() == STAR_MODE_SINGLE_PARSE ) {
-        sTitle += ByteString( " - mode: single file [" );
-           sTitle += (ByteString) mpStarWriter->GetName();
-        sTitle += ByteString( "]" );
-    }
-    else if ( mpStarWriter->GetMode() == STAR_MODE_MULTIPLE_PARSE ) {
-        sTitle += ByteString( " - mode: multiple files [" );
-        sTitle += ByteString( "]" );
-    }
-    SetTitle( String( sTitle, RTL_TEXTENCODING_UTF8) );
-
-    sal_uIntPtr nCount = mpStarWriter->Count();
-    for ( i=0; i<nCount; i++ )
-    {
-        Prj *pPrj = mpStarWriter->GetObject(i);
-        ByteString sPrjName = pPrj->GetProjectName();
-        nObjectId = AddObject( sPrjName, sal_False );
-        ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 1 );
-    }
-    for ( i=0; i<nCount; i++ )
-    {
-        Prj *pPrj = mpStarWriter->GetObject(i);
-        SByteStringList *pLst = pPrj->GetDependencies( sal_False );
-        if ( pLst )
-        {
-            sal_uIntPtr nDepCount = pLst->Count();
-            for ( sal_uIntPtr m=0; m<nDepCount; m++)
-            {
-                pStr = pLst->GetObject(m);
-                pHObject = mpSolIdMapper->Find( *pStr );
-                /*if ( !pHObject )
-                {
-    // create new prj
-                    Prj *pNewPrj = new Prj( *pStr );
-                    ByteString sPrjName = pNewPrj->GetProjectName();
-                    nObjectId = AddObject( sPrjName, sal_False );
-                    pHObject = mpSolIdMapper->Find( *pStr );
-                    ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 2 );
-                }*/
-
-                if ( pHObject )
-                {
-                nHashedId = pHObject->GetId();
-                ByteString sF_Os2 = pPrj->GetProjectName();
-                pStr = &sF_Os2;
-                pHObject = mpSolIdMapper->Find( *pStr );
-                nObjectId = pHObject->GetId();
-                pStartWin = ObjIdToPtr( mpObjectList, nHashedId );
-                pEndWin = ObjIdToPtr( mpObjectList, nObjectId );
-                AddConnectorToObjects( pStartWin, pEndWin );
-            }
-        }
-    }
-    }
-    if (!IsPrjView())
-    {
-        AutoArrange( mpSolIdMapper, mpObjectList, GetStart(mpSolIdMapper,mpObjectList), 0, GetStart(mpSolIdMapper,mpObjectList) );
-        GetDepWin()->EnablePaint( sal_True );
-    }
-    return 0;
-}
-
-SolarFileList* SolDep::GetPrjListFromDir()
-{
-    SolarFileList* pSolarFileList = new SolarFileList();
-    String sPrjDir( String::CreateFromAscii( "prj" ));
-    String sBuildLst( String::CreateFromAscii( "build.lst" ));
-    DirEntry aCurrent( getenv( SOURCEROOT ) );
-
-    aCurrent.ToAbs();
-    Dir aDir( aCurrent, FSYS_KIND_DIR );
-
-    sal_uInt16 nEntries = aDir.Count();
-    if( nEntries )
-    {
-        UniStringList aSortDirList;
-        for ( sal_uInt16 n = 0; n < nEntries; n++ )
-        {
-            DirEntry& rEntry = aDir[n];
-            UniString aName( rEntry.GetName() );
-            if( aName.Len() && ( aName.GetChar(0) != '.' ) && rEntry.Exists() )
-            {
-                rEntry += DirEntry( sPrjDir );
-                rEntry += DirEntry( sBuildLst );
-                if (rEntry.Exists())
-                {
-                    pSolarFileList->Insert( new String( rEntry.GetFull() ), LIST_APPEND );
-                    ByteString aName_dbg(rEntry.GetFull(),RTL_TEXTENCODING_UTF8);
-                    fprintf(stdout, "bla:%s\n", aName_dbg.GetBuffer());
-                }
-            }
-        }
-    }
-    if ( !pSolarFileList->Count() )
-    {
-         //is empty!! TBD
-         delete pSolarFileList;
-         return NULL;
-    }
-    return pSolarFileList;
-}
-
-/*****************************************************************************/
-sal_uInt16 SolDep::WriteSource()
-/*****************************************************************************/
-{
-/* zur Sicherheit deaktiviert
-    sal_uInt16 nMode = mpStarWriter->GetMode();
-    if ( nMode == STAR_MODE_SINGLE_PARSE ) {
-        ByteString sFileName = mpStarWriter->GetName();
-        if ( sFileName.Len()) {
-            mpStarWriter->Write( String( sFileName, RTL_TEXTENCODING_UTF8) );
-            mpStarWriter->RemoveProject( ByteString( "null"));  //null_project
-        }
-    }
-    else if ( nMode == STAR_MODE_MULTIPLE_PARSE ) {
-    // *OBO*
-    //String sRoot = mpStarWriter->GetSourceRoot();
-    //nicht mehr unterst�tzt mpStarWriter->GetSourceRoot()
-        ByteString sFileName = mpStarWriter->GetName();
-        DirEntry aEntry( sFileName );
-        aEntry.ToAbs();
-        aEntry = aEntry.GetPath().GetPath().GetPath();
-        String sRoot = aEntry.GetFull();
-
-        if ( sRoot.Len()) {
-            mpStarWriter->RemoveProject( ByteString( "null")); //null_project
-            mpStarWriter->WriteMultiple( sRoot );
-        }
-    }
-*/
-    return 1;
-}
-
-sal_uInt16 SolDep::Load( const ByteString& rFileName )
-{
-// moved from depper class
-    DBG_ASSERT( sal_False , "you are dead!" );
-    SvFileStream aInFile( String( rFileName, RTL_TEXTENCODING_UTF8 ), STREAM_READ );
-    depper_head dh;
-    sal_uIntPtr i;
-    sal_uIntPtr nLoadOffs = mnSolLastId;     //or Prj??
-    ObjectWin* pNewWin;
-    aInFile.Read( &dh, sizeof( dh ));
-
-    sal_uIntPtr nObjCount = dh.nObjectCount;
-    sal_uIntPtr nCnctrCount = dh.nCnctrCount;
-
-    for ( i=0; i < nObjCount ; i++ )
-    {
-        ObjectWin* pWin = new ObjectWin( mpBaseWin, WB_BORDER );
-        pWin->Load( aInFile );
-        pNewWin = ObjIdToPtr( mpObjectList, AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, pWin->GetBodyText(), sal_False ));
-        pNewWin->SetId( nLoadOffs + pWin->GetId());
-        pNewWin->SetPosPixel( pWin->GetPosPixel());
-        pNewWin->SetSizePixel( pWin->GetSizePixel());
-    }
-
-    sal_uIntPtr nStartId;
-    sal_uIntPtr nEndId;
-//  ueber addconnector fuehren!
-    for ( i=0; i < nCnctrCount ; i++ )
-    {
-        Connector* pCon = new Connector( mpBaseWin, WB_NOBORDER );
-        pCon->Load( aInFile );
-
-        nStartId = nLoadOffs + pCon->GetStartId();
-        nEndId = nLoadOffs + pCon->GetEndId();
-
-        ObjectWin* pStartWin = ObjIdToPtr( mpObjectList, nStartId );
-        ObjectWin* pEndWin = ObjIdToPtr( mpObjectList, nEndId );
-
-        pCon->Initialize( pStartWin, pEndWin );
-    }
-
-
-    return 0;
-}
-
-/*****************************************************************************/
-sal_Bool SolDep::ViewContent( ByteString& rObjectName )
-/*****************************************************************************/
-{
-    mpFocusWin = NULL;
-    SetPrjViewStatus(sal_True);
-
-    for ( sal_uIntPtr i = 0; i < mpObjectList->Count() && !mpFocusWin; i++ )
-        if ( mpObjectList->GetObject( i )->HasFocus())
-            mpFocusWin = mpObjectList->GetObject( i );
-    //HideObjectsAndConnections( mpObjectList );
-    mpProcessWin->Resize();
-    GetDepWin()->Show();
-    return InitPrj( rObjectName );
-}
-
-/*****************************************************************************/
-sal_Bool SolDep::InitPrj( ByteString& rListName )
-/*****************************************************************************/
-{
-    sal_uIntPtr nObjectId, nHashedId;
-    sal_uIntPtr i, j;
-    MyHashObject* pHObject;
-    ByteString *pDepName;
-    ByteString *pFlagName;
-    Prj* pPrj;
-    ObjectWin *pStartWin, *pEndWin;
-    maToolBox.HideItem(TID_SOLDEP_SELECT_WORKSPACE);
-    maToolBox.HideItem(TID_SOLDEP_HIDE_INDEPENDEND);
-    maToolBox.HideItem(TID_SOLDEP_FIND);
-    maToolBox.ShowItem(TID_SOLDEP_BACK);
-    maToolBox.Invalidate();
-
-    //clean up
-    mpObjectPrjList->ClearAndDelete();
-    GetDepWin()->ClearConnectorList();
-    if (mpPrjIdMapper) delete mpPrjIdMapper;
-    mpPrjIdMapper = new SolIdMapper( 63997 ); //generate clean mapper
-    mnPrjWinCount = 0;
-    mnPrjLastId = 0;
-
-    sal_uIntPtr nCount = mpStarWriter->Count();
-    GetDepWin()->EnablePaint( sal_False );
-    Point aPnt = GetGraphWin()->GetPosPixel();
-    Size aSize = GetGraphWin()->GetSizePixel();
-
-    GetGraphWin()->SetPosSizePixel( aPnt, aSize );         // Hier wird das Window gesetzt
-
-    sal_Bool bReturn = sal_False;
-
-    for ( i=0; i<nCount; i++ )
-    {
-// pPrj->GetProjectName() returns the name of
-// the project e.g. svtools
-        pPrj = mpStarWriter->GetObject(i);
-        ByteString sPrjName = pPrj->GetProjectName();
-        if ( sPrjName == rListName )
-        {
-            bReturn = sal_True;
-
-            mpPrj = mpStarWriter->GetObject(i);
-            sal_uIntPtr nDirCount = mpPrj->Count();
-            for ( j=0; j<nDirCount; j++ )
-            {
-                CommandData *pData = mpPrj->GetObject(j);
-                fprintf( stdout, "\tProjectDir : %s\n",
-                        pData->GetLogFile().GetBuffer());
-// pData->GetLogFile() contains internal project IDs
-// e.g. st_mkout etc.
-                if ( pData->GetLogFile() != "" )
-                {
-                    ByteString sItem = pData->GetLogFile();
-                    nObjectId = AddPrjObject( sItem, sal_False);
-// there may be faster ways......
-                    ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
-                    pWin->SetViewMask( 0x0001 );
-// pData->GetPath() contains internal project directories
-// e.g. svtools/inc etc.
-                    ByteString sPath = pData->GetPath();
-                    pWin->SetTipText( sPath );
-                }
-            }
-
-// set connectors for dependencies here
-            for ( j=0; j<nDirCount; j++ )
-            {
-                CommandData *pData = mpPrj->GetObject(j);
-                SByteStringList *pDeps = pData->GetDependencies();
-                if ( pDeps )
-                {
-                    ByteString sFlagName = pData->GetLogFile();
-                    pFlagName = &sFlagName;
-                    //pHObject = mpPrjIdMapper->Find( (*pFlagName).GetToken( 0, '.'));//mpSolIdMapper see ReadSource()
-                    pHObject = mpPrjIdMapper->Find( sFlagName.GetToken( 0, '.'));
-                    if (pHObject)
-                    {
-
-                        nObjectId = pHObject->GetId();
-
-                        sal_uIntPtr nDepCount = pDeps->Count();
-                        for ( sal_uIntPtr k=0; k<nDepCount; k++ )
-                        {
-                            pDepName = pDeps->GetObject(k);
-                            pHObject = mpPrjIdMapper->Find( (*pDepName).GetToken( 0, '.'));
-                            if (pHObject )
-                            {
-                                nHashedId = pHObject->GetId();
-                                pStartWin = ObjIdToPtr( mpObjectPrjList, nHashedId );
-                                pEndWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
-
-                                AddConnectorToObjects( pStartWin, pEndWin );
-                            }
-                            else
-                            {
-                                String sMessage;
-                                sMessage += String::CreateFromAscii("can't find ");
-                                sMessage += String( *pDepName, RTL_TEXTENCODING_UTF8 );
-                                sMessage += String::CreateFromAscii(".\ndependency ignored");
-                                WarningBox aBox( GetDepWin(), WB_OK, sMessage);
-                                aBox.Execute();
-                            }
-                        }
-                    }
-                }
-
-            }
-
-            break;
-        }
-    }
-    ByteString sNullDir = "null";
-    nObjectId = AddPrjObject( sNullDir, sal_False);
-    ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
-    pWin->SetViewMask( 0x0001 );
-    mpGraphPrjWin->EnablePaint( sal_True );
-    //debug
-//    int test_l = GetStartPrj(mpPrjIdMapper, mpObjectPrjList);
-//    ObjectWin *pTestWin = ObjIdToPtr( mpObjectPrjList, test_l );
-    AutoArrange( mpPrjIdMapper, mpObjectPrjList, GetStartPrj(mpPrjIdMapper, mpObjectPrjList), 0, GetStartPrj(mpPrjIdMapper, mpObjectPrjList) );
-    mpGraphWin->Hide();
-    mpGraphPrjWin->Show();
-    mpGraphPrjWin->Invalidate();
-
-    return bReturn;
-}
-
-/*****************************************************************************/
-sal_uInt16 SolDep::CloseWindow()
-/*****************************************************************************/
-{
-
-    ((SystemWindow*)mpProcessWin)->Close();
-    return 0;
-}
-
-/*****************************************************************************/
-void SolDep::ShowHelp()
-/*****************************************************************************/
-{
-    SvFileStream aHelpFile( String::CreateFromAscii( "g:\\soldep.hlp" ), STREAM_READ );
-    String aHelpText;
-    ByteString aGetStr;
-
-    if ( aHelpFile.IsOpen() )
-    {
-        while ( aHelpFile.ReadLine( aGetStr ) )
-        {
-            aHelpText += String (aGetStr, RTL_TEXTENCODING_UTF8);
-            aHelpText += String::CreateFromAscii("\n");
-        }
-    }
-    else
-        aHelpText = String::CreateFromAscii("No Helpfile found.");
-
-    SolHelpDlg aHelpDlg( mpBaseWin, DtSodResId( RID_SD_DIALOG_HELP ));
-    aHelpDlg.maMLEHelp.SetText( aHelpText );
-    aHelpDlg.maMLEHelp.SetReadOnly();
-    aHelpDlg.maMLEHelp.EnableFocusSelectionHide( sal_True );
-    aHelpDlg.Execute();
-}
-
-/*****************************************************************************/
-sal_Bool SolDep::FindProject()
-/*****************************************************************************/
-{
-    SolFindProjectDlg aFindProjectDlg( GetDepWin(), GetObjectList() );
-    ObjectWin* pObjectWin = NULL;
-    mpObjectList->ResetSelectedObject();
-    if (IsHideMode())
-    {
-        GetDepWin()->Invalidate();
-    }
-
-    mpFocusWin=NULL;
-
-    if ( aFindProjectDlg.Execute() == RET_OK ) {
-        msProject = aFindProjectDlg.GetProject();
-        //now we have a project string
-
-        pObjectWin = mpObjectList->GetPtrByName( msProject );
-        if (pObjectWin)
-        {
-            mpObjectList->ResetSelectedObject();
-            MarkObjects( pObjectWin );
-        }
-        else
-        {
-            mpObjectList->ResetSelectedObject();
-            for ( sal_uInt16 i=0; i<mpObjectList->Count(); i++ )
-            {
-               ObjectWin* pObjectWin = mpObjectList->GetObject( i );
-               if ( !pObjectWin->IsTop() )
-                    pObjectWin->SetViewMask(sal_False);
-            }
-        }
-    }
-    return sal_False;
-}
-
-sal_Bool SolDep::MarkObjects( ObjectWin* pObjectWin )
-{
-    if (pObjectWin)
-    {
-        if (!(pObjectWin->IsNullObject()))
-        {
-            pObjectWin->SetMarkMode( MARKMODE_SELECTED );
-              pObjectWin->MarkNeeded();
-            pObjectWin->MarkDepending();
-            if (IsHideMode())
-            {
-                GetDepWin()->Invalidate();
-            }
-        } else
-        {
-            fprintf(stdout,"null\n");
-        }
-    }
-    return sal_True;
-}
-
-void SolDep::Resize()
-{
-//funzt! mu� aber von der applikation aufgerufen werden.
-    Point aOutPos = Point( 0, 0 );
-    Size aOutSize = mpProcessWin->GetOutputSizePixel();
-        // calculate output size
-    sal_uIntPtr nTaskHeight = maToolBox.CalcWindowSizePixel().Height();
-    sal_uIntPtr nTaskWidth  = maToolBox.CalcWindowSizePixel().Width();
-    Size aSize( aOutSize.Width(), nTaskHeight );
-
-//  sal_uIntPtr nMenuHeight = 0;
-    Point aGraphWinPos = Point(0,0);
-    Size  aGraphWinSize = Size(0,0);
-
-//wei� nicht wie:    nMenuHeight = aMenuBar.GetWindow()->GetSizePixel().Height(); //H�he des Menues
-
-    //aInRect = pTBManager->Resize( Rectangle( aOutPos, aOutSize );
-    // Set Docking-Rectangle for ToolBar
-    Rectangle aInRect;
-
-    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_TOP ))
-    {
-        // waagerechte Toolbar oben
-        maToolBox.SetPosSizePixel( aOutPos, Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height()));
-        if( maToolBox.IsVisible())
-        {
-            Point aOutPosTmp;
-            Size aOutSizeTmp;
-            aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height());
-            aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());
-            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
-            aGraphWinPos = Point( 0, nTaskHeight );
-            aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight);
-        }
-    }
-    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_BOTTOM ))
-    {
-        // waagerechte Toolbar unten
-        Point aTbPos  = Point( aOutPos.X(), aOutPos.Y() + aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());
-        Size  aTbSize = Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height());
-        maToolBox.SetPosSizePixel( aTbPos, aTbSize );
-        if( maToolBox.IsVisible())
-        {
-            Point aOutPosTmp;
-            Size aOutSizeTmp;
-            aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height());
-            aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());
-            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
-            aGraphWinPos = Point( 0, 0 );
-            aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight);
-        }
-    }
-    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_LEFT ))
-    {
-        // senkrechte ToolBar links
-        maToolBox.SetPosSizePixel( aOutPos, Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height()));
-        if( maToolBox.IsVisible())
-        {
-            Point aOutPosTmp;
-            Size aOutSizeTmp;
-            aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());
-            aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());
-            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
-            aGraphWinPos = Point( nTaskWidth, 0 );
-            aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height());
-        }
-    }
-    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_RIGHT ))
-    {
-        // senkrechte ToolBar rechts
-        Point aTbPos = Point( aOutPos.X() + aOutSize.Width() - maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());
-        Size  aTbSize= Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());
-        maToolBox.SetPosSizePixel( aTbPos, aTbSize);
-        if( maToolBox.IsVisible())
-        {
-            Point aOutPosTmp;
-            Size aOutSizeTmp;
-            aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());
-            aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());
-            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
-            aGraphWinPos = Point( 0, 0 );
-            aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height());
-        }
-    }
-
-    Rectangle rout = Rectangle( Point( 0,0 ), aOutSize ); //OutputToScreenPixel( aOutPos )
-    Rectangle rin  = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())
-                Size( aOutSize.Width(), aOutSize.Height()));
-/*
-    Rectangle rout = mpProcessWin->OutputToScreenPixel( aOutPos );
-    Rectangle rin  = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())
-                Size( aOutSize.Width(), aOutSize.Height()));
-*/
-    maToolBox.SetDockingRects( rout, rin );
-
-    sal_Bool bFloating = maToolBox.IsFloatingMode();
-
-    if ( bFloating )
-    {
-        GetGraphWin()->SetPosSizePixel(Point(0,0),aOutSize);
-        //if (IsPrjView() && (mpPrjDep)) mpPrjDep->Resize();
-        if (maToolBox.IsVisible()) maToolBox.Show();
-    } else
-    {
-        GetGraphWin()->SetPosSizePixel( aGraphWinPos, aGraphWinSize );
-    }
-    if (maToolBox.IsVisible()) maToolBox.Show();
-}
-
-sal_uInt16 SolDep::AddConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin )
-{
-//  DBG_ASSERT( FALSE , "not yet" );
-    ByteString sEndName = pEndWin->GetBodyText();
-    ByteString sStartName = pStartWin->GetBodyText();
-    if ( sStartName != ByteString("null"))
-    {
-        CommandData* pEndData = mpPrj->GetDirectoryData( sEndName );
-        SByteStringList* pDeps = pEndData->GetDependencies();
-        if ( pDeps )
-            pDeps->PutString( &sStartName );
-        else
-        {
-            pDeps = new SByteStringList();
-            pEndData->SetDependencies( pDeps );
-            pDeps->PutString( &sStartName );
-            pEndData->GetDependencies();
-        }
-    }
-    return AddConnectorToObjects( pStartWin, pEndWin );
-}
-
-sal_uInt16 SolDep::RemoveConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin )
-{
-    ByteString sEndName = pEndWin->GetBodyText();
-    ByteString sStartName = pStartWin->GetBodyText();
-    CommandData* pEndData = mpPrj->GetDirectoryData( sEndName );
-    SByteStringList* pDeps = pEndData->GetDependencies();
-    if ( pDeps )
-    {
-        ByteString* pString;
-        sal_uIntPtr nDepsCount = pDeps->Count();
-        for ( sal_uIntPtr j = nDepsCount; j > 0; j-- )
-        {
-            pString = pDeps->GetObject( j - 1 );
-            if ( pString->GetToken( 0, '.') == sStartName )
-                pDeps->Remove( pString );
-        }
-    }
-    return RemoveConnectorFromObjects( pStartWin, pEndWin );
-}
-
-sal_uInt16 SolDep::AutoArrange( SolIdMapper* pIdMapper, ObjectList* pObjLst, sal_uIntPtr nTopId, sal_uIntPtr nBottmId, sal_uIntPtr aObjID )
-{
-    AutoArrangeDlgStart();
-    OptimizePos(pIdMapper, pObjLst, nTopId, nBottmId, aObjID );
-    AutoArrangeDlgStop();
-    return 0;
-}
-
-Point SolDep::CalcPos( sal_uInt16 nSet, sal_uInt16 nIndex )
-{
-    int nRowIndex = nIndex / DEPPER_MAX_WIDTH;
-    sal_uIntPtr nPosX = mnXOffset + nRowIndex % 3 * GetDefSize().Width() / 3 + ( nIndex - ( DEPPER_MAX_WIDTH * nRowIndex )) * (GetDefSize().Width() + OBJWIN_X_SPACING );
-
-    sal_uIntPtr nPosY = ( nSet + mnLevelOffset + nRowIndex ) * ( GetDefSize().Height() + OBJWIN_Y_SPACING ) + OBJWIN_Y_SPACING;
-    Point aPos( nPosX, nPosY );
-    return aPos;
-}
-
-sal_uIntPtr SolDep::CalcXOffset( sal_uIntPtr nObjectsToFit )
-{
-    long nDynXOffs;
-    long nXMiddle;
-    sal_uIntPtr nTrigger;
-
-    nXMiddle = GetDepWin()->PixelToLogic( GetDepWin()->GetSizePixel()).Width() / 2;
-    if ( nObjectsToFit > DEPPER_MAX_WIDTH )
-        nObjectsToFit = DEPPER_MAX_WIDTH - 1 + DEPPER_MAX_WIDTH % 2;
-    nTrigger = ( nObjectsToFit - 1 ) / 2;
-    nDynXOffs = ( GetDefSize().Width() + OBJWIN_X_SPACING ) * nTrigger;
-    sal_uIntPtr nXOffs = nXMiddle - nDynXOffs;
-
-    if ( sal_uIntPtr(nXMiddle - nDynXOffs) < mnMinDynXOffs )
-        mnMinDynXOffs = nXMiddle - nDynXOffs;
-
-    return nXOffs;
-
-}
-
-double SolDep::CalcDistSum( ObjWinList* pObjList, DistType eDistType )
-{
-    ObjectWin* pWin;
-    Connector* pCon;
-    sal_uIntPtr nObjCount = pObjList->Count();
-    double dRetVal = 0;
-    double dWinVal;
-    sal_uInt16 i, j;
-    sal_Bool bIsStart;
-
-    for ( i = 0; i < nObjCount; i++ )
-    {
-        pWin = pObjList->GetObject( i );
-
-        if ( pWin && pWin->IsVisible())
-        {
-            j = 0;
-            dWinVal = 0;
-            while ( (pCon = pWin->GetConnector( j )) )
-            {
-                if ( pCon->IsVisible()) {
-                    bIsStart = pCon->IsStart( pWin );
-                    if ( eDistType != BOTH )
-                        if ( eDistType == TOPDOWN )
-                        {
-                            if ( bIsStart )
-                            {
-                                pCon->UpdatePosition( pWin, sal_False );
-                                dWinVal += pCon->GetLen() * pWin->mnHeadDist;
-                            }
-                        }
-                        else
-                        {
-                            if ( !bIsStart )
-                            {
-                                pCon->UpdatePosition( pWin, sal_False );
-                                dWinVal += pCon->GetLen() * pWin->mnRootDist;
-                            }
-
-                        }
-                    else
-                    {
-                        pCon->UpdatePosition( pWin, sal_False );
-                        if ( !bIsStart )
-                            dWinVal += pCon->GetLen() * ( pWin->mnHeadDist + 1 );
-                        else
-                            dWinVal += pCon->GetLen() * pWin->mnRootDist;
-                    }
-                }
-                j++;
-            }
-//          if ( j != 0 )
-//              dWinVal /= j;
-            dRetVal += dWinVal;
-        }
-    }
-
-    return dRetVal;
-}
-
-sal_uInt16 SolDep::Impl_Traveller( ObjectWin* pWin, sal_uInt16 nDepth )
-{
-    sal_uInt16 i = 0;
-    ObjectWin* pNewWin;
-    Connector* pCon;
-
-    nDepth++;
-
-    sal_uInt16 nMaxDepth = nDepth;
-
-    pWin->mbVisited = sal_True;
-    pWin->mnRootDist = Max ( nDepth, pWin-> mnRootDist );
-    if ( nDepth > DEPPER_MAX_DEPTH )
-    {
-        DBG_ASSERT( nDepth != DEPPER_MAX_DEPTH + 1, "Ringabh�ngigkeit!" );
-        nDepth++;
-        return DEP_ENDLES_RECURSION_FOUND;
-    }
-
-    while ( (pCon = pWin->GetConnector( i )) )
-    {
-        if ( pCon->IsStart( pWin )&& pCon->IsVisible() ) //removed: don't show null_project
-        {
-            pNewWin = pCon->GetOtherWin( pWin );
-            nMaxDepth = Max( Impl_Traveller( pNewWin, nDepth ), nMaxDepth );
-            if( nMaxDepth == DEP_ENDLES_RECURSION_FOUND )
-            {
-                mpTravellerList->Insert( pWin, LIST_APPEND );
-                return DEP_ENDLES_RECURSION_FOUND;
-            }
-        }
-        i++;
-    }
-    pWin->mnHeadDist = MAX( pWin->mnHeadDist, nMaxDepth - nDepth );
-    return nMaxDepth;
-}
-
-
-double SolDep::Impl_PermuteMin( ObjWinList& rObjList, Point* pPosArray, ObjWinList& rResultList, double dMinDist, sal_uIntPtr nStart, sal_uIntPtr nSize, DistType eDistType )
-{
-
-    sal_uIntPtr i, j, l;
-    sal_uIntPtr nEnd = nStart + nSize;
-    ObjectWin* pSwapWin;
-    sal_uIntPtr nLevelObjCount = rObjList.Count();
-
-//dont use full recusion for more than 6 objects
-    if ( nLevelObjCount > 6 )
-    {
-        srand(( unsigned ) time( NULL ));
-
-        sal_uIntPtr nIdx1, nIdx2;
-        for ( i = 0; i < 101; i++ )
-        {
-            UpdateSubProgrssBar(i);
-            for ( j = 0; j < 100; j++ )
-            {
-                nIdx1 = (sal_uIntPtr) ( double( rand() ) / RAND_MAX * nLevelObjCount );
-                while ( rObjList.GetObject( nIdx1 ) == NULL )
-                    nIdx1 = (sal_uIntPtr) ( double( rand() ) / RAND_MAX * nLevelObjCount );
-                nIdx2 = (sal_uIntPtr) ( double( rand() ) / RAND_MAX * nLevelObjCount );
-                while ( nIdx1 == nIdx2 || nIdx2 == nLevelObjCount )
-                    nIdx2 = (sal_uIntPtr) ( double( rand() ) / RAND_MAX * nLevelObjCount );
-
-                pSwapWin = rObjList.GetObject( nIdx1 );
-                if ( pSwapWin )
-                    pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] );
-                pSwapWin = rObjList.Replace( pSwapWin, nIdx2 );
-                if ( pSwapWin )
-                    pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] );
-                rObjList.Replace( pSwapWin, nIdx1 );
-
-                double dCurDist = CalcDistSum( &rObjList, eDistType );
-
-                if ( dCurDist < dMinDist )
-                {
-                    dMinDist = dCurDist;
-                    rResultList.Clear();
-                    for ( l = 0; l < nLevelObjCount; l++ )
-                    {
-                        pSwapWin = rObjList.GetObject( l );
-                        rResultList.Insert( pSwapWin, LIST_APPEND);
-                    }
-                }
-//              if ( dCurDist > dMinDist * 1.5 )
-                if ( dCurDist > dMinDist * 15 )
-                {
-                    pSwapWin = rObjList.GetObject( nIdx1 );
-                    if ( pSwapWin )
-                        pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] );
-                    pSwapWin = rObjList.Replace( pSwapWin, nIdx2 );
-                    if ( pSwapWin )
-                        pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] );
-                    rObjList.Replace( pSwapWin, nIdx1 );
-                }
-            }
-        }
-    }
-    else
-    {
-        for ( i = nStart ; i < nEnd; i++)
-        {
-            if ( nSize > 1 )
-            {
-                pSwapWin = rObjList.GetObject( i );
-                pSwapWin = rObjList.Replace( pSwapWin, nStart );
-                rObjList.Replace( pSwapWin, i );
-                double dPermuteDist = Impl_PermuteMin( rObjList, pPosArray, rResultList, dMinDist, nStart + 1, nSize - 1, eDistType );
-                dMinDist = MIN( dMinDist, dPermuteDist);
-                pSwapWin = rObjList.GetObject( i );
-                pSwapWin = rObjList.Replace( pSwapWin, nStart );
-                rObjList.Replace( pSwapWin, i );
-
-            }
-            else
-            {
-                for ( l = 0; l < nLevelObjCount; l++ )
-                {
-                    pSwapWin = rObjList.GetObject( l );
-                    if ( pSwapWin )
-                        pSwapWin->SetCalcPosPixel( pPosArray[ l ] );
-                }
-
-                double dCurDist = CalcDistSum( &rObjList, eDistType );
-
-                if ( dCurDist < dMinDist )
-                {
-                    dMinDist = dCurDist;
-                    rResultList.Clear();
-                    for ( l = 0; l < nLevelObjCount; l++ )
-                    {
-                        pSwapWin = rObjList.GetObject( l );
-                        rResultList.Insert( pSwapWin, LIST_APPEND);
-                    }
-                }
-
-            }
-        }
-    }
-
-    return dMinDist;
-}
-
-
-sal_uInt16 SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, sal_uIntPtr nTopId, sal_uIntPtr nBottmId, sal_uIntPtr aObjID )
-{
-    ObjWinList aWorkList;
-    ObjectWin* pWin;
-    Connector* pCon;
-    sal_uInt16 nRootDist = (sal_uInt16) -1;
-    sal_uInt16 i, j, k, l, nRetVal;
-    sal_uInt16 LevelUse[ DEPPER_MAX_DEPTH ];
-    sal_uInt16 LevelSecUse[ DEPPER_MAX_DEPTH ];
-    ObjWinList* LevelList[ DEPPER_MAX_DEPTH ];
-    ObjWinList* LevelSecList[ DEPPER_MAX_DEPTH ];
-    Point aPosArray[ DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH ];
-
-    mnMinDynXOffs = 0xffff;
-
-    for ( i = 0; i < DEPPER_MAX_DEPTH; i++ )
-    {
-        LevelUse[ i ] = 0;
-        LevelList[ i ] = NULL;
-        LevelSecUse[ i ] = 0;
-        LevelSecList[ i ] = NULL;
-    }
-
-    GetDepWin()->EnablePaint( sal_False );
-
-    sal_uIntPtr nObjCount = pObjLst->Count();
-    for ( i = 0; i < nObjCount; i++ )
-    {
-        pWin = pObjLst->GetObject( i );
-        if ( pWin->IsVisible()) {
-            pWin->mbVisited = sal_False;
-            pWin->mnHeadDist = 0;
-            pWin->mnRootDist = 0;
-
-            // find initial objects which need to be connected with
-            // root object
-            j = 0;
-            sal_uInt16 nStartCount = 0;
-            sal_uInt16 nEndCount = 0;
-            while ( (pCon = pWin->GetConnector( j )) )
-            {
-                if ( pCon->IsVisible()) {                   //null_project
-                    if( pCon->IsStart( pWin ))
-                        nStartCount++;
-                    else
-                    {
-                        nEndCount = 1;
-                        break;
-                    }
-                }
-                j++;
-            }
-
-            if ( nStartCount > 0 && nEndCount == 0 )
-                if ( nTopId != pWin->GetId())
-                    AddConnectorToObjects( pObjLst, nTopId, pWin->GetId());
-
-        }
-    }
-
-    pWin = ObjIdToPtr( pObjLst, nTopId );
-
-    if ( mpTravellerList )
-    {
-        mpTravellerList->Clear();
-        delete mpTravellerList;
-    }
-    mpTravellerList = new ObjWinList();
-    // set root and top distance
-    nRetVal = Impl_Traveller( pWin, nRootDist );
-
-    DBG_ASSERT( nRetVal < DEPPER_MAX_DEPTH , "zu tief" );
-    if ( nRetVal == DEP_ENDLES_RECURSION_FOUND )
-    {
-        WriteToErrorFile();
-        return nRetVal;
-    }
-
-    sal_uIntPtr nUnvisited = 0;
-    sal_uIntPtr nUnvisYOffs = 0;
-
-    // seperate mainstream, secondary and unconnected
-    for ( i = 0; i < nObjCount; i++ )
-    {
-        pWin = pObjLst->GetObject( i );
-        if ( pWin->IsVisible()) {
-            if (( pWin->mnHeadDist + pWin->mnRootDist ) == nRetVal )
-            {
-                if ( !LevelList[ pWin->mnHeadDist ] )
-                        LevelList[ pWin->mnHeadDist ] = new ObjWinList;
-                LevelList[ pWin->mnHeadDist ]->Insert( pWin );
-                LevelUse[ pWin->mnHeadDist ]++;
-            }
-            else
-                if ( pWin->mbVisited )
-                {
-                    if ( !LevelSecList[ nRetVal - pWin->mnRootDist ] )
-                        LevelSecList[ nRetVal - pWin->mnRootDist ] = new ObjWinList;
-                    LevelSecList[ nRetVal - pWin->mnRootDist ]->Insert( pWin );
-                    LevelSecUse[ nRetVal - pWin->mnRootDist ]++;
-                }
-                else
-                {
-    //              need to be arranged more intelligent...
-                    Point aPos( 5, nUnvisYOffs );
-                    pWin->SetCalcPosPixel( aPos );
-
-                    Point aTmpPos = pWin->GetCalcPosPixel();
-                    pWin->SetPosPixel( mpBaseWin->LogicToPixel( aTmpPos ));
-
-                    nUnvisYOffs += pWin->PixelToLogic( pWin->GetSizePixel()).Height();
-                    nUnvisited++;
-                }
-        }
-    }
-
-    mnLevelOffset = 0;
-
-    sal_uInt16 nScaleVal;
-
-    if ( nRetVal == 0 )
-        nScaleVal = 1;
-    else
-        nScaleVal = nRetVal;
-
-    i = 0;
-
-    sal_uInt16 nStep = 0;
-
-    while ( LevelList[ i ] )
-    {
-        UpdateMainProgressBar(i, nScaleVal, nStep);
-        DBG_ASSERT( LevelUse[ i ] == LevelList[ i ]->Count() , "level index im a..." );
-        ObjectWin* pSwapWin;
-        sal_uIntPtr nLevelObjCount = LevelList[ i ]->Count();
-
-        if ( nLevelObjCount % 2 == 0 )
-        {
-            LevelList[ i ]->Insert( NULL, LIST_APPEND );
-            nLevelObjCount++;
-//          LevelUse bleibt orginal...
-//          LevelUse[ i ]++;
-        }
-
-// catch too big lists
-        DBG_ASSERT( nLevelObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" );
-        if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH )
-        {
-            WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking"));
-            aWBox.Execute();
-            break;
-        }
-        mnXOffset = CalcXOffset( nLevelObjCount );
-        aWorkList.Clear();
-
-        // initial positioning for mainstream
-        for ( j = 0; j < nLevelObjCount; j++ )
-        {
-            pSwapWin = LevelList[ i ]->GetObject( j );
-            aWorkList.Insert( pSwapWin, LIST_APPEND);
-            Point aPos = CalcPos( i, j );
-            aPosArray[ j ] = aPos;
-            if ( pSwapWin )
-                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
-        }
-
-        double dMinDist = CalcDistSum( LevelList[ i ] );
-
-        // optimize mainstream order and return best matching list in "aWorkList"
-        dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount ));
-
-        // set optimized positions - may still be wrong from later tries
-        for ( j = 0; j < nLevelObjCount; j++ )
-        {
-            pSwapWin = aWorkList.GetObject( j );
-            if ( pSwapWin )
-                pSwapWin->SetCalcPosPixel(  aPosArray[ j ] );
-        }
-
-        if ( LevelSecList[ i ] != NULL )
-        {
-            sal_uIntPtr nLevelSecObjCount = LevelSecList[ i ]->Count();
-            // expand list for better positioning
-            while ( nLevelSecObjCount + LevelUse[ i ] < DEPPER_MAX_WIDTH - 1 )
-            {
-                LevelSecList[ i ]->Insert( NULL, LIST_APPEND );
-                nLevelSecObjCount++;
-            }
-            if ( ( nLevelSecObjCount + LevelUse[ i ])% 2 == 0 )
-            {
-                LevelSecList[ i ]->Insert( NULL, LIST_APPEND );
-                nLevelSecObjCount++;
-            }
-
-            DBG_ASSERT( nLevelSecObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" );
-            if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH )
-            {
-                WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking"));
-                aWBox.Execute();
-                break;
-            }
-            mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount );
-            aWorkList.Clear();
-
-            l = 0;
-            sal_Bool bUsedPos;
-
-            // find free positions for secondary objects
-            for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ )
-            {
-                Point aPos = CalcPos( i, j );
-                bUsedPos = sal_False;
-                // is already occupied?
-                for ( k = 0; k < nLevelObjCount; k++ )
-                {
-                    if ( LevelList[ i ]->GetObject( k ) )
-                        if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() )
-                            bUsedPos = sal_True;
-                }
-                // if its free, add to pool
-                if ( !bUsedPos )
-                {
-                    aPosArray[ l ] = aPos;
-                    l++;
-                }
-            }
-
-            // initial positioning for secodaries
-            for ( j = 0 ; j < nLevelSecObjCount ; j++ )
-            {
-                pSwapWin = LevelSecList[ i ]->GetObject( j );
-                aWorkList.Insert( pSwapWin, LIST_APPEND);
-                if ( pSwapWin )
-                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
-            }
-            dMinDist = CalcDistSum( LevelSecList[ i ] );
-
-            dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount ));
-
-            // set optimized positions - may still be wrong from later tries
-            for ( j = 0; j < nLevelSecObjCount; j++ )
-            {
-                pSwapWin = aWorkList.GetObject( j );
-                if ( pSwapWin )
-                    pSwapWin->SetCalcPosPixel(  aPosArray[ j ] );
-            }
-            if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )
-                mnLevelOffset++;
-        }
-        if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )
-            mnLevelOffset+= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ;
-        i++;
-    }
-
-    mnMinDynXOffs = 0xffff;
-
-// and back again...
-    // get better results form already preoptimized upper and lower rows
-
-    do
-    {
-        i--;
-        UpdateMainProgressBar(i, nScaleVal, nStep, sal_True); // sal_True ~ counting down
-        if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )
-            mnLevelOffset-= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ;
-        ObjectWin* pSwapWin;
-        sal_uIntPtr nLevelObjCount = LevelList[ i ]->Count();
-        mnXOffset = CalcXOffset( nLevelObjCount );
-        aWorkList.Clear();
-
-        for ( j = 0; j < nLevelObjCount; j++ )
-        {
-            pSwapWin = LevelList[ i ]->GetObject( j );
-            aWorkList.Insert( pSwapWin, LIST_APPEND);
-            Point aPos = CalcPos( i, j );
-            aPosArray[ j ] = aPos;
-//no need to do this stuff.......   ?????
-            if ( pSwapWin )
-                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
-        }
-
-        double dMinDist = CalcDistSum( LevelList[ i ], BOTH );
-
-        dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount, BOTH ));
-// wrong position for remaping - keep old positions for comparing
-        for ( j = 0; j < nLevelObjCount; j++ )
-        {
-            pSwapWin = aWorkList.GetObject( j );
-            if ( pSwapWin )
-//              pSwapWin->SetCalcPosPixel( mpBaseWin->LogicToPixel( aPosArray[ j ] ));
-                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
-        }
-
-        if ( LevelSecList[ i ] != NULL )
-        {
-            sal_uIntPtr nLevelSecObjCount = LevelSecList[ i ]->Count();
-            mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount );
-            aWorkList.Clear();
-
-            l = 0;
-            sal_Bool bUsedPos;
-
-            for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ )
-            {
-                Point aPos = CalcPos( i, j );
-                bUsedPos = sal_False;
-// could be faster
-                for ( k = 0; k < nLevelObjCount; k++ )
-                {
-                    if ( LevelList[ i ]->GetObject( k ) )
-                        if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() )
-                            bUsedPos = sal_True;
-                }
-                if ( !bUsedPos )
-                {
-                    aPosArray[ l ] = aPos;
-                    l++;
-                }
-            }
-
-            for ( j = 0 ; j < nLevelSecObjCount ; j++ )
-            {
-                pSwapWin = LevelSecList[ i ]->GetObject( j );
-                aWorkList.Insert( pSwapWin, LIST_APPEND);
-                if ( pSwapWin )
-                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
-            }
-            dMinDist = CalcDistSum( LevelSecList[ i ], BOTH );
-
-            dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount, BOTH ));
-// wrong position for remaping - keep old positions for comparing
-            for ( j = 0; j < nLevelSecObjCount; j++ )
-            {
-                pSwapWin = aWorkList.GetObject( j );
-                if ( pSwapWin )
-                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
-            }
-        }
-//      i--;
-    } while ( i != 0 );
-    SetMainProgressBar( 100 );
-
-    sal_uIntPtr nNewXSize = ( DEPPER_MAX_WIDTH + 1 )  * ( OBJWIN_X_SPACING + GetDefSize().Width() );
-
-    //    sal_uIntPtr aObjID = GetStart(pIdMapper, pObjLst) //hier mu� man switchen GetStart/GetPrjStart oder so
-
-    ObjectWin* pObjWin = ObjIdToPtr( pObjLst, aObjID);
-
-    sal_uIntPtr nNewYSize = pObjWin->GetCalcPosPixel().Y() + GetDefSize().Height() + 2 * OBJWIN_Y_SPACING;
-    if (( nUnvisYOffs + GetDefSize().Height()) > nNewYSize )
-        nNewYSize = nUnvisYOffs + GetDefSize().Height();
-
-    MapMode aMapMode = GetDepWin()->GetMapMode();
-    Size aTmpSize( (sal_uIntPtr) (double(nNewXSize) * double( aMapMode.GetScaleX())), (sal_uIntPtr) (double( nNewYSize) * double( aMapMode.GetScaleY())));
-
-    Size aNowSize( GetGraphWin()->GetSizePixel());
-
-    if ( GetDepWin()->LogicToPixel( aNowSize ).Width() > aTmpSize.Width() )
-        aTmpSize.Width() = GetDepWin()->LogicToPixel( aNowSize ).Width() ;
-
-    if ( GetDepWin()->LogicToPixel( aNowSize ).Height()  > aTmpSize.Height() )
-        aTmpSize.Height() = GetDepWin()->LogicToPixel( aNowSize ).Height() ;
-
-//  if ( nZoomed <= 0 )
-//  {
-//      mpBaseWin->SetSizePixel( aTmpSize );
-//      mpGraphWin->SetTotalSize( aTmpSize );
-//      mpGraphWin->EndScroll( 0, 0 );
-//  }
-
-// now remap all objects
-    sal_uIntPtr nAllObjCount = pObjLst->Count();
-    Point aTmpPos;
-    for ( j = 0; j < nAllObjCount; j++ )
-    {
-        pWin = pObjLst->GetObject( j );
-        if ( pWin->IsVisible()) {
-            aTmpPos = pWin->GetCalcPosPixel();
-            if ( pWin->mbVisited )
-            {
-// reserve space for unconnected
-                aTmpPos.X() -= mnMinDynXOffs;
-                aTmpPos.X() += GetDefSize().Width() + OBJWIN_X_SPACING;
-// center window
-                aTmpPos.X() += GetDefSize().Width() / 2;
-                aTmpPos.X() -= pWin->PixelToLogic( pWin->GetSizePixel()).Width() / 2 ;
-            }
-            pWin->SetPosPixel( GetDepWin()->LogicToPixel( aTmpPos ));
-        }
-    }
-    aWorkList.Clear();
-    GetDepWin()->EnablePaint( sal_True );
-    GetDepWin()->Invalidate();
-//LevelListen loeschen                  H�? Welche Levellisten?
-
-//Update all Connectors
-// --> To be done: Don't call twice Object1-Connector-Object2
-    ObjectWin* pObject1;
-    for ( i = 0 ; i < nObjCount ; i++)
-    {
-        pObject1 = pObjLst->GetObject( i );
-        if ( pObject1->IsVisible())
-            pObject1->UpdateConnectors();
-    };
-    return 0;
-}
-
-void SolDep::WriteToErrorFile()
-{
-//Needs some improvement
-    ObjectWin* pWin;
-    WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph too deep! dat geiht nich gut.\nlook at depper.err in your Tmp-directory\nfor list of objects"));
-    aWBox.Execute();
-    char *tmpdir = getenv("TMP");
-    char *errfilebasename = "depper.err";
-    char *ErrFileName = (char*) malloc( strlen( tmpdir ) + strlen( errfilebasename) + 3 );
-    *ErrFileName = '\0';
-    strcat( ErrFileName, tmpdir );
-    strcat( ErrFileName, "\\" );
-    strcat( ErrFileName, errfilebasename );
-    FILE* pErrFile = fopen( "depper.err", "w+" );
-    if ( pErrFile )
-    {
-        for ( sal_uInt16 i = 0; i < mpTravellerList->Count(); i++ )
-        {
-            pWin = mpTravellerList->GetObject( i );
-            fprintf( pErrFile, " %s -> \n", (pWin->GetBodyText()).GetBuffer());
-        }
-        fclose( pErrFile );
-    }
-}
diff --git a/soldep/source/soldep.ico b/soldep/source/soldep.ico
deleted file mode 100644
index dc0812889368..000000000000
--- a/soldep/source/soldep.ico
+++ /dev/null
diff --git a/soldep/source/soldlg.cxx b/soldep/source/soldlg.cxx
deleted file mode 100644
index a561f5ae6f03..000000000000
--- a/soldep/source/soldlg.cxx
+++ /dev/null
@@ -1,267 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <tools/geninfo.hxx>
-//#include "depapp.hxx"
-#include <soldep/soldep.hxx>
-#include <soldep/soldlg.hxx>
-#include <soldep/soldlg.hrc>
-
-#ifndef SOLARIS
-#define SIZE( nX, nY)   \
-    LogicToLogic(Size(nX,nY),&MapMode(MAP_APPFONT),&GetMapMode())
-#define POS(nX, nY) \
-    LogicToLogic(Point(nX,nY),&MapMode(MAP_APPFONT),&GetMapMode())
-#else
-#define SIZE( nX, nY)   \
-        LogicToLogic(Size(nX,nY),MapMode(MAP_APPFONT),GetMapMode())
-#define POS(nX, nY) \
-        LogicToLogic(Point(nX,nY),MapMode(MAP_APPFONT),GetMapMode())
-#endif
-
-
-//
-// class SolNewProjectDlg
-//
-
-/*****************************************************************************/
-SolNewProjectDlg::SolNewProjectDlg( Window* pParent, const ResId& rResId )
-/*****************************************************************************/
-                : ModalDialog( pParent, rResId ),
-                maOkButton( this, DtSodResId( BTN_OK )),
-                maCancelButton( this, DtSodResId( BTN_CANCEL )),
-                maFTName( this, DtSodResId( FT_PRJNAME )),
-                maEName( this, DtSodResId( EDIT_PRJNAME )),
-                maFTShort( this, DtSodResId( FT_PRJSHORT )),
-                maEShort( this, DtSodResId( EDIT_PRJSHORT )),
-                maFTDeps( this, DtSodResId( FT_PRJDEPS )),
-                maEDeps( this, DtSodResId( EDIT_PRJDEPS ))
-{
-    FreeResource();
-    maOkButton.SetClickHdl( LINK( this, SolNewProjectDlg, OkHdl ));
-    maCancelButton.SetClickHdl( LINK( this, SolNewProjectDlg, CancelHdl ));
-}
-
-/*****************************************************************************/
-IMPL_LINK( SolNewProjectDlg, OkHdl, Button*, pOkBtn )
-/*****************************************************************************/
-{
-    EndDialog( 1 );
-    return 0;
-}
-
-/*****************************************************************************/
-IMPL_LINK( SolNewProjectDlg, CancelHdl, Button*,  pCancelBtn )
-/*****************************************************************************/
-{
-    EndDialog( 0 );
-    return 0;
-}
-
-//
-// class SolNewDirectoryDlg
-//
-
-/*****************************************************************************/
-SolNewDirectoryDlg::SolNewDirectoryDlg( Window* pParent, const ResId& rResId )
-/*****************************************************************************/
-                : ModalDialog( pParent, rResId ),
-                maOkButton( this, DtSodResId( BTN_OK )),
-                maCancelButton( this, DtSodResId( BTN_CANCEL )),
-                maFTName( this, DtSodResId( FT_DIRNAME )),
-                maEName( this, DtSodResId( EDIT_DIRNAME )),
-                maFTFlag( this, DtSodResId( FT_DIRFLAG )),
-                maEFlag( this, DtSodResId( EDIT_DIRFLAG )),
-                maFTDeps( this, DtSodResId( FT_DIRDEPS )),
-                maEDeps( this, DtSodResId( EDIT_DIRDEPS )),
-                maFTAction( this, DtSodResId( FT_DIRACTION )),
-                maEAction( this, DtSodResId( EDIT_DIRACTION )),
-                maFTEnv( this, DtSodResId( FT_DIRENV )),
-                maEEnv( this, DtSodResId( EDIT_DIRENV ))
-{
-    FreeResource();
-    maOkButton.SetClickHdl( LINK( this, SolNewDirectoryDlg, OkHdl ));
-    maCancelButton.SetClickHdl( LINK( this, SolNewDirectoryDlg, CancelHdl ));
-}
-
-/*****************************************************************************/
-IMPL_LINK( SolNewDirectoryDlg, OkHdl, Button*, pOkBtn )
-/*****************************************************************************/
-{
-    EndDialog( 1 );
-    return 0;
-}
-
-/*****************************************************************************/
-IMPL_LINK( SolNewDirectoryDlg, CancelHdl, Button*,  pCancelBtn )
-/*****************************************************************************/
-{
-    EndDialog( 0 );
-    return 0;
-}
-
-//
-// class SolHelpDlg
-//
-
-/*****************************************************************************/
-SolHelpDlg::SolHelpDlg( Window* pParent, const ResId& rResId )
-/*****************************************************************************/
-                : ModalDialog( pParent, rResId ),
-                maOkButton( this, DtSodResId( BTN_OK )),
-                maMLEHelp( this, DtSodResId( EDIT_HELP ))
-{
-    FreeResource();
-    maOkButton.SetClickHdl( LINK( this, SolHelpDlg, OkHdl ));
-}
-
-/*****************************************************************************/
-IMPL_LINK( SolHelpDlg, OkHdl, Button*, pOkBtn )
-/*****************************************************************************/
-{
-    EndDialog( 1 );
-    return 0;
-}
-
-//
-// class SolSelectVersionDlg
-//
-
-/*****************************************************************************/
-SolSelectVersionDlg::SolSelectVersionDlg(
-    Window *pParent, GenericInformationList *pStandLst )
-/*****************************************************************************/
-                : ModalDialog( pParent, DtSodResId( DLG_VERSIONSELECT )),
-                maVersionListBox( this, DtSodResId( DLG_VERSIONSELECT_LISTBOX )),
-                maVersionGroupBox( this, DtSodResId( DLG_VERSIONSELECT_GROUP )),
-                maMinorEditBox( this, DtSodResId( DLG_MINORSELECT_EDIT )),
-                maMinorGroupBox( this, DtSodResId( DLG_MINORSELECT_GROUP )),
-                maOKButton( this, DtSodResId( DLG_VERSIONSELECT_OK  )),
-                maCancelButton( this, DtSodResId( DLG_VERSIONSELECT_CANCEL ))
-{
-    FreeResource();
-    //Fill the ListBox with MWS versions (e.g. SRC680) from "stand.lst"
-    for ( sal_uIntPtr i = 0; i < pStandLst->Count(); i++ ) {
-        String sVersion( *pStandLst->GetObject( i ), RTL_TEXTENCODING_ASCII_US );
-        maVersionListBox.InsertEntry( sVersion );
-    }
-
-    if ( pStandLst->Count())
-        maVersionListBox.SelectEntryPos( 0 );
-
-    maVersionListBox.SetDoubleClickHdl(
-        LINK( this, SolSelectVersionDlg, DoubleClickHdl ));
-
-}
-
-/*****************************************************************************/
-ByteString SolSelectVersionDlg::GetVersionMajor()
-/*****************************************************************************/
-{
-    //Returns the selected version
-    return ByteString(maVersionListBox.GetSelectEntry(), RTL_TEXTENCODING_ASCII_US );
-}
-
-/*****************************************************************************/
-ByteString SolSelectVersionDlg::GetVersionMinor()
-/*****************************************************************************/
-{
-    //Returns the minor
-    ByteString minor = ByteString(maMinorEditBox.GetText(), RTL_TEXTENCODING_ASCII_US );
-    //check for correctness (format: "m1234")
-    //"m123s8" is unsupported because 'steps' aren't used anymore
-    minor.EraseLeadingAndTrailingChars();
-    int check = minor.SearchChar("m");
-    if (check == 0)
-    {
-        ByteString check2 = minor.Copy(1,(minor.Len()-1));
-        if (check2.IsNumericAscii()) return minor;
-    }
-    return ByteString("");
-}
-
-/*****************************************************************************/
-IMPL_LINK( SolSelectVersionDlg, DoubleClickHdl, ListBox *, pBox )
-/*****************************************************************************/
-{
-    EndDialog( RET_OK );
-    return 0;
-}
-
-//
-// class SolAutoarrangeDlg
-//
-
-/*****************************************************************************/
-SolAutoarrangeDlg::SolAutoarrangeDlg( Window *pParent )
-/*****************************************************************************/
-                : ModelessDialog( pParent, DtSodResId( DLG_AUTOARRANGE )),
-                maGroupBox( this, DtSodResId( DLG_AUTOARRANGE_GROUP )),
-                maModuleText( this, DtSodResId( DLG_AUTOARRANGE_TEXT_MODULE )),
-                maOverallText( this, DtSodResId( DLG_AUTOARRANGE_TEXT_OVERALL )),
-                maModuleBar( this ),
-                maOverallBar( this )
-{
-    FreeResource();
-/* Mac Porting..... taking address of temporary (warning)
-    maModuleBar.SetPosPixel( POS( 8, 28 ));
-    maOverallBar.SetPosPixel( POS( 8, 60 ));
-    maModuleBar.SetSizePixel( SIZE( 208,12 ));
-    maOverallBar.SetSizePixel( SIZE( 208,12 ));
-*/
-    maModuleBar.Show();
-    maOverallBar.Show();
-
-       maModuleText.Show();
-    maOverallText.Show();
-}
-
-/**********************************************************************************/
-
-SolFindProjectDlg::SolFindProjectDlg( Window *pParent, ObjWinList* pObjList )
-                : ModalDialog( pParent, DtSodResId( DLG_FIND_PROJECT )),
-                maCombobox( this, DtSodResId( DLG_FIND_PROJECT_COMBOBOX )),
-                maOKButton( this, DtSodResId( DLG_FIND_PROJECT_OK )),
-                maCancelButton( this, DtSodResId( DLG_FIND_PROJECT_CANCEL ))
-{
-    FreeResource();
-    maCombobox.SetDropDownLineCount(15);
-//    SolDep* pSolDep = ((MyApp*)GetpApp())->GetSolDep();
-//    ObjWinList* pObjList = pSolDep->GetObjectList();
-    sal_uIntPtr n = pObjList->Count();
-    //Fill combobox
-    for (sal_uIntPtr i=0; i<n; i++) {
-        ByteString prjname = pObjList->GetObject( i )->GetBodyText();
-        if (prjname != ByteString("null"))                                 //null_project
-            maCombobox.InsertEntry( String(prjname,RTL_TEXTENCODING_UTF8) );
-        }
-}
-
-ByteString SolFindProjectDlg::GetProject()
-{
-    return ByteString(maCombobox.GetText(),RTL_TEXTENCODING_UTF8);
-}
diff --git a/soldep/source/soldlg.src b/soldep/source/soldlg.src
deleted file mode 100644
index 723716a435e5..000000000000
--- a/soldep/source/soldlg.src
+++ /dev/null
@@ -1,386 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <dtsodcmp.hrc>
-#include <soldep/soldlg.hrc>
-
-//========================================================================
-// Dialogs
-ModalDialog RID_SD_DIALOG_NEWPROJECT
-{
-    HelpID = "soldep:ModalDialog:RID_SD_DIALOG_NEWPROJECT";
-    OutputSize = TRUE;
-    Text = "New Project";
-    PosSize = MAP_SYSFONT(18,18,142,142);
-    SVLook = TRUE;
-    MOVEABLE = TRUE;
-    CLOSEABLE = TRUE;
-    OKButton BTN_OK
-    {
-        PosSize = MAP_SYSFONT(5,123,40,14);
-        TabStop = TRUE;
-        Hide = FALSE;
-        DefButton = TRUE;
-    };
-    CancelButton BTN_CANCEL {
-        PosSize = MAP_SYSFONT(50,123,40,14);
-        TabStop = TRUE;
-    };
-    FixedText FT_PRJNAME {
-        PosSize = MAP_SYSFONT( 5, 10, 100, 10 );
-        Text = "Project Name";
-    };
-    Edit EDIT_PRJNAME {
-        HelpID = "soldep:Edit:RID_SD_DIALOG_NEWPROJECT:EDIT_PRJNAME";
-        Border = TRUE;
-        PosSize = MAP_SYSFONT(5,20,132,10);
-    };
-    FixedText FT_PRJSHORT {
-        PosSize = MAP_SYSFONT( 5, 30, 100, 10 );
-        Text = "Project Short Name";
-    };
-    Edit EDIT_PRJSHORT {
-        HelpID = "soldep:Edit:RID_SD_DIALOG_NEWPROJECT:EDIT_PRJSHORT";
-        Border = TRUE;
-        PosSize = MAP_SYSFONT(5,40,132,10);
-    };
-    FixedText FT_PRJDEPS {
-        PosSize = MAP_SYSFONT( 5, 50, 100, 10 );
-        Text = "Project Depends on";
-    };
-    Edit EDIT_PRJDEPS {
-        HelpID = "soldep:Edit:RID_SD_DIALOG_NEWPROJECT:EDIT_PRJDEPS";
-        Border = TRUE;
-        PosSize = MAP_SYSFONT(5,60,132,10);
-    };
-};
-
-ModalDialog RID_SD_DIALOG_NEWDIRECTORY
-{
-    HelpID = "soldep:ModalDialog:RID_SD_DIALOG_NEWDIRECTORY";
-    OutputSize = TRUE;
-    Text = "New Directory";
-    PosSize = MAP_SYSFONT(18,18,142,142);
-    SVLook = TRUE;
-    MOVEABLE = TRUE;
-    CLOSEABLE = TRUE;
-    OKButton BTN_OK
-    {
-        PosSize = MAP_SYSFONT(5,123,40,14);
-        TabStop = TRUE;
-        Hide = FALSE;
-        DefButton = TRUE;
-    };
-    CancelButton BTN_CANCEL {
-        PosSize = MAP_SYSFONT(50,123,40,14);
-        TabStop = TRUE;
-    };
-    FixedText FT_DIRNAME {
-        PosSize = MAP_SYSFONT( 5, 10, 132, 10 );
-        Text = "Directory Name ( with projectname )";
-    };
-    Edit EDIT_DIRNAME {
-        HelpID = "soldep:Edit:RID_SD_DIALOG_NEWDIRECTORY:EDIT_DIRNAME";
-        Border = TRUE;
-        PosSize = MAP_SYSFONT(5,20,132,10);
-    };
-    FixedText FT_DIRFLAG {
-        PosSize = MAP_SYSFONT( 5, 30, 100, 10 );
-        Text = "Directory Flag";
-    };
-    Edit EDIT_DIRFLAG {
-        HelpID = "soldep:Edit:RID_SD_DIALOG_NEWDIRECTORY:EDIT_DIRFLAG";
-        Border = TRUE;
-        PosSize = MAP_SYSFONT(5,40,132,10);
-    };
-    FixedText FT_DIRDEPS {
-        PosSize = MAP_SYSFONT( 5, 50, 100, 10 );
-        Text = "Directory Depends on";
-    };
-    Edit EDIT_DIRDEPS {
-        HelpID = "soldep:Edit:RID_SD_DIALOG_NEWDIRECTORY:EDIT_DIRDEPS";
-        Border = TRUE;
-        PosSize = MAP_SYSFONT(5,60,132,10);
-    };
-    FixedText FT_DIRACTION {
-        PosSize = MAP_SYSFONT( 5, 70, 100, 10 );
-        Text = "What To Do";
-    };
-    Edit EDIT_DIRACTION {
-        HelpID = "soldep:Edit:RID_SD_DIALOG_NEWDIRECTORY:EDIT_DIRACTION";
-        Border = TRUE;
-        PosSize = MAP_SYSFONT(5,80,132,10);
-    };
-    FixedText FT_DIRENV {
-        PosSize = MAP_SYSFONT( 5, 90, 100, 10 );
-        Text = "Which Environments";
-    };
-    Edit EDIT_DIRENV {
-        HelpID = "soldep:Edit:RID_SD_DIALOG_NEWDIRECTORY:EDIT_DIRENV";
-        Border = TRUE;
-        PosSize = MAP_SYSFONT(5,100,132,10);
-    };
-};
-
-
-ModalDialog RID_SD_DIALOG_HELP
-{
-    HelpID = "soldep:ModalDialog:RID_SD_DIALOG_HELP";
-    OutputSize = TRUE;
-    Text = "Help";
-    PosSize = MAP_SYSFONT(18,18,242,242);
-    SVLook = TRUE;
-    MOVEABLE = TRUE;
-    CLOSEABLE = TRUE;
-    OKButton BTN_OK
-    {
-        PosSize = MAP_SYSFONT(101,223,40,14);
-        TabStop = TRUE;
-        Hide = FALSE;
-        DefButton = TRUE;
-    };
-    MultiLineEdit EDIT_HELP {
-        HelpID = "soldep:MultiLineEdit:RID_SD_DIALOG_HELP:EDIT_HELP";
-        Border = TRUE;
-        PosSize = MAP_SYSFONT(5,5,232,213);
-    };
-};
-
-ModalDialog DLG_VERSIONSELECT {
-    HelpID = "soldep:ModalDialog:DLG_VERSIONSELECT";
-    OutputSize = TRUE;
-    Pos = MAP_APPFONT( 92, 40 );
-    Size = MAP_APPFONT( 161, 98 );
-    Text = "Open workspace";
-    Moveable = TRUE;
-    Closeable = TRUE;
-    ListBox DLG_VERSIONSELECT_LISTBOX {
-        HelpID = "soldep:ListBox:DLG_VERSIONSELECT:DLG_VERSIONSELECT_LISTBOX";
-            Border = TRUE;
-            Pos = MAP_APPFONT( 8, 16 );
-            Size = MAP_APPFONT( 96, 72 );
-            TabStop = TRUE;
-        };
-    GroupBox DLG_VERSIONSELECT_GROUP {
-            Pos = MAP_APPFONT( 4, 4 );
-            Size = MAP_APPFONT( 104, 88 );
-            Text = "Workspaces";
-        };
-    OKButton DLG_VERSIONSELECT_OK {
-            Pos = MAP_APPFONT( 116, 64 );
-            Size = MAP_APPFONT( 40, 12 );
-            DefButton = TRUE;
-            TabStop = TRUE;
-        };
-    CancelButton DLG_VERSIONSELECT_CANCEL {
-            Pos = MAP_APPFONT( 116, 80 );
-            Size = MAP_APPFONT( 40, 12 );
-            TabStop = TRUE;
-        };
-    GroupBox DLG_MINORSELECT_GROUP {
-            Pos = MAP_APPFONT( 110, 4 );
-            Size = MAP_APPFONT( 47, 30 );
-            Text = "Minor";
-        };
-    Edit    DLG_MINORSELECT_EDIT {
-        HelpID = "soldep:Edit:DLG_VERSIONSELECT:DLG_MINORSELECT_EDIT";
-            Border = TRUE;
-            Pos = MAP_APPFONT( 115, 16 );
-            Size = MAP_APPFONT( 36, 12 );
-            TabStop = TRUE;
-        };
-};
-
-ModelessDialog DLG_AUTOARRANGE {
-    HelpID = "soldep:ModelessDialog:DLG_AUTOARRANGE";
-    OutputSize = TRUE;
-    Pos = MAP_APPFONT( 40, 12 );
-    Size = MAP_APPFONT( 225, 82 );
-    Text = "Autoarrange";
-    Moveable = TRUE;
-    GroupBox DLG_AUTOARRANGE_GROUP {
-            Pos = MAP_APPFONT( 4, 4 );
-            Size = MAP_APPFONT( 216, 72 );
-            Text = "Progress";
-        };
-    FixedText DLG_AUTOARRANGE_TEXT_MODULE {
-            Pos = MAP_APPFONT( 8, 16 );
-            Size = MAP_APPFONT( 208, 10 );
-            Text = "";
-        };
-    FixedText DLG_AUTOARRANGE_TEXT_OVERALL {
-            Pos = MAP_APPFONT( 8, 48 );
-            Size = MAP_APPFONT( 208, 10 );
-            Text = "";
-        };
-};
-
-ModalDialog DLG_FIND_PROJECT {
-    HelpID = "soldep:ModalDialog:DLG_FIND_PROJECT";
-    OutputSize = TRUE;
-    Pos = MAP_APPFONT( 40, 12 );
-    Size = MAP_APPFONT( 155, 55 );
-    Text = "Find Project";
-    Moveable = TRUE;
-    SVLook          = TRUE;
-    ComboBox DLG_FIND_PROJECT_COMBOBOX
-    {
-        HelpID = "soldep:ComboBox:DLG_FIND_PROJECT:DLG_FIND_PROJECT_COMBOBOX";
-        Pos = MAP_APPFONT ( 5 , 18 ) ;
-        Size = MAP_APPFONT ( 100 , 90 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        VScroll = TRUE ;
-        Sort = TRUE ;
-    };
-    OKButton DLG_FIND_PROJECT_OK {
-            Pos = MAP_APPFONT( 110, 10 );
-            Size = MAP_APPFONT( 40, 12 );
-            DefButton = TRUE;
-            TabStop = TRUE;
-        };
-    CancelButton DLG_FIND_PROJECT_CANCEL {
-            Pos = MAP_APPFONT( 110, 26 );
-            Size = MAP_APPFONT( 40, 12 );
-            TabStop = TRUE;
-        };
-};
-
-ToolBox TID_SOLDEP_MAIN
-{
-    ButtonType      = BUTTON_SYMBOL;
-    Align           = BOXALIGN_TOP;
-        LineCount       = 1;
-        SVLook          = TRUE;
-        Border          = TRUE;
-        Sizeable                = TRUE;
-        Dockable                = TRUE;
-        Scroll                  = TRUE;
-        Moveable                = TRUE;
-        Closeable               = TRUE;
-        Zoomable                = TRUE;
-        ItemList        =
-        {
-                ToolBoxItem
-                {
-                        Identifier      = TID_SOLDEP_OPEN;
-                        Type            = TOOLBOXITEM_BUTTON;
-                        Text            = "Load";
-                        HelpText        = "Load";
-                        Checkable               = TRUE;
-                        ItemBitmap      = Bitmap
-                        {
-                                File = "sx03190.png";
-                        };
-                };
-                ToolBoxItem
-                {
-                        Identifier      = TID_SOLDEP_SAVE;
-                        Type            = TOOLBOXITEM_BUTTON;
-                        Text            = "Save";
-                        HelpText        = "Save";
-                        Checkable               = TRUE;
-                        ItemBitmap      = Bitmap
-                        {
-                                File = "sc05505.png";
-                        };
-                };
-                ToolBoxItem
-                {
-                         Type            = TOOLBOXITEM_SEPARATOR;
-                };
-                ToolBoxItem
-                {
-                        Identifier      = TID_SOLDEP_SELECT_WORKSPACE;
-                        Type            = TOOLBOXITEM_BUTTON;
-                        Text            = "Select Workspace";
-                        HelpText        = "Select Workspace";
-                        Checkable               = TRUE;
-                        ItemBitmap      = Bitmap
-                        {
-                                File = "selectupd_16.png";
-                        };
-                };
-                ToolBoxItem
-                {
-                        Identifier      = TID_SOLDEP_FIND;
-                        Type            = TOOLBOXITEM_BUTTON;
-                        Text            = "Find Module";
-                        HelpText        = "Find Module";
-                        Checkable               = TRUE;
-                        ItemBitmap      = Bitmap
-                        {
-                                File = "sc05961.png";
-                        };
-                };
-                ToolBoxItem
-                {
-                        Identifier      = TID_SOLDEP_BACK;
-                        Type            = TOOLBOXITEM_BUTTON;
-                        Text            = "Back to Overview";
-                        HelpText        = "Back to Overview";
-                        Checkable               = TRUE;
-                        ItemBitmap      = Bitmap
-                        {
-                                File = "arrowup_16.png";
-                        };
-                };
-                ToolBoxItem
-                {
-                        Identifier      = TID_SOLDEP_HIDE_INDEPENDEND;
-                        Type            = TOOLBOXITEM_BUTTON;
-                        Text            = "Hide Independend Modules";
-                        HelpText        = "Hide Independend Modules";
-                        Checkable               = TRUE;
-                        ItemBitmap      = Bitmap
-                        {
-                                File = "hidedependency_16.png";
-                        };
-                };
-                ToolBoxItem
-                {
-                        Identifier      = TID_SOLDEP_CREATEMETA;
-                        Type            = TOOLBOXITEM_BUTTON;
-                        Text            = "Create MetaFile";
-                        Checkable       = TRUE;
-                };
-        };
-};
-
-/*****************************************************************************/
-Bitmap TID_SMALL_PIN_PINED
-/*****************************************************************************/
-{
-    File = "ballgreen_7.png";
-};
-
-/*****************************************************************************/
-Bitmap TID_SMALL_PIN_UNPINED
-/*****************************************************************************/
-{
-    File = "ballred_7.png";
-};
diff --git a/soldep/source/tbox.cxx b/soldep/source/tbox.cxx
deleted file mode 100644
index 4eec7dbb883c..000000000000
--- a/soldep/source/tbox.cxx
+++ /dev/null
@@ -1,596 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#define private public
-
-#include <tools/ref.hxx>
-#include <vcl/msgbox.hxx>
-#include <soldep/soldep.hxx>
-#include <soldep/tbox.hxx>
-#include <soldep/soldlg.hrc>
-
-
-
-SoldepToolBox::SoldepToolBox( Window* pParent, const ResId& aId, sal_Bool bDAble ) :
-                ToolBox( pParent, aId ),
-                bDockable( bDAble ),
-                bCloseMode( sal_False ),
-                bBoxIsVisible( sal_True ),
-                bPinable( sal_True ),
-                aPinedBitmap( DtSodResId( TID_SMALL_PIN_PINED )),     // BMP_SMALL_PIN_PINED
-                aUnpinedBitmap( DtSodResId( TID_SMALL_PIN_UNPINED ))   // BMP_SMALL_PIN_UNPINED
-{
-    bPinable = sal_True;
-
-    SetAlign( WINDOWALIGN_TOP );
-    HideItem(TID_SOLDEP_BACK);    //Inital hide this item, activated in project view.
-    HideItem(TID_SOLDEP_SAVE);    // Hide this item now, not used yet
-    HideItem(TID_SOLDEP_OPEN);    // Hide this item now, not used yet
-
-    //SetMouseDownHdl(LINK(this,SoldepToolBox,MouseDownHdl));
-    //SetFloatingLines( nFloatingLines );
-    //SetFloatingMode( bFloatingMode );
-    sal_Bool bFloatingMode = sal_False;
-    if ( bFloatingMode )
-    {
-        //Point aPos( sToolBoxInfo.GetToken( 4, ',' ).ToInt64(), sToolBoxInfo.GetToken( 5, ',' ).ToInt64());
-        //SetPosPixel( aPos );
-    }
-
-    if ( bDockable ) InsertSeparator( 0 );  // Freiraum f�r Abrei�d�del schaffen
-                                            // (ein Separator an 1er Pos wird
-                                            // nicht gezeichnet,
-                                            // schafft aber Platz.)
-    bBoxIsVisible = sal_False;
-//  if ( sToolBoxInfo.GetToken( 3, ',' ) == "Visible" ) {
-        for ( sal_uInt16 i = 0; i < GetItemCount() && !bBoxIsVisible; i++ )
-        {
-//          sal_uInt16 nItemId = GetItemId( i );
-
-            switch ( GetItemType( i ))
-            {
-                case TOOLBOXITEM_SPACE:
-                    break;
-                case TOOLBOXITEM_SEPARATOR :
-                    break;
-                default:
-                    bBoxIsVisible = sal_True;
-                    break;
-            }
-        }
-//  }
-
-    if ( bBoxIsVisible ) {
-        if (!bDockable)
-            Show();
-        else
-            Hide();
-    }
-    else
-        Hide();
-
-    bOldFloatMode = IsFloatingMode();
-}
-
-/*************************************************************************
-|* SoldepToolBox::~SoldepToolBox()
-|************************************************************************/
-
-SoldepToolBox::~SoldepToolBox()
-{
-}
-
-/*************************************************************************
-|* SoldepToolBox::Paint()
-|************************************************************************/
-
-void SoldepToolBox::Paint( const Rectangle& rRect )
-{
-        SetOutStyle(  TOOLBOX_STYLE_FLAT );
-
-    // Wenn wir eine Dockable ToolBox haben, ...
-
-    if ( bDockable )
-    {
-        sal_uInt16 nItemId = GetItemId( 0 );
-
-        // ... zeichnen wir den wunderbaren Abrei�d�del �ber das erste Item (Seperator)
-
-        if ( !IsFloatingMode() && ( mnCurLine == 1 )) {
-            sal_Bool bIsCloseable = (( mnWinStyle & WB_CLOSEABLE ) != 0 );
-
-            ShowItem( nItemId );
-            Rectangle aRect = GetItemRect( nItemId );
-
-            ToolBox::Paint( rRect );
-
-            if ( bIsCloseable )
-            {
-                // Paint small cross button left/top of toolbar
-                SetLineColor( Color( COL_WHITE ));
-
-                DrawLine( Point( aRect.Left(), aRect.Top()), Point( aRect.Left()+6, aRect.Top()));
-                DrawLine( Point( aRect.Left(), aRect.Top()), Point( aRect.Left(), aRect.Top()+6));
-
-                SetLineColor( Color( COL_GRAY ));
-
-                DrawLine( Point( aRect.Left(), aRect.Top()+6), Point( aRect.Left()+6, aRect.Top()+6));
-                DrawLine( Point( aRect.Left()+6, aRect.Top()), Point( aRect.Left()+6, aRect.Top()+6));
-
-                SetLineColor( Color( COL_BLACK ));
-
-                DrawLine( Point( aRect.Left()+2, aRect.Top()+2), Point( aRect.Left()+4, aRect.Top()+4));
-                DrawLine( Point( aRect.Left()+2, aRect.Top()+4), Point( aRect.Left()+4, aRect.Top()+2));
-            }
-            else if ( bPinable )
-            {
-                if ( GetPin())
-                    DrawBitmap( Point( aRect.Left(), aRect.Top()), aPinedBitmap );
-                else
-                    DrawBitmap( Point( aRect.Left(), aRect.Top()), aUnpinedBitmap );
-            }
-
-            SetLineColor( Color( COL_WHITE ));
-
-            if ( IsHorizontal())
-            {
-                if ( bIsCloseable || bPinable ) aRect = Rectangle( Point( aRect.Left(), aRect.Top()+8), Point( aRect.Right(), aRect.Bottom()));
-
-                DrawLine( Point(aRect.Left(), aRect.Top()), Point(aRect.Left(), aRect.Bottom()));
-                DrawLine( Point(aRect.Left(), aRect.Top()), Point(aRect.Left()+2, aRect.Top()));
-
-                SetLineColor( Color( COL_WHITE ));
-
-                DrawLine( Point(aRect.Left()+4, aRect.Top()), Point(aRect.Left()+4, aRect.Bottom()));
-                DrawLine( Point(aRect.Left()+4, aRect.Top()), Point(aRect.Left()+6, aRect.Top()));
-
-                SetLineColor( Color( COL_GRAY ));//GRAY
-
-                DrawLine( Point(aRect.Left()+2, aRect.Top()), Point(aRect.Left()+2, aRect.Bottom()));
-                DrawLine( Point(aRect.Left(), aRect.Bottom()), Point(aRect.Left()+2, aRect.Bottom()));
-
-                SetLineColor( Color( COL_BLACK ));
-
-                DrawLine( Point(aRect.Left()+6, aRect.Top()), Point(aRect.Left()+6, aRect.Bottom()));
-                DrawLine( Point(aRect.Left()+4, aRect.Bottom()), Point(aRect.Left()+6, aRect.Bottom()));
-
-            }
-            else
-            {
-                if ( bIsCloseable || bPinable ) aRect = Rectangle( Point( aRect.Left()+8, aRect.Top()), Point( aRect.Right(), aRect.Bottom()));
-
-                DrawLine( Point( aRect.Left(), aRect.Top()), Point( aRect.Left(), aRect.Top()+2));
-                DrawLine( Point( aRect.Left(), aRect.Top()), Point( aRect.Right(), aRect.Top()));
-
-                DrawLine( Point( aRect.Left(), aRect.Top()+4), Point( aRect.Left(), aRect.Top()+6));
-                DrawLine( Point( aRect.Left(), aRect.Top()+4), Point( aRect.Right(), aRect.Top()+4));
-
-                SetLineColor( Color( COL_GRAY ));
-
-                DrawLine( Point( aRect.Left(), aRect.Top()+2), Point( aRect.Right(),aRect.Top()+2));
-                DrawLine( Point( aRect.Right(), aRect.Top()), Point( aRect.Right(), aRect.Top()+2));
-
-                DrawLine( Point( aRect.Left(), aRect.Top()+6), Point( aRect.Right(),aRect.Top()+6));
-                DrawLine( Point( aRect.Right(), aRect.Top()+4), Point( aRect.Right(), aRect.Top()+6));
-
-            }
-        }
-        else
-        {
-            // Sind wir im FloatingMode, dann wollen wir keinen Abrei�d�del haben
-            // und hiden somit das erste Item.
-
-            //Hiden l�scht leider das erste Object der n�chsten Zeile, daher nicht
-            //l�schen
-            HideItem( nItemId );
-            ToolBox::Paint( rRect );
-        }
-    }
-    else
-    {
-        ToolBox::Paint( rRect );
-    }
-}
-
-/*************************************************************************
-|* SoldepToolBox::MouseButtonDown()
-|************************************************************************/
-
-void SoldepToolBox::MouseButtonDown(const MouseEvent& rEvent)
-{
-    // Sind wir im DockingMode, ...
-
-    if ( !IsFloatingMode() && ((( mnWinStyle & WB_CLOSEABLE ) != 0 ) || bPinable ))
-    {
-        // ... dann testen wir, ob am Abrei�d�del der Close-Button gedr�ckt wurde ...
-
-        Rectangle aRect = GetItemRect( GetItemId( 0 ));
-        aRect = Rectangle( aRect.TopLeft(), Point( aRect.Left()+6, aRect.Top()+6 ));
-        if ( rEvent.IsLeft() && aRect.IsInside( rEvent.GetPosPixel()))
-        {
-            if ( bPinable ) {
-                TogglePin();
-                Invalidate();
-            }
-            else {
-                bCloseMode = sal_True;
-
-                // ... und zeichnen ggf. den Button gedr�ckt.
-
-                SetLineColor( Color( COL_WHITE ));
-
-                DrawLine( Point( aRect.Left(), aRect.Bottom()), Point( aRect.Right(), aRect.Bottom()));
-                DrawLine( Point( aRect.Right(), aRect.Bottom()), Point( aRect.Right(), aRect.Top()));
-
-                SetLineColor( Color( COL_GRAY ));
-
-                DrawLine( Point( aRect.Left(), aRect.Top()), Point( aRect.Right(), aRect.Top()));
-                DrawLine( Point( aRect.Left(), aRect.Top()), Point( aRect.Left(), aRect.Bottom()));
-            }
-        }
-        else
-        {
-            ToolBox::MouseButtonDown( rEvent );
-        }
-    }
-    else
-    {
-        ToolBox::MouseButtonDown( rEvent );
-    }
-
-    aMouseDownHdl.Call(this);
-}
-
-/*************************************************************************
-|* SoldepToolBox::MouseButtonUp()
-|************************************************************************/
-
-void SoldepToolBox::MouseButtonUp(const MouseEvent& rEvent)
-{
-    // Wenn der Close-Button am Abrei�d�del zuvor gedr�ckt wurde, ...
-
-    if ( bCloseMode )
-    {
-        bCloseMode = sal_False;
-
-        // ... so zeichen wir diesen wieder normal ...
-
-        Rectangle aRect = GetItemRect( GetItemId( 0 ));
-        aRect = Rectangle( aRect.TopLeft(), Point( aRect.Left()+6, aRect.Top()+6 ));
-
-        SetLineColor( Color( COL_WHITE ));
-
-        DrawLine( Point( aRect.Left(), aRect.Top()), Point( aRect.Right(), aRect.Top()));
-        DrawLine( Point( aRect.Left(), aRect.Top()), Point( aRect.Left(), aRect.Bottom()));
-
-        SetLineColor( Color( COL_GRAY ));
-
-        DrawLine( Point( aRect.Left(), aRect.Bottom()), Point( aRect.Right(), aRect.Bottom()));
-        DrawLine( Point( aRect.Right(), aRect.Bottom()), Point( aRect.Right(), aRect.Top()));
-
-        if ( rEvent.IsLeft() && aRect.IsInside( rEvent.GetPosPixel()))
-        {
-            // ... und schlie�en die Box durch Aufruf der virtuellen Methode
-            // CloseDockingMode().
-
-            CloseDockingMode();
-        }
-        else
-        {
-            ToolBox::MouseButtonUp( rEvent );
-        }
-    }
-    else
-    {
-        ToolBox::MouseButtonUp( rEvent );
-    }
-}
-
-/*************************************************************************
-|* SoldepToolBox::MouseMove()
-|************************************************************************/
-
-void SoldepToolBox::MouseMove(const MouseEvent& rEvent)
-{
-    // Wenn der Close-Button am Abrei�d�del zuvor gedr�ckt wurde, ...
-
-    if ( bCloseMode )
-    {
-        Rectangle aRect = GetItemRect( GetItemId( 0 ));
-        aRect = Rectangle( aRect.TopLeft(), Point( aRect.Left()+6, aRect.Top()+6 ));
-
-        // ... der Mouse-Zeiger jedoch den Close-Button verl��t, ...
-
-        if ( !aRect.IsInside( rEvent.GetPosPixel()))
-        {
-            SetLineColor( Color( COL_WHITE ));
-
-            // ... zeichnen wir diesen halt wieder normal.
-
-            DrawLine( Point( aRect.Left(), aRect.Top()), Point( aRect.Right(), aRect.Top()));
-            DrawLine( Point( aRect.Left(), aRect.Top()), Point( aRect.Left(), aRect.Bottom()));
-
-            SetLineColor( Color( COL_GRAY ));
-
-                DrawLine( Point( aRect.Left(), aRect.Bottom()), Point( aRect.Right(), aRect.Bottom()));
-            DrawLine( Point( aRect.Right(), aRect.Bottom()), Point( aRect.Right(), aRect.Top()));
-
-            bCloseMode = sal_False;
-        }
-        else
-        {
-            ToolBox::MouseMove( rEvent );
-        }
-    }
-    else
-    {
-        ToolBox::MouseMove( rEvent );
-    }
-}
-
-/*****************************************************************************/
-void SoldepToolBox::ToggleFloatingMode()
-/*****************************************************************************/
-{
-    ToolBox::ToggleFloatingMode();
-    CallEventListeners( VCLEVENT_USER_TBOX_RESIZE_APP, this);
-}
-
-/*****************************************************************************/
-void SoldepToolBox::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode )
-/*****************************************************************************/
-{
-    ToolBox::EndDocking( rRect, bFloatMode );
-    if ( aResizeHdl.IsSet())
-        CallEventListeners( VCLEVENT_USER_TBOX_RESIZE_APP, this);
-    else
-        {
-           GetParent()->Resize();
-        }
-};
-
-/*****************************************************************************/
-sal_Bool SoldepToolBox::Close()
-/*****************************************************************************/
-{
-    if (!ToolBox::Close()) return sal_False;
-
-    return sal_True;
-}
-
-/*****************************************************************************/
-void SoldepToolBox::Move()
-/*****************************************************************************/
-{
-}
-
-/*************************************************************************
-|* SoldepToolBox::CloseDockingMode()
-|*
-|* virtuelle Methode zur Reaktion auf den Close-Button im DockinMode
-|************************************************************************/
-
-void SoldepToolBox::CloseDockingMode()
-{
-    Hide();
-    bBoxIsVisible = sal_False;
-    CallEventListeners( VCLEVENT_USER_TBOX_RESIZE_APP, this);
-}
-
-/*************************************************************************
-|* SoldepToolBox::Command()
-|************************************************************************/
-
-void SoldepToolBox::Command( const CommandEvent& rCEvt)
-{
-    if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU )
-    {
-        if( !IsFloatingMode() && bDockable
-            && ( GetItemRect(GetItemId( 0 )).IsInside(rCEvt.GetMousePosPixel())))
-        {
-            // Hier das Context-Menue fuer Abrei�d�del dynamisch erzeugen...
-
-            PopupMenu aPopupMenu;
-
-            String sText( String::CreateFromAscii( "Floating mode" ));
-            aPopupMenu.InsertItem( 5, sText );
-            aPopupMenu.InsertSeparator();
-
-            sText = String::CreateFromAscii( "Top" );
-            aPopupMenu.InsertItem( 1, sText );
-            sText = String::CreateFromAscii( "Bottom" );
-            aPopupMenu.InsertItem( 2, sText );
-            sText = String::CreateFromAscii( "Left" );
-            aPopupMenu.InsertItem( 3, sText );
-            sText = String::CreateFromAscii( "Right" );
-            aPopupMenu.InsertItem( 4, sText );
-
-            switch( GetAlign())
-            {
-                case WINDOWALIGN_TOP : aPopupMenu.EnableItem( 1, sal_False ); break;
-                case WINDOWALIGN_BOTTOM : aPopupMenu.EnableItem( 2, sal_False ); break;
-                case WINDOWALIGN_LEFT : aPopupMenu.EnableItem( 3, sal_False ); break;
-                case WINDOWALIGN_RIGHT : aPopupMenu.EnableItem( 4, sal_False ); break;
-            }
-
-            if (( mnWinStyle & WB_CLOSEABLE ) != 0 )
-            {
-                aPopupMenu.InsertSeparator();
-                sText = String::CreateFromAscii( "Hide" );
-                aPopupMenu.InsertItem( 6, sText );
-            }
-            else if ( bPinable ) {
-                aPopupMenu.InsertSeparator();
-                sText = String::CreateFromAscii( "Pin" );
-                aPopupMenu.InsertItem( 6, sText );
-                aPopupMenu.CheckItem( 6, GetPin());
-            }
-
-            // ... und rufen.
-
-            aPopupMenu.SetSelectHdl ( LINK ( this, SoldepToolBox, MenuSelectHdl ));
-            aPopupMenu.Execute( this, rCEvt.GetMousePosPixel());
-        }
-        else if ( !GetItemId(rCEvt.GetMousePosPixel()))
-        {
-            CallContextMenu( this, rCEvt.GetMousePosPixel());
-        }
-    }
-    else ToolBox::Command( rCEvt );
-}
-
-/*************************************************************************
-|* SoldepToolBox::GetContextMenu()
-|************************************************************************/
-
-PopupMenu *SoldepToolBox::GetContextMenu()
-{
-    InitContextMenu();
-    return &aMenu;
-}
-
-/*************************************************************************
-|* SoldepToolBox::InitContextMenu()
-|************************************************************************/
-
-void SoldepToolBox::InitContextMenu()
-{
-    sal_uInt16 nStart = 0;
-    if ( bDockable )
-        nStart = 1;
-
-    aMenu.Clear();
-
-    for ( sal_uInt16 i = nStart; i < GetItemCount(); i++ )
-    {
-        sal_uInt16 nItemId = GetItemId( i );
-
-        switch ( GetItemType( i ))
-        {
-            case TOOLBOXITEM_SPACE:
-                break;
-            case TOOLBOXITEM_SEPARATOR :
-                if (!(( i < GetItemCount() - 1 ) && ( GetItemType( i + 1 ) == TOOLBOXITEM_DONTKNOW )))
-                    aMenu.InsertSeparator();
-                break;
-            default:
-                aMenu.InsertItem( nItemId, GetItemText( nItemId ), GetItemImage( nItemId ));
-                if (IsItemChecked( nItemId )) aMenu.CheckItem( nItemId, sal_True );
-                if (!IsItemEnabled( nItemId )) aMenu.EnableItem( nItemId, sal_False );
-                if (!IsItemVisible( nItemId )) aMenu.HideItem(nItemId);
-                break;
-        }
-    }
-}
-
-/*************************************************************************
-|* SoldepToolBox::CallContextMenu()
-|************************************************************************/
-
-void SoldepToolBox::CallContextMenu( Window *pWin, Point aPos )
-{
-    if ( aMenu.IsInExecute())
-        return;
-
-    InitContextMenu();
-
-    // ... und rufen.
-
-    aMenu.SetSelectHdl ( LINK ( this, SoldepToolBox, MenuSelectHdl ));
-    aMenu.Execute( pWin, aPos );
-}
-
-void SoldepToolBox::SetPosSizePixel( const Point& rNewPos,
-                                         const Size& rNewSize )
-{
-//  if(rNewPos != GetPosPixel() || rNewSize != GetSizePixel())
-//  {
-        ToolBox::SetPosSizePixel(rNewPos,rNewSize);
-//      Resize();
-//  }
-}
-
-void SoldepToolBox::SetDockingRects( const Rectangle& rOutRect,
-                                         const Rectangle& rInRect )
-{
-    if(rOutRect != aOutRect || rInRect != aInRect)
-    {
-        ToolBox::SetDockingRects(rOutRect,rInRect);
-        Invalidate();
-
-        aOutRect = rOutRect;
-        aInRect  = rInRect;
-    }
-}
-
-/*****************************************************************************/
-void SoldepToolBox::StartDocking()
-/*****************************************************************************/
-{
-    ToolBox::StartDocking();
-    CallEventListeners( VCLEVENT_USER_TBOX_RESIZE_APP, this);
-};
-
-sal_Bool SoldepToolBox::GetPin()
-
-{
-    return bPin;
-}
-
-void SoldepToolBox::TogglePin()
-{
-     bPin = !bPin;
-}
-
-void SoldepToolBox::SetPin( sal_Bool bP )
-{
-    bPin = bP;
-}
-
-/*************************************************************************
-|* SoldepToolBox::MenuSelectHdl()
-|*
-|* Handler, der beim Execute der Context-Men�s gerufen wird
-|************************************************************************/
-
-IMPL_LINK ( SoldepToolBox, MenuSelectHdl, Menu*, pMenu )
-{
-    // Wenn die CurItemId <= 6 ist, dann wurde das Abrei�d�del-Context-Men� ausgef�hrt ...
-    sal_uIntPtr itemid;
-    itemid = pMenu->GetCurItemId();
-
-    if ( pMenu == &aMenu )
-    {
-        // ... Andernfalls wurde das Default-Context-Men� ausgef�hrt ...
-        sal_uInt16 nTmpId = mnCurItemId;
-        mnCurItemId = pMenu->GetCurItemId();
-
-        // ... und der gesetzte Handler (in soldep.cxx) wird gerufen.
-        maSelectHdl.Call( this );
-        mnCurItemId = nTmpId;
-    }
-    return 0;
-}
diff --git a/soldep/util/perl.mk b/soldep/util/perl.mk
deleted file mode 100644
index 8665ae89f379..000000000000
--- a/soldep/util/perl.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(GUI)"=="WNT"
-SOLARINC+=-I$(BUILD_TOOLS)$/..$/perl$/lib$/core
-PERL_LIB=$(BUILD_TOOLS)$/..$/perl$/lib$/core$/perl58.lib
-.ENDIF 
-
-.IF "$(OS)$(CPU)" == "LINUXI"
-    .IF "$(OUTPATH)" == "unxubti8" # Hack for Ububtu x86 builds in SO environment 
-        SOLARINC+=-I$/usr$/lib$/perl$/5.8.8$/CORE
-        PERL_LIB=	-lcrypt \
-            $/usr$/lib$/libperl.a \
-            $/usr$/lib$/perl$/5.8.8$/auto/DynaLoader/DynaLoader.a
-    .ELSE
-        SOLARINC+=-I$(BUILD_TOOLS)$/..$/..$/lib$/perl5$/5.8.3$/i686-linux$/CORE
-        PERL_LIB=	-lcrypt \
-            $(BUILD_TOOLS)$/..$/..$/lib$/perl5$/5.8.3$/i686-linux$/CORE$/libperl.a \
-            $(BUILD_TOOLS)$/..$/..$/lib$/perl5$/5.8.3$/i686-linux$/auto/DynaLoader/DynaLoader.a
-    .ENDIF
-.ENDIF
-
-.IF "$(OS)$(CPU)" == "SOLARISS"
-SOLARINC+=-I$(BUILD_TOOLS)$/..$/..$/lib$/perl5$/5.8.3$/sun4-solaris$/CORE
-PERL_LIB=	-lsocket \
-            -lnsl \
-            -ldl \
-            $(BUILD_TOOLS)$/..$/..$/lib$/perl5$/5.8.3$/sun4-solaris$/CORE$/shared$/libperl.so \
-            $(BUILD_TOOLS)$/..$/..$/lib$/perl5$/5.8.3$/sun4-solaris$/CORE$/shared$/DynaLoader.a
-.ENDIF
-
-.IF "$(OS)$(CPU)" == "SOLARISI"
-SOLARINC+=-I$(BUILD_TOOLS)$/..$/..$/lib$/perl5$/5.8.3$/i86pc-solaris$/CORE
-PERL_LIB=	-lsocket \
-            -lnsl \
-            -ldl \
-            $(BUILD_TOOLS)$/..$/..$/lib$/perl5$/5.8.3$/i86pc-solaris$/CORE$/shared$/libperl.so \
-            $(BUILD_TOOLS)$/..$/..$/lib$/perl5$/5.8.3$/i86pc-solaris$/CORE$/shared$/DynaLoader.a 
-.ENDIF 
-
-.IF "$(OS)$(CPU)" == "MACOSXI"
-SOLARINC+=-I$(BUILD_TOOLS)$/..$/..$/lib$/perl5$/5.8.3$/darwin-2level$/CORE
-PERL_LIB=	\
-            $(BUILD_TOOLS)$/..$/..$/lib$/perl5$/5.8.3$/darwin-2level$/CORE$/libperl.a \
-            $(BUILD_TOOLS)$/..$/..$/lib$/perl5$/5.8.3$/darwin-2level$/auto/DynaLoader/DynaLoader.a
-.ENDIF
-
diff --git a/solenv/bin/add-modelines b/solenv/bin/add-modelines
new file mode 100755
index 000000000000..71d42090121d
--- /dev/null
+++ b/solenv/bin/add-modelines
@@ -0,0 +1,174 @@
+#!/bin/bash
+
+# add-modelines, a simple script to add comments to
+# the beginning and end of source files for LibreOffice devs
+
+# Blame goes to Jesse Adelman (at least at first)
+# someone AT boldandbusted dotty-dot com
+# http://www.boldandbusted.com/
+# (c) 2010 Bold and Busted LLC
+# Licensed under the MPL/LGPLv3 or later
+# First edit 2010-10-08
+# Updated on 2010-10-09
+# Version 0.7
+
+# NOTE: At present, this script only works for files with C-like comments.
+# NOTE: If you don't specify -p, the script will act on the current working directory.
+# NOTE: If no arguments are specified, the defitions below are in effect.
+
+# TO DO
+#  - Deuglifiy?
+#  - Make source file type agnostic modelines?
+#  - Too many/too few comments?
+#  - Handle top level source directories with whitespace names? (Do they exist?)
+
+# Turn off globbing, helps with SourceFiles
+set -f
+
+# POSIX
+set -o posix
+
+# Change these to taste
+FirstLine='/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */'
+LastLine='/* vim:set shiftwidth=4 softtabstop=4 expandtab: */'
+SourceFiles='*.cxx *.cpp *.hxx *.hpp *.c *.h'
+
+# Set defaults (don't change these)
+ModelineReplace="false"
+
+# Functions
+
+function SetEnvironment()
+{
+     if [ -n "$(which tail)" -a -n "$(which head)" ]; then
+        {
+            headCMD=`which head`
+            tailCMD=`which tail`
+        }
+        else
+        {
+            echo "Missing head or tail, exiting..."
+            exit 1
+        }
+    fi
+    if [ -n "$(which find)" ]; then
+        findCMD=`which find`
+        else
+        {
+            echo "Missing find, exiting..."
+            exit 1
+        }
+    fi
+    if [ -n "$(which awk)" ]; then
+        awkCMD=`which awk`
+        else
+        {
+            echo "Missing awk, exiting..."
+            exit 1
+        }
+    fi
+}
+
+function EditFile()
+{
+    local FileToEdit
+    local currentFirstLine
+    local currentLastLine
+
+    FileToEdit="$1"
+
+    currentFirstLine=`$headCMD -1 "$FileToEdit"`
+    currentLastLine=`$tailCMD -1 "$FileToEdit"`
+
+    case "$ModelineReplace" in
+        "true" )
+            if [ "${currentFirstLIne:0:6}" = "${FirstLine:0:6}" ]; then
+            {
+                echo "$FirstLine" > "$FileToEdit".new
+                $tailCMD -n +2 "$FileToEdit" >> "$FileToEdit".new
+            }
+            fi
+            if [ -e "$FileToEdit.new" ]; then
+            {
+                echo "$LastLine" >> "$FileToEdit".new
+            }
+            fi
+            if [ "${currentLastLine:0:6}" = "${LastLine:0:6}" ]; then
+            {
+                $headCMD -n -1 "$FileToEdit" > "$FileToEdit".new
+                echo "$LastLine" >> "$FileToEdit".new
+            }
+            fi
+            mv "$FileToEdit".new "$FileToEdit"
+            echo "$FileToEdit updated" ;;
+        "false" )
+            if [ "${currentFirstLine:0:6}" != "${FirstLine:0:6}" ]; then
+                if [ "${currentLastLine:0:6}" != "${LastLine:0:6}" ]; then
+                {
+                    echo "$FirstLine" > "$FileToEdit".new
+                    cat "$FileToEdit" >> "$FileToEdit".new
+                    if [ "x${currentLastLine}" != "x" ] ; then
+                        echo "" >> "$FileToEdit".new
+                    fi
+                    echo "$LastLine" >> "$FileToEdit".new
+                    mv "$FileToEdit".new "$FileToEdit"
+                    echo "$FileToEdit updated"
+                }
+                fi
+            fi ;;
+    esac
+}
+
+function PrintUsage()
+{
+    echo "Usage: $0 [-z] [-s \"<sourcefile glob>\"] [-p <path to source>]"
+}
+
+# Main
+
+SetEnvironment
+
+# Get command line options
+
+while getopts "zs:p:" opt; do
+    case $opt in
+        z) ModelineReplace="true" ;;
+        s) SourceFiles="$OPTARG" ;;
+        p) findPath="$OPTARG" ;;
+        *) PrintUsage
+           exit 1 ;;
+    esac
+done
+
+if [ $OPTIND -gt 1 ]; then
+    shift $(($OPTIND - 1))
+fi
+
+if [ $# -gt 1 ]; then
+{
+    PrintUsage
+    echo "Remember to quote the source file globs after -s"
+    exit 1
+}
+fi
+
+# Create GNU find expressions that traverse the filesystem once and only once
+if [ -z "$findPath" ]; then
+    findArgs='.'
+    else
+        findArgs="$findPath"
+fi
+
+for FileType in ${SourceFiles}; do
+    findArgs="$findArgs"' ( -iname '"$FileType"' -print ) , '
+done
+
+# This gets rid of the final " , " in the find argument list
+findArgs="${findArgs:0:(${#findArgs}-2)}"
+
+for file in $($findCMD $findArgs); do
+    EditFile "$file"
+    echo "Completed: " "$file"
+done
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/bin/addsym-mingw.sh b/solenv/bin/addsym-mingw.sh
index f59dbf5e64b7..f59dbf5e64b7 100644..100755
--- a/solenv/bin/addsym-mingw.sh
+++ b/solenv/bin/addsym-mingw.sh
diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
index 621ca2e4bc42..de0b57934f7f 100644
--- a/solenv/bin/addsym.awk
+++ b/solenv/bin/addsym.awk
@@ -37,15 +37,11 @@ END {
         print "UDK_3_0_0 {"
         print "global:"
         print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-        if (ENVIRON["USE_SYSTEM_STL"] != "YES")
-            print "_ZN4_STL7num_put*; # for STLport"
         print "};"
     }
 }
 state == 2 {
     print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-    if (ENVIRON["USE_SYSTEM_STL"] != "YES")
-        print "_ZN4_STL7num_put*; # for STLport"
     state = 3
 }
 # #i66636# - ???
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index d7e4ecb781ff..896d0095e4ac 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -43,6 +43,7 @@
     use Fcntl;
     use POSIX qw(:errno_h);
     use Sys::Hostname;
+    use IPC::Open3;
 
     use lib ("$ENV{SOLARENV}/bin/modules");
     use SourceConfig;
@@ -54,15 +55,12 @@
         unshift(@INC, "$ENV{COMMON_ENV_TOOLS}/modules");
         $in_so_env++;
     };
-    if (defined $ENV{CWS_WORK_STAMP}) {
-        require GenInfoParser; import GenInfoParser;
-        require IO::Handle; import IO::Handle;
-    };
     my $verbose_mode = 0;
     if (defined $ENV{verbose} || defined $ENV{VERBOSE}) {
         $verbose_mode = ($ENV{verbose} =~ /^t\S*$/i);
     }
     my $enable_multiprocessing = 1;
+
     ### for XML file format
     eval { require XMLBuildListParser; import XMLBuildListParser; };
     my $enable_xml = 0;
@@ -73,17 +71,9 @@
     };
 #### script id #####
 
-    ( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
-    my $id_str = ' $Revision: 275224 $ ';
-    my $script_rev = 0;
-    $id_str =~ /Revision:\s+(\S+)\s+\$/
-      ? ($script_rev = $1) : ($script_rev = "-");
-
-    print "$script_name -- version: $script_rev\n";
-
 #########################
 #                       #
-#   Globale Variablen   #
+#   Global Variables    #
 #                       #
 #########################
 
@@ -116,7 +106,7 @@
     my %global_deps_hash = (); # hash of dependencies of the all modules
     my %global_deps_hash_backup = (); # backup hash of external dependencies of the all modules
     my %module_deps_hash_backup = (); # backup hash of internal dependencies for aech module
-    my @broken_module_names = ();   # array of modules, which cannot be built further
+    my @broken_modules_names = ();   # array of modules, which cannot be built further
     my @dmake_args = ();
     my %dead_parents = ();
     my $initial_module = '';
@@ -143,8 +133,7 @@
     my %platforms = (); # platforms available or being working with
     my %platforms_to_copy = (); # copy output trees for the platforms when --prepare
     my $tmp_dir = get_tmp_dir(); # temp directory for checkout and other actions
-#    $dmake_batch = undef;     #
-    my @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names
+    my @possible_build_lists = ('gbuild.lst', 'build.lst', 'build.xlist'); # build lists names
     my %build_list_paths = (); # build lists names
     my %build_lists_hash = (); # hash of arrays $build_lists_hash{$module} = \($path, $xml_list_object)
     my $pre_job = 'announce'; # job to add for not-single module build
@@ -159,15 +148,13 @@
     my %build_in_progress_shown = ();  # hash of modules being built,
                                     # and shown last time (to keep order)
     my $build_time = time;
-    my $html_last_updated = 0;
     my %jobs_hash = ();
     my $html_path = undef;
     my $build_finished = 0;
     my $html_file = '';
-    my %had_error = (); # hack for misteriuos windows problems - try run dmake 2 times if first time there was an error
+    my %had_error = (); # hack for mysterious windows problems - try run dmake 2 times if first time there was an error
     my $mkout = correct_path("$ENV{SOLARENV}/bin/mkout.pl");
     my %weights_hash = (); # hash contains info about how many modules are dependent from one module
-#    %weight_stored = ();
     my $grab_output = 1;
     my $stop_build_on_error = 0; # for multiprocessing mode: do not build further module if there is an error
     my $interactive = 0; # for interactive mode... (for testing purpose enabled by default)
@@ -195,11 +182,19 @@
     my %add_to_config = ();
     my %remove_from_config = ();
     my $clear_config = 0;
-    my $finisched_children = 0;
+    my $finished_children = 0;
     my $debug = 0;
     my %module_deps_hash_pids = ();
     my @argv = @ARGV;
     my $source_config_file;
+    my $zenity_pid = 0;
+    my $zenity_in = '';
+    my $zenity_out = '';
+    my $zenity_err = '';
+    my $allow_gbuild = 0;
+    my %is_gbuild = ();
+    my $verbose = 0;
+
     my @modules_built = ();
     my $deliver_command = $ENV{DELIVER};
     my %prj_platform = ();
@@ -214,13 +209,14 @@
 
     get_options();
 
-#    my $temp_html_file = correct_path($tmp_dir. '/' . $ENV{INPATH}. '.build.html');
+    zenity_open();
+    zenity_tooltip("Starting build.");
+
     get_build_modes();
     my %deliver_env = ();
     if ($prepare) {
         get_platforms(\%platforms);
 
-        $deliver_env{'BUILD_SOSL'}++;
         $deliver_env{'COMMON_OUTDIR'}++;
         $deliver_env{'GUI'}++;
         $deliver_env{'INPATH'}++;
@@ -229,9 +225,11 @@
         $deliver_env{'L10N_framework'}++;
     };
     my $workspace_path = get_workspace_path();   # This also sets $initial_module
+    my $build_error_log = Cwd::realpath(correct_path($workspace_path)) ."/build_error.log";
     my $source_config = SourceConfig -> new($workspace_path);
     check_partial_gnumake_build($initial_module);
 
+    system("rm -f $build_error_log");
     if ($html) {
         if (defined $html_path) {
             $html_file = correct_path($html_path . '/' . $ENV{INPATH}. '.build.html');
@@ -252,7 +250,7 @@
     get_module_and_buildlist_paths();
     provide_consistency() if (defined $ENV{CWS_WORK_STAMP} && defined($ENV{COMMON_ENV_TOOLS}));
 
-    $deliver_command .= ' -verbose' if ($html);
+    $deliver_command .= ' -verbose' if ($html || $verbose);
     $deliver_command .= ' '. $dlv_switch if ($dlv_switch);
     $ENV{mk_tmp}++;
 
@@ -262,7 +260,7 @@
         if (open (CMD_FILE, ">>$cmd_file")) {
             select CMD_FILE;
             $echo = 'echo ';
-            if ($ENV{GUI} ne 'UNX') {
+            if ($ENV{GUI_FOR_BUILD} ne 'UNX') {
                 $new_line = "echo.\n";
                 print "\@$echo off\npushd\n";
             } else {
@@ -271,8 +269,6 @@
         } else {
             print_error ("Cannot open file $cmd_file");
         };
-#    } elsif ($show) {
-#        select STDOUT;
     };
 
     print $new_line;
@@ -286,8 +282,6 @@
     }
     if (scalar keys %broken_build) {
         cancel_build();
-#    } elsif (!$custom_job && $post_custom_job) {
-#        do_post_custom_job(correct_path($workspace_path.$initial_module));
     };
     print_warnings();
     if (scalar keys %active_modules) {
@@ -306,7 +300,7 @@
         print $new_line;
         do_exit(1) if ($checkparents);
     };
-    if (($ENV{GUI} ne 'UNX') && $cmd_file) {
+    if (($ENV{GUI_FOR_BUILD} ne 'UNX') && $cmd_file) {
         print "popd\n";
     };
     $ENV{mk_tmp} = '';
@@ -406,7 +400,6 @@ sub start_html_message_trigger {
 
     if ($child_id) {
         # parent
-#       print "started listener trigger\n";
     } else {
         my $buffer_size = 1024;
         my $buffer;
@@ -423,7 +416,6 @@ sub start_html_message_trigger {
             if (connect(SOCKET, $paddr)) {
                 $full_buffer .= "\n";
                 syswrite SOCKET, $full_buffer, length $full_buffer;
-#                close SOCKET or die "Child close socket: $!";
             } else {
                 die "Child connect: $!";
             };
@@ -440,10 +432,9 @@ sub get_html_orders {
     my $full_buffer = '';
     my %modules_to_rebuild = ();
     my %modules_to_delete = ();
-        while ($rv = sysread(HTML_PIPE, $buffer, $buffer_size)) {
-            $full_buffer .= $buffer;
-        };
-#    };
+    while ($rv = sysread(HTML_PIPE, $buffer, $buffer_size)) {
+        $full_buffer .= $buffer;
+    };
     my @html_messages = split(/\n/, $full_buffer);
     foreach (@html_messages) {
         if (/^html_port:(\d+)/) {
@@ -531,7 +522,6 @@ sub schedule_rebuild {
     };
 };
 
-
 #
 # procedure retrieves build list path
 # (all possibilities are taken into account)
@@ -545,10 +535,17 @@ sub get_build_list_path {
         my $possible_dir_path = $module_paths{$_}.'/prj/';
         if (-d $possible_dir_path) {
             foreach my $build_list (@possible_build_lists) {
-                my $possible_build_list_path = correct_path($possible_dir_path . $build_list);
-                if (-f $possible_build_list_path) {
-                    $build_list_paths{$module} = $possible_build_list_path;
-                    return $possible_build_list_path;
+                # if gbuild are allow we favor gbuild.lst as the build instruction
+                if($build_list ne "gbuild.lst" || $allow_gbuild) {
+                    my $possible_build_list_path = correct_path($possible_dir_path . $build_list);
+                    if (-f $possible_build_list_path) {
+                        $build_list_paths{$module} = $possible_build_list_path;
+                        if ($build_list eq "gbuild.lst") {
+#                           print  "Using gmake for module $module\n";
+                            $is_gbuild{$module} = 1;
+                        };
+                        return $possible_build_list_path;
+                    };
                 };
             }
             print_error("There's no build list for $module");
@@ -628,7 +625,7 @@ sub expand_dependencies {
 # This procedure fills the second hash with reversed dependencies,
 # ie, with info about modules "waiting" for the module
 #
-sub reverse_dependensies {
+sub reverse_dependencies {
     my ($deps_hash, $reversed) = @_;
     foreach my $module (keys %$deps_hash) {
         foreach (keys %{$$deps_hash{$module}}) {
@@ -658,7 +655,7 @@ sub build_all {
         prepare_incompatible_build(\%global_deps_hash) if ($incompatible && (!$build_from_with_branches));
         if ($build_from_with_branches) {
             my %reversed_full_deps_hash = ();
-            reverse_dependensies(\%global_deps_hash, \%reversed_full_deps_hash);
+            reverse_dependencies(\%global_deps_hash, \%reversed_full_deps_hash);
             prepare_build_from_with_branches(\%global_deps_hash, \%reversed_full_deps_hash);
         }
         if ($build_all_cont || $build_since) {
@@ -685,7 +682,7 @@ sub build_all {
         };
         store_weights(\%global_deps_hash);
         backup_deps_hash(\%global_deps_hash, \%global_deps_hash_backup);
-        reverse_dependensies(\%global_deps_hash_backup, \%reversed_dependencies);
+        reverse_dependencies(\%global_deps_hash_backup, \%reversed_dependencies);
         $modules_number = scalar keys %global_deps_hash;
         initialize_html_info($_) foreach (keys %global_deps_hash);
         if ($processes_to_run) {
@@ -757,6 +754,7 @@ sub dmake_dir {
     my $job_name = shift;
     $jobs_hash{$job_name}->{START_TIME} = time();
     $jobs_hash{$job_name}->{STATUS} = 'building';
+
     if ($job_name =~ /(\s)/o && (!-d $job_name)) {
         $error_code = do_custom_job($job_name, \%local_deps_hash);
     } else {
@@ -779,12 +777,20 @@ sub dmake_dir {
             print "$dmake\n";
             print $check_error_string;
         } else {
-            print "\n" if ( ! $show );
             print "Entering $job_name\n";
         };
         remove_from_dependencies($job_name, \%local_deps_hash) if (!$child);
         return if ($cmd_file || $show);
         $error_code = run_job($dmake, $job_name);
+
+        #if dmake fails, have a go at regenerating the dependencies
+        #and try again. dmakes normal failure is 255, while death on signal is 254
+        my $real_exit_code = $error_code >> 8;
+        if (($ENV{GUI_FOR_BUILD} eq 'WNT') && ($real_exit_code == 255) && ($ENV{nodep} eq '') && ($ENV{depend} eq '')) {
+            print "Retrying $job_name\n";
+            $error_code = run_job($dmake, $job_name);
+        }
+
         html_store_job_info(\%local_deps_hash, $job_name, $error_code) if (!$child);
     };
 
@@ -873,7 +879,7 @@ sub get_prj_platform {
         s/\r\n//;
         $line++;
         if ($_ =~ /\snmake\s/) {
-            if ($' =~ /\s*-\s+(\w+)[,\S+]*\s+(\S+)/ ) {
+            if ($' =~ /\s*-\s+(\w+)[,\S+]*\s+(\S+)/ ) { #'
                 my $platform = $1;
                 my $alias = $2;
                 print_error ("There is no correct alias set in the line $line!") if ($alias eq 'NULL');
@@ -944,7 +950,6 @@ sub get_deps_hash {
     };
 
     my  $build_list_ref = $build_lists_hash{$module_to_build};
-#    delete $build_lists_hash{$module_to_build};
     if (ref($build_list_ref) eq 'XMLBuildListParser') {
         get_deps_from_object($module_to_build, $build_list_ref, $dependencies_hash);
     } else {
@@ -966,7 +971,7 @@ sub get_deps_hash {
                 $platform = $1;
                 $dependencies = $';
                 while ($dependencies =~ /,(\w+)/o) {
-                    $dependencies = $';
+                    $dependencies = $'; #'
                 };
                 $dependencies =~ /\s+(\S+)\s+/o;
                 $dir_alias = $1;
@@ -978,7 +983,7 @@ sub get_deps_hash {
                 delete $dead_dependencies{$dir_alias} if (defined $dead_dependencies{$dir_alias});
                 print_error("Directory alias $dir_alias is defined at least twice!! Please, correct build.lst in module $module_to_build") if (defined $$dependencies_hash{$dir_alias});
                 $platform_hash{$dir_alias}++;
-                $dependencies = $';
+                $dependencies = $'; #'
                 print_error("$module_to_build/prj/build.lst has wrongly written dependencies string:\n$_\n") if (!$dependencies);
                 $deps_hash{$_}++ foreach (get_dependency_array($dependencies));
                 $$dependencies_hash{$dir_alias} = \%deps_hash;
@@ -1088,14 +1093,9 @@ sub correct_path {
 
 
 sub check_dmake {
-#print "Checking dmake...";
     if (open(DMAKEVERSION, "dmake -V |")) {
-#    if (open(DMAKEVERSION, "dmake -V |")) {
         my @dmake_version = <DMAKEVERSION>;
         close DMAKEVERSION;
-#       if ($dmake_version[0] =~ /^dmake\s\-\sCopyright\s\(c\)/) {
-#            print " Using version $1\n" if ($dmake_version[0] =~ /Version\s(\d+\.*\d*)/);
-#        };
         return;
     };
     my $error_message = 'dmake: Command not found.';
@@ -1113,7 +1113,7 @@ sub get_commands {
     check_dmake();
 
     if ($cmd_file) {
-        if ($ENV{GUI} eq 'UNX') {
+        if ($ENV{GUI_FOR_BUILD} eq 'UNX') {
             $check_error_string = "if \"\$?\" != \"0\" exit\n";
         } else {
             $check_error_string = "if \"\%?\" != \"0\" quit\n";
@@ -1125,7 +1125,7 @@ sub get_commands {
     while ($arg = pop(@dmake_args)) {
         $dmake .= ' '.$arg;
     };
-    $dmake .= ' verbose=true' if ($html);
+    $dmake .= ' verbose=true' if ($html || $verbose);
 };
 
 #
@@ -1172,7 +1172,6 @@ sub check_platform {
     return 1 if ($platform eq 'all');
     return 1 if (($ENV{GUI} eq 'WIN') && ($platform eq 'w'));
     return 1 if (($ENV{GUI} eq 'UNX') && ($platform eq 'u'));
-    return 1 if (($ENV{GUI} eq 'OS2') && ($platform eq 'p'));
     return 1 if (($ENV{GUI} eq 'WNT') &&
                  (($platform eq 'w') || ($platform eq 'n')));
     return 0;
@@ -1350,7 +1349,7 @@ sub get_dependency_array {
         print_error("Project $prj has wrongly written dependencies string:\n $string") if (!$dep_string);
         $dep_string =~ /(\S+)\s*/o;
         $parent_prj = $1;
-        $dep_string = $';
+        $dep_string = $'; #'
         if ($parent_prj =~ /\.(\w+)$/o) {
             $parent_prj = $`;
             if (($prj_platform{$parent_prj} ne $1) &&
@@ -1404,7 +1403,7 @@ sub print_error {
 
 sub usage {
     print STDERR "\nbuild\n";
-    print STDERR "Syntax:    build    [--all|-a[:prj_name]]|[--from|-f prj_name1[:prj_name2] [prj_name3 [...]]]|[--since|-c prj_name] [--with_branches prj_name1[:prj_name2] [--skip prj_name1[:prj_name2] [prj_name3 [...]] [prj_name3 [...]|-b]|[--prepare|-p][:platform] [--deliver|-d [--dlv_switch deliver_switch]]] [-P processes|--server [--setenvstring \"string\"] [--client_timeout MIN] [--port port1[:port2:...:portN]]] [--show|-s] [--help|-h] [--file|-F] [--ignore|-i] [--version|-V] [--mode|-m OOo[,SO[,EXT]] [--html [--html_path html_file_path] [--dontgraboutput]] [--pre_job=pre_job_sring] [--job=job_string|-j] [--post_job=post_job_sring] [--stoponerror] [--genconf [--removeall|--clear|--remove|--add [module1,module2[,...,moduleN]]]] [--exclude_branch_from prj_name1[:prj_name2] [prj_name3 [...]]] [--interactive]\n";
+    print STDERR "Syntax:    build    [--all|-a[:prj_name]]|[--from|-f prj_name1[:prj_name2] [prj_name3 [...]]]|[--since|-c prj_name] [--with_branches prj_name1[:prj_name2] [--skip prj_name1[:prj_name2] [prj_name3 [...]] [prj_name3 [...]|-b]|[--prepare|-p][:platform] [--deliver|-d [--dlv_switch deliver_switch]]] [-P processes|--server [--setenvstring \"string\"] [--client_timeout MIN] [--port port1[:port2:...:portN]]] [--show|-s] [--help|-h] [--file|-F] [--ignore|-i] [--version|-V] [--mode|-m OOo[,SO[,EXT]] [--html [--html_path html_file_path] [--dontgraboutput]] [--pre_job=pre_job_sring] [--job=job_string|-j] [--post_job=post_job_sring] [--stoponerror] [--genconf [--removeall|--clear|--remove|--add [module1,module2[,...,moduleN]]]] [--exclude_branch_from prj_name1[:prj_name2] [prj_name3 [...]]] [--interactive] [--verbose]\n";
     print STDERR "Example1:    build --from sfx2\n";
     print STDERR "                     - build all projects dependent from sfx2, starting with sfx2, finishing with the current module\n";
     print STDERR "Example2:    build --all:sfx2\n";
@@ -1447,6 +1446,7 @@ sub usage {
 
     print STDERR "        --stoponerror      - stop build when error occurs (for mp builds)\n";
     print STDERR "        --interactive      - start interactive build process (process can be managed via html page)\n";
+    print STDERR "        --verbose          - generates a detailed output of the build process\n";
     print STDERR "   Custom jobs:\n";
     print STDERR "        --job=job_string        - execute custom job in (each) module. job_string is a shell script/command to be executed instead of regular dmake jobs\n";
     print STDERR "        --pre_job=pre_job_string        - execute preliminary job in (each) module. pre_job_string is a shell script/command to be executed before regular job in the module\n";
@@ -1469,9 +1469,10 @@ sub get_options {
         $arg =~ /^--checkmodules$/       and $checkparents = 1 and $ignore = 1 and next;
         $arg =~ /^-s$/        and $show = 1                         and next;
         $arg =~ /^--deliver$/    and $deliver = 1                     and next;
+        $arg =~ /^--gmake$/    and $allow_gbuild = 1 and print "ALLOW GBUILD" and next;
         $arg =~ /^(--job=)/       and $custom_job = $' and next;
         $arg =~ /^(--pre_job=)/       and $pre_custom_job = $' and next;
-        $arg =~ /^(--post_job=)/       and $post_custom_job = $' and next;
+        $arg =~ /^(--post_job=)/       and $post_custom_job = $' and next; #'
         $arg =~ /^-d$/    and $deliver = 1                     and next;
         $arg =~ /^--dlv_switch$/    and $dlv_switch = shift @ARGV    and next;
         $arg =~ /^--file$/        and $cmd_file = shift @ARGV             and next;
@@ -1537,6 +1538,7 @@ sub get_options {
         $arg =~ /^--mode$/        and get_modes()         and next;
         $arg =~ /^--stoponerror$/        and $stop_build_on_error = 1         and next;
         $arg =~ /^--interactive$/        and $interactive = 1         and next;
+        $arg =~ /^--verbose$/       and $verbose = 1         and next;
         if ($arg =~ /^--$/) {
             push (@dmake_args, get_dmake_args()) if (!$custom_job);
             next;
@@ -1553,7 +1555,6 @@ sub get_options {
     $grab_output = 0 if ($dont_grab_output);
     print_error('Switches --with_branches and --all collision') if ($build_from_with_branches && $build_all_cont);
     print_error('Switch --skip is for building multiple modules only!!') if ((scalar keys %skip_modules) && (!$build_all_parents));
-#    print_error('Please prepare the workspace on one of UNIX platforms') if ($prepare && ($ENV{GUI} ne 'UNX'));
     print_error('Switches --with_branches and --since collision') if ($build_from_with_branches && $build_since);
     if ($show) {
         $processes_to_run = 0;
@@ -1620,11 +1621,12 @@ sub get_module_and_buildlist_paths {
         $source_config_file = $source_config->get_config_file_path();
         $active_modules{$_}++ foreach ($source_config->get_active_modules());
         my %active_modules_copy = %active_modules;
-        foreach ($source_config->get_all_modules()) {
-            delete $active_modules_copy{$_} if defined($active_modules_copy{$_});
-            next if ($_ eq $initial_module);
-            $module_paths{$_} = $source_config->get_module_path($_);
-            $build_list_paths{$_} = $source_config->get_module_build_list($_)
+        foreach my $module ($source_config->get_all_modules()) {
+            delete $active_modules_copy{$module} if defined($active_modules_copy{$module});
+            next if ($module eq $initial_module);
+            $module_paths{$module} = $source_config->get_module_path($module);
+            $build_list_paths{$module} = $source_config->get_module_build_list($module);
+            $is_gbuild{$module} = $source_config->{GBUILD};
         }
         $dead_parents{$_}++ foreach (keys %active_modules_copy);
     };
@@ -1664,46 +1666,60 @@ sub get_switch_options {
 # cancel build when one of children has error exit code
 #
 sub cancel_build {
-#    close_server_socket();
-    my $broken_modules_number = scalar @broken_module_names;
-    my $message_part = 'build ';
-    if (scalar keys %incompatibles) {
-        my @incompatible_modules = keys %incompatibles;
-        if ($stop_build_on_error) {
-            $message_part .= "--from @incompatible_modules:@broken_module_names\n";
-        } else {
-            $message_part .= "--from @broken_module_names\n";
-        };
-    } else {
-        if ($processes_to_run) {
-            $message_part .= "--from ";
-        } else {
-            $message_part .= "--all:";
-        };
-        $message_part .= "@broken_module_names\n";
+    my $broken_modules_number = scalar @broken_modules_names;
 
-    };
-    if ($broken_modules_number && $build_all_parents) {
-        print STDERR "\n";
-        print STDERR $broken_modules_number;
-        print STDERR " module(s): ";
-        foreach (@broken_module_names) {
-            print STDERR "\n\t$_";
-        };
-        print STDERR "\nneed(s) to be rebuilt\n\nReason(s):\n\n";
-        foreach (keys %broken_build) {
-            print STDERR "ERROR: error " . $broken_build{$_} . " occurred while making $_\n";
-        };
-        print STDERR "\nAttention: if you fix the errors in above module(s) you may prolongue your the build issuing command:\n\n\t" . $message_part;
-    } else {
+    print STDERR "\n";
+    print STDERR "-----------------------------------------------------------------------\n";
+    print STDERR "        Oh dear - something failed during the build - sorry !\n";
+    print STDERR "  For more help with debugging build errors, please see the section in:\n";
+    print STDERR "            http://wiki.documentfoundation.org/Development\n";
+    print STDERR "\n";
+
+    if (!$broken_modules_number || !$build_all_parents) {
         while (children_number()) {
             handle_dead_children(1);
         }
+    }
+
+    if (keys %broken_build) {
+        print STDERR "  internal build errors:\n\n";
         foreach (keys %broken_build) {
             print STDERR "ERROR: error " . $broken_build{$_} . " occurred while making $_\n";
         };
-    };
-    print "\n";
+        print STDERR "\n";
+    }
+
+    my $module = shift @broken_modules_names;
+    if ($broken_modules_number > 1) {
+        print STDERR " it seems you are using a threaded build, which means that the\n";
+        print STDERR " actual compile error is probably hidden far above, and could be\n";
+        print STDERR " inside any of these other modules:\n";
+        print STDERR "     @broken_modules_names\n";
+        print STDERR " please re-run build inside each one to isolate the problem.\n";
+    } else {
+        print STDERR " it seems that the error is inside '$module', please re-run build\n";
+        print STDERR " inside this module to isolate the error and/or test your fix:\n";
+    }
+    print STDERR "-----------------------------------------------------------------------\n";
+    print STDERR "\n";
+    print STDERR "rm -Rf " . $ENV{'SRC_ROOT'} . "/$module/" . $ENV{'INPATH'} . " # optional module 'clean'\n";
+    print STDERR "" . $ENV{'OOO_SHELL'} . "\n";
+    print STDERR "cd " . $ENV{'SRC_ROOT'} . "\n";
+    print STDERR "source ./" . $ENV{'ENV_SCRIPT'} . "\n";
+    print STDERR "cd $module\n";
+    if (is_gnumake_module($module))
+    {
+        print STDERR "$ENV{GNUMAKE} -r\n"
+    }
+    else
+    {
+        print STDERR "build\n";
+    }
+    print STDERR "\n";
+    print STDERR "when the problem is isolated and fixed exit and re-run 'make' from the top-level\n";
+    zenity_message("LibreOffice Build Failed!");
+    zenity_close();
+
     do_exit(1);
 };
 
@@ -1713,8 +1729,15 @@ sub cancel_build {
 sub store_error {
     my ($pid, $error_code) = @_;
     return 0 if (!$error_code);
+
+    #we don't care if zenity itself crashes, e.g. rhbz#670895
+    if (zenity_enabled()) {
+        return 0 if ($zenity_pid == $pid);
+    }
+
     my $child_nick = $processes_hash{$pid};
-    if ($ENV{GUI} eq 'WNT') {
+
+    if ($ENV{GUI_FOR_BUILD} eq 'WNT') {
         if (!defined $had_error{$child_nick}) {
             $had_error{$child_nick}++;
             return 1;
@@ -1756,14 +1779,14 @@ sub handle_dead_children {
             } else {
                 clear_from_child($pid);
             };
-            $finisched_children++;
+            $finished_children++;
         };
     } while(children_number() >= $processes_to_run);
 };
 
 sub give_second_chance {
     my $pid = shift;
-    # A malicious hack for misterious windows problems - try 2 times
+    # A malicious hack for mysterious windows problems - try 2 times
     # to run dmake in the same directory if errors occurs
     my $child_nick = $processes_hash{$pid};
     $running_children{$folders_hashes{$child_nick}}--;
@@ -1829,7 +1852,7 @@ sub build_dependent {
             mp_success_exit();
         } else {
             if (dmake_dir($child_nick)) {
-                push(@broken_module_names, $module_by_hash{$dependencies_hash});
+                push(@broken_modules_names, $module_by_hash{$dependencies_hash});
                 cancel_build();
             };
         };
@@ -1891,7 +1914,7 @@ sub build_multiprocessing {
     my $prj;
     do {
         my $got_module = 0;
-        $finisched_children = 0;
+        $finished_children = 0;
         while ($prj = pick_prj_to_build(\%global_deps_hash)) {
             if (!defined $projects_deps_hash{$prj}) {
                 $projects_deps_hash{$prj} = {};
@@ -1905,8 +1928,7 @@ sub build_multiprocessing {
         };
         if (!$got_module) {
             cancel_build() if ((!scalar keys %module_build_queue) && !children_number());
-            if (!$finisched_children) {
-#                print "#### 1979: Starting waiting for dead child\n";
+            if (!$finished_children) {
                 handle_dead_children(1);
             };
         };
@@ -1915,7 +1937,6 @@ sub build_multiprocessing {
     # Let the last module be built till the end
     while (scalar keys %module_build_queue) {
         build_actual_queue(\%module_build_queue);
-#        print "#### 1988: Starting waiting for dead child\n";
         handle_dead_children(1);
     };
     # Let all children finish their work
@@ -1927,12 +1948,10 @@ sub build_multiprocessing {
 };
 
 sub mp_success_exit {
-#    close_server_socket();
-#    if (!$custom_job && $post_custom_job) {
-#        do_post_custom_job(correct_path($workspace_path.$initial_module));
-#    };
     print "\nMultiprocessing build is finished\n";
     print "Maximal number of processes run: $maximal_processes\n";
+    zenity_message("LibreOffice Build Success!");
+    zenity_close();
     do_exit(0);
 };
 
@@ -1959,7 +1978,7 @@ sub build_actual_queue {
                 return;
             };
             if (defined $modules_with_errors{$projects_deps_hash{$prj}} && !$ignore) {
-                push (@broken_module_names, $prj);
+                push (@broken_modules_names, $prj);
                 delete $$build_queue{$prj};
                 next;
             };
@@ -1997,19 +2016,23 @@ sub run_job {
     chdir $path;
     getcwd();
 
-    if ($html) {
-        my $log_file = $jobs_hash{$registered_name}->{LONG_LOG_PATH};
-        my $log_dir = File::Basename::dirname($log_file);
-        if (!-d $log_dir) {
-             system("$perl $mkout");
-        };
-        $error_code = system ("$job_to_do > $log_file 2>&1");
-        if (!$grab_output && -f $log_file) {
-            system("cat $log_file");
-        };
-    } else {
-        $error_code = system ("$job_to_do");
+    my $log_file = $jobs_hash{$registered_name}->{LONG_LOG_PATH};
+    my $log_dir = File::Basename::dirname($log_file);
+    if (!-d $log_dir) {
+        system("$perl $mkout");
     };
+    open (MAKE, "$job_to_do 2>&1 |") or return 8;
+    open (LOGFILE, "> $log_file") or return 8;
+    while (<MAKE>) { print LOGFILE $_; print $_ }
+    close MAKE;
+    $error_code = $?;
+    close LOGFILE;
+    if ( $error_code != 0)
+    {
+        system("echo \"log for $path\" >> $build_error_log");
+        system("cat $log_file >> $build_error_log");
+    }
+
     return $error_code;
 };
 
@@ -2017,18 +2040,17 @@ sub do_custom_job {
     my ($module_job, $dependencies_hash) = @_;
     $module_job =~ /(\s)/o;
     my $module = $`;
-    my $job = $';
+    my $job = $'; #'
     html_store_job_info($dependencies_hash, $module_job);
     my $error_code = 0;
     if ($job eq $pre_job) {
         announce_module($module);
-#        html_store_job_info($dependencies_hash, $job_dir);
         remove_from_dependencies($module_job, $dependencies_hash);
     } else {
         $error_code = run_job($job, $module_paths{$module}, $module_job);
         if ($error_code) {
             # give windows one more chance
-            if ($ENV{GUI} eq 'WNT') {
+            if ($ENV{GUI_FOR_BUILD} eq 'WNT') {
                 $error_code = run_job($job, $module_paths{$module}, $module_job);
             };
         };
@@ -2082,9 +2104,55 @@ sub print_announce {
     $announce_string .= $echo . $text;
     $announce_string .= $echo . "=============\n";
     print $announce_string;
+    my $total_modules = scalar(keys %build_lists_hash);
+    my $modules_started = scalar(keys %module_announced) + 1;
+    zenity_tooltip("($modules_started/$total_modules) $text");
     $module_announced{$prj}++;
 };
 
+sub zenity_enabled {
+    return 0 if ($ENV{ENABLE_ZENITY} ne "TRUE");
+    return 0 if (!defined $ENV{DISPLAY});
+    return 1 if ($ENV{DISPLAY} =~ m/^:/); # local displays only
+    return 0;
+}
+
+sub zenity_open {
+    if (zenity_enabled()) {
+        $SIG{PIPE} = 'IGNORE';
+        $zenity_pid = open3($zenity_in, $zenity_out, $zenity_err,
+                               "zenity --notification --listen");
+    };
+};
+
+sub zenity_close {
+    if (zenity_enabled()) {
+        sleep(1); # Give Zenity a chance to show the message.
+        close($zenity_in);
+    };
+};
+
+sub zenity_icon {
+    if (zenity_enabled()) {
+        my $filename = shift;
+        print $zenity_in "icon: $filename\n";
+    };
+};
+
+sub zenity_tooltip {
+    if (zenity_enabled()) {
+        my $text = shift;
+        print $zenity_in "tooltip: LibreOffice Build: $text\n";
+    };
+};
+
+sub zenity_message {
+    if (zenity_enabled()) {
+        my $text = shift;
+        print $zenity_in "message: $text\n";
+    };
+};
+
 sub are_all_dependent {
     my $build_queue = shift;
     my $folder = '';
@@ -2139,21 +2207,6 @@ sub provide_consistency {
 };
 
 #
-# Get the workspace list ('stand.lst'), either from 'localini'
-# or, if this is not possible, from 'globalini.
-# (Heiner's proprietary :)
-#
-sub get_workspace_lst
-{
-    my $home = $ENV{HOME};
-    my $inifile = $ENV{HOME}. '/localini/stand.lst';
-    if (-f $inifile) {
-        return $inifile;
-    };
-    return '';
-}
-
-#
 # Procedure clears up module for incompatible build
 #
 sub ensure_clear_module {
@@ -2186,13 +2239,11 @@ sub clear_module {
         next if (/^\.+$/);
         my $dir = correct_path($module_paths{$module}.'/'.$_);
         if ((!-d $dir.'/.svn') && is_output_tree($dir)) {
-            #print "I would delete $dir\n";
             rmtree("$dir", 0, 1);
             if (-d $dir) {
                 system("$remove_command $dir");
                 if (-d $dir) {
                     push(@warnings, "Cannot delete $dir");
-#print_error("Cannot delete $dir");
                 } else {
                     print STDERR (">>> Removed $dir by force\n");
                 };
@@ -2244,7 +2295,6 @@ sub retrieve_build_list {
     my $solver_inc_dir = "$ENV{SOLARVER}/$ENV{OUTPATH}";
     $solver_inc_dir .= $ENV{PROEXT} if (defined $ENV{PROEXT});
     $solver_inc_dir .= '/inc';
-    $solver_inc_dir .= $ENV{UPDMINOREXT} if (defined $ENV{UPDMINOREXT});
     $solver_inc_dir .= "/$module";
     $solver_inc_dir = correct_path($solver_inc_dir);
     $dead_parents{$module}++;
@@ -2275,7 +2325,6 @@ sub prepare_build_from_with_branches {
             if (defined ${$$reversed_full_deps_hash{$prerequisite}}{$dependent_module}) {
                 remove_from_dependencies($prerequisite, $full_deps_hash);
                 delete $$full_deps_hash{$prerequisite};
-#                print "Removed $prerequisite\n";
                 last;
             };
         };
@@ -2343,7 +2392,7 @@ sub prepare_incompatible_build {
         print "WARNING(S):\n";
         print STDERR "$_\n" foreach (@warnings);
         print "\nATTENTION: If you are performing an incompatible build, please break the build with Ctrl+C and prepare the workspace with \"--prepare\" switch!\n\n" if (!$prepare);
-        sleep(10);
+        sleep(5);
     };
     if ($prepare) {
     print "\nPreparation finished";
@@ -2416,9 +2465,6 @@ sub get_list_of_modules {
             };
         };
     };
-#    if (!scalar %$hash_ref) {
-#        print_error('No module list supplied!!');
-#    };
 };
 
 sub get_modules_passed {
@@ -2432,34 +2478,13 @@ sub get_modules_passed {
             if ($option =~ /(:)/) {
                 $option = $`;
                 print_error("\'--from\' switch collision") if ($build_all_cont);
-                $build_all_cont = $';
+                $build_all_cont = $'; #'
             };
             $$hash_ref{$option}++;
         };
     };
 };
 
-sub get_workspace_platforms {
-    my $workspace_patforms = shift;
-    my $solver_path = $ENV{SOLARVERSION};
-    opendir(SOLVERDIR, $solver_path);
-    my @dir_list = readdir(SOLVERDIR);
-    close SOLVERDIR;
-    foreach (@dir_list) {
-        next if /^common/;
-        next if /^\./;
-        if (open(LS, "ls $solver_path/$_/inc/*minor.mk 2>$nul |")) {
-            foreach my $string (<LS>) {
-                chomp $string;
-                if ($string =~ /minor.mk$/) {
-                    $$workspace_patforms{$_}++
-                };
-            };
-            close LS;
-        };
-    };
-};
-
 sub get_platforms {
     my $platforms_ref = shift;
     if ($only_platform) {
@@ -2469,27 +2494,6 @@ sub get_platforms {
         $platforms_ref = \%platforms_to_copy;
     };
 
-    my $workspace_lst = get_workspace_lst();
-    if ($workspace_lst) {
-        my $workspace_db;
-        eval { $workspace_db = GenInfoParser->new(); };
-        if (!$@) {
-            my $success = $workspace_db->load_list($workspace_lst);
-            if ( !$success ) {
-                print_error("Can't load workspace list '$workspace_lst'.", 4);
-            }
-            my $access_path = $ENV{WORK_STAMP} . '/Environments';
-            my @platforms_available = $workspace_db->get_keys($access_path);
-            my $solver = $ENV{SOLARVERSION};
-            foreach (@platforms_available) {
-                my $s_path = $solver . '/' .  $_;
-                $$platforms_ref{$_}++ if (-d $s_path);
-            };
-        } else {
-            get_workspace_platforms(\%platforms);
-        };
-    };
-
     if (!scalar keys %platforms) {
         # An Auses wish - fallback to INPATH for new platforms
         if (defined $ENV{INPATH}) {
@@ -2528,7 +2532,6 @@ sub clear_delivered {
             };
         };
         my $undeliver = "$deliver_command $deliver_delete_switches $nul";
-#        my $current_dir = getcwd();
         foreach my $module (sort @modules_built) {
             if (chdir($module_paths{$module})) {
                 print "Removing delivered from module $module\n";
@@ -2541,8 +2544,6 @@ sub clear_delivered {
                 push(@warnings, "Could not remove delivered files from the module $module. Your build can become inconsistent.\n");
             };
         };
-#        chdir $current_dir;
-#        getcwd();
     };
     $ENV{$_} = $backup_vars{$_} foreach (keys %backup_vars);
 };
@@ -2567,12 +2568,11 @@ sub read_ssolar_vars {
         $platform = $`;
     };
 
-    my ($verswitch, $source_root, $cwsname);
-    $verswitch = "-ver $ENV{UPDMINOR}" if (defined $ENV{UPDMINOR});
+    my ($source_root, $cwsname);
     $source_root = '-sourceroot' if (defined $ENV{SOURCE_ROOT_USED});
     my $cws_name = "-cwsname $ENV{CWS_WORK_STAMP}" if (defined $ENV{CWS_WORK_STAMP});
 
-    my $param = "-$ENV{WORK_STAMP} $verswitch $source_root $cws_name $pro $platform";
+    my $param = "-$ENV{WORK_STAMP} $source_root $cws_name $pro $platform";
     my $ss_command = "$perl $setsolar -file $tmp_file $param $nul";
     if (system($ss_command)) {
         unlink $tmp_file;
@@ -2587,7 +2587,7 @@ sub read_ssolar_vars {
 sub get_solar_vars {
     my ($solar_vars, $file) = @_;
     my ($var, $value);
-    open SOLARTABLE, "<$file" or die "can�t open solarfile $file";
+    open SOLARTABLE, "<$file" or die "can't open solarfile $file";
     while(<SOLARTABLE>) {
         s/\r\n//o;
         next if(!/^\w+\s+(\w+)/o);
@@ -2675,15 +2675,9 @@ sub pick_for_build_type {
 };
 
 sub do_exit {
-#    close_server_socket();
     my $exit_code = shift;
     $build_finished++;
     generate_html_file(1);
-    if ( $^O eq 'os2' )
-    {
-        # perl 5.10 returns 'resource busy' for rmtree
-        rmdir(correct_path($tmp_dir)) if ($tmp_dir);
-    }
     rmtree(correct_path($tmp_dir), 0, 0) if ($tmp_dir);
     print STDERR "Cannot delete $tmp_dir. Please remove it manually\n" if (-d $tmp_dir);
     exit($exit_code);
@@ -2721,7 +2715,6 @@ sub generate_html_file {
     return if (!$html);
     my $force_update = shift;
     $force_update++ if ($debug);
-    $html_last_updated = time;
     my @modules_order = sort_modules_appearance();
     my ($successes_percent, $errors_percent) = get_progress_percentage(scalar keys %html_info, scalar keys %build_is_finished, scalar keys %modules_with_errors);
     my $build_duration = get_time_line(time - $build_time);
@@ -2807,9 +2800,6 @@ sub generate_html_file {
             print HTML $errors_number;
             print HTML ' error(s)\">', $_, '</a>");' . "\n";
         } else {
-#            print HTML 'document.write("<em style=color:gray>' . $_ . '</em>");';
-####            print HTML 'document.write("<em style=color:gray>' . $_ ."href=\'http://$local_host_ip:$html_port/delete=\'$_". '</em>");';
-
             print HTML 'document.write("            <a target=\'infoframe\' id=';
             print HTML $_;
             print HTML ' href=\"javascript:void(0)\"; title=\"Remove module\">' . $_ . '</a>");' . "\n";
@@ -3168,7 +3158,6 @@ sub get_html_info {
         }
     } else {
         return(undef, undef, 0, 0, 0, '-');
-#        $dirs_info_line .= 'No information available yet';
     };
     $dirs_info_line =~ s/(<br>)*$//o;
     $dirs_info_line .= '\'';
@@ -3183,13 +3172,9 @@ sub get_html_info {
         $errors_info_line .= 'No errors';
     };
     $errors_info_line .= '\'';
-#    if (defined $full_info) {
     my $time_line = get_time_line($$module_info_hash{BUILD_TIME});
-        my ($successes_percent, $errors_percent) = get_progress_percentage($dirs_number - 1, $successful_number - 1, $errorful_number);
-        return($errors_info_line, $dirs_info_line, $errorful_number, $successes_percent, $errors_percent, $time_line);
-#    } else {
-#        return($errors_info_line, $dirs_info_line, $errorful_number);
-#    };
+    my ($successes_percent, $errors_percent) = get_progress_percentage($dirs_number - 1, $successful_number - 1, $errorful_number);
+    return($errors_info_line, $dirs_info_line, $errorful_number, $successes_percent, $errors_percent, $time_line);
 };
 
 sub get_time_line {
@@ -3252,7 +3237,7 @@ sub start_server_on_port {
     my $port = shift;
     my $socket_obj = shift;
     $client_timeout = 1 if (!$parent_process);
-    if ($ENV{GUI} eq 'WNT') {
+    if ($ENV{GUI_FOR_BUILD} eq 'WNT') {
         $$socket_obj = new IO::Socket::INET (#LocalAddr => hostname(),
                                   LocalPort => $port,
                                   Proto     => 'tcp',
@@ -3303,8 +3288,6 @@ sub check_client_jobs {
             delete $processes_hash{$_};
             delete $clients_jobs{$_};
             delete $clients_times{$_};
-#        } else {
-#            print time - $clients_times{$_} . "\n";
         };
     };
 };
@@ -3329,10 +3312,6 @@ sub run_server {
             if ($error) {
                 print STDERR "port $_: $error\n";
             } else {
-#                $SIG{KILL} = \&stop_server;
-#                $SIG{INT} = \&stop_server;
-#                $SIG{TERM} = \&stop_server;
-#                $SIG{QUIT} = \&stop_server;
                 last;
             };
         };
@@ -3357,7 +3336,7 @@ sub run_server {
         my %client_hash = ();
         foreach (@client_data) {
             /(=)/;
-            $client_hash{$`} = $';
+            $client_hash{$`} = $'; #'
         }
         my $pid = $client_hash{pid} . '@' . $client_host;
         if (defined $client_hash{platform}) {
@@ -3368,7 +3347,6 @@ sub run_server {
             };
         } else {
             if ($client_hash{result} eq "0") {
-#                print "$clients_jobs{$pid} succedded on $pid\n";
             } else {
                 print "Error $client_hash{result}\n";
                 if (store_error($pid, $client_hash{result})) {
@@ -3394,7 +3372,6 @@ sub run_server {
             $job_string = $lost_jobs[0];
             delete $lost_client_jobs{$lost_jobs[0]};
         } else {
-#            $job_string = get_job_string(\@build_queue, $pid);
             $job_string = get_job_string(\@build_queue);
         };
         if ($job_string) {
@@ -3456,10 +3433,8 @@ sub get_job_string {
             $jobs_hash{$job_dir}->{START_TIME} = time();
             $jobs_hash{$job_dir}->{STATUS} = 'building';
             if ($job_dir =~ /(\s)$pre_job/o) {
-#                if ($' eq $pre_job) {
-                    do_custom_job($job_dir, $dependencies_hash);
-                    $job_dir = '';
-#                }
+                do_custom_job($job_dir, $dependencies_hash);
+                $job_dir = '';
             };
         } while (!$job_dir);
     };
@@ -3468,8 +3443,15 @@ sub get_job_string {
     my $log_file = $jobs_hash{$job_dir}->{LONG_LOG_PATH};
     my $full_job_dir = $job_dir;
     if ($job_dir =~ /(\s)/o) {
-        $job = $';
-        $job = $deliver_command if ($job eq $post_job);
+        $job = $'; #'
+        print $echo . "determine if we need to deliver $job_dir\n";
+        if ($job eq $post_job) {
+            if( $is_gbuild{$job_dir} ) {
+                print "Skip deliver for gmake-built module $job_dir\n";
+                return'';
+            };
+            $job = $deliver_command
+        };
         $full_job_dir = $module_paths{$`};
     }
     my $log_dir = File::Basename::dirname($log_file);
@@ -3490,7 +3472,7 @@ sub pick_jobdir {
         my $prj = $$build_queue[$i];
         my $prj_deps_hash = $projects_deps_hash{$prj};
         if (defined $modules_with_errors{$prj_deps_hash} && !$ignore) {
-            push (@broken_module_names, $prj);
+            push (@broken_modules_names, $prj);
             splice (@$build_queue, $i, 1);
             next;
         };
@@ -3540,8 +3522,8 @@ sub check_partial_gnumake_build {
         print "This module has been migrated to GNU make.\n";
         print "You can only use build --all/--since here with build.pl.\n";
         print "To do the equivalent of 'build && deliver' call:\n";
-        print "\tmake -sr\n";
-        print "in the module root (This will modify the solver).\n";
+        print "\t$ENV{GNUMAKE} -r\n";
+        print "in the module root.\n";
         exit 1;
     }
 }
diff --git a/solenv/bin/build_client.pl b/solenv/bin/build_client.pl
index 54a5c4f84de2..f518f8198dcc 100755
--- a/solenv/bin/build_client.pl
+++ b/solenv/bin/build_client.pl
@@ -59,7 +59,6 @@ my $processes_to_run = 1;
 my %hosts_ports = ();
 my $default_port = 7890;
 my @ARGV_COPY = @ARGV; # @ARGV BACKUP
-#$ARGV_COPY{$_}++ foreach (@ARGV);
 print "arguments: @ARGV\n";
 get_options();
 
@@ -149,7 +148,6 @@ sub run_client {
                 # "active" cycle
                 foreach my $active_server (keys %active_servers) {
                     foreach my $active_port (keys %{$active_servers{$active_server}}) {
-#                        print "Active: $active_server:$active_port\n";
                         my $iaddr = inet_aton($active_server);
                         $paddr = sockaddr_in($active_port, $iaddr);
                         do {
@@ -172,7 +170,6 @@ sub run_client {
                 };
 
                 # "inactive" cycle
-#                print "Inactive: $current_server:$current_port\n";
                 my $iaddr = inet_aton($current_server);
                 $paddr = sockaddr_in($current_port, $iaddr);
                 do {
@@ -275,7 +272,7 @@ sub request_job {
     $message = "platform=$ENV_BACKUP{OUTPATH} pid=$$ osname=$^O" if (!$message);
     # create the socket, connect to the port
     socket(SOCKET, PF_INET, SOCK_STREAM, $proto) or die "socket: $!";
-    connect(SOCKET, $paddr) or return '';#die "connect: $!";
+    connect(SOCKET, $paddr) or return '';
     my $error_code = 1;
     $message .= "\n";
     syswrite SOCKET, $message, length $message;
@@ -373,8 +370,6 @@ sub do_job {
         getcwd();
         my $job_string = $job_hash{job} . ' > ' . $tmp_log_file . ' 2>&1';
         $error_code = system($job_string);
-#        rename($tmp_log_file, $job_hash{log}) or system("mv", $tmp_log_file, $job_hash{log});
-#        delete $job_temp_files{$tmp_log_file};# = $job_hash{log};
     };
     rename($tmp_log_file, $job_hash{log}) or system("mv", $tmp_log_file, $job_hash{log});
     delete $job_temp_files{$tmp_log_file};
@@ -417,7 +412,7 @@ sub print_error {
     exit(1);
 };
 sub store_env_hash {
-    my $ss_setenv_file = shift;#($$job_hash{server_pid}.$$job_hash{setsolar_cmd}, $cmd_file);
+    my $ss_setenv_file = shift;
     my %solar_vars = ();
     my $cmd_file = File::Temp::tmpnam($ENV_BACKUP{TMP});
     my $env_vars_file = File::Temp::tmpnam($ENV_BACKUP{TMP});
diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh
index efafb6b8ef60..538a9c5fb513 100755
--- a/solenv/bin/checkdll.sh
+++ b/solenv/bin/checkdll.sh
@@ -33,7 +33,7 @@ set -- `getopt "L:" "$@"` ||  {
     exit 1
 }
 
-checkdll="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/checkdll"
+checkdll="$SOLARVERSION/$INPATH/bin/checkdll"
 
 if [ -x $checkdll ]; then
     while :
@@ -56,6 +56,11 @@ if [ -x $checkdll ]; then
         *) DYLD_LIBRARY_PATH=$libpath;;
         esac
         export DYLD_LIBRARY_PATH;;
+    AIX) case "${LIBPATH:+X}" in
+        X) LIBPATH=$libpath:$LIBPATH;;
+        *) LIBPATH=$libpath;;
+        esac
+        export LIBPATH;;
     *)  case "${LD_LIBRARY_PATH:+X}" in
         X) LD_LIBRARY_PATH=$libpath:$LD_LIBRARY_PATH;;
         *) LD_LIBRARY_PATH=$libpath;;
@@ -77,6 +82,14 @@ if [ -x $checkdll ]; then
     fi
 else
     echo "WARNING: checkdll not found!" 1>&2
+
+    for parameter in $*; do
+        library=$parameter;
+    done
+    realname=`echo $library | sed "s/check_//"`
+    if [ $library != $realname ]; then
+        mv $library $realname
+    fi
 fi
 
 exit 0
diff --git a/solenv/bin/cleanzip.pl b/solenv/bin/cleanzip.pl
index 8103a13945b1..5e1502b76611 100755
--- a/solenv/bin/cleanzip.pl
+++ b/solenv/bin/cleanzip.pl
@@ -46,16 +46,11 @@ unless ( $zip->read( $filename ) == AZ_OK ) {
 my @members = $zip ->members();
 
 foreach my $member ( @members ) {
-#   printf ( "%o\n",$member->unixFileAttributes());
-#   printf ( "%o\n",$member->unixFileAttributes() & 0b111111111111);
     my $attribs = $member->unixFileAttributes();
     if ( $member->isDirectory ) {
         $attribs = $attribs & 0b101111111111;
         $member->unixFileAttributes($attribs)
     }
-#   printf ( "%o\n",$member->unixFileAttributes());
-#   printf ( "%o\n",$member->unixFileAttributes() & 0b111111111111);
-#   print ( $member->fileName()."\n");
 }
 unless ( $zip->writeToFileNamed( ${filename}."_new" ) == AZ_OK ) {
     die "$0: ERROR reading ${filename}_new\n";
diff --git a/solenv/bin/clipatchconfig.pl b/solenv/bin/clipatchconfig.pl
index 365e0bb14950..49fecd9e8b41 100644
--- a/solenv/bin/clipatchconfig.pl
+++ b/solenv/bin/clipatchconfig.pl
@@ -27,7 +27,6 @@
 
 use warnings;
 use strict;
-# use diagnostics;
 
 sub trim;
 sub readRedirectionValues($);
@@ -52,7 +51,6 @@ if (scalar @ARGV < 3) {
 
 
 my %redirectionValue = readRedirectionValues($ARGV[1]);
-#print "|$_|  |$redirectionValue{$_}|\n",  for keys %redirectionValue;
 
 
 #Read config file in which we will replace the versions
diff --git a/solenv/bin/converttags.pl b/solenv/bin/converttags.pl
deleted file mode 100644
index aa2fe63c6ce8..000000000000
--- a/solenv/bin/converttags.pl
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# converttags - a perl script to coonvert some predefined tags
-# to user specified values
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-
-if($#ARGV == -1)
-{
-    die "No parameters were specified.\nperl converttags.pl <mode> <title> <productname> [<color1>] [<color2>] file_1 [... file_n]\n";
-}
-if($#ARGV < 2)
-{
-    die "No file were specified -> no file must be converted!\n";
-}
-
-# mode = 1 -> convert
-#      = 2 -> exit without conversion
-$mode = shift @ARGV;
-
-$title = shift @ARGV;
-$productname = shift @ARGV;
-
-$color1 = "";
-$color2 = "";
-
-if( $mode =~ s/2/$1/go )
-{
-    exit 0;
-}
-
-if( $ARGV[0] =~ s/(#[\w]{6})/$1/go )
-{
-    $color1 = shift @ARGV;
-}
-if( $ARGV[0] =~ s/(#[\w]{6})/$1/go )
-{
-    $color2 = shift @ARGV;
-}
-
-print "$title\n";
-print "$productname\n";
-print "$color1\n";
-print "$color2\n";
-
-$return = 0;
-
-while (@ARGV)
-{
-    my $lineCount = 0;
-    $ARGV = shift @ARGV;
-    print "convert tags: $ARGV ";
-
-    open ( FILEIN, $ARGV ) || die "could not open $ARGV for reading";
-    @lines = <FILEIN>;
-    close( FILEIN );
-    open( FILEOUT, ">$ARGV.tmp" ) || die "could not open $ARGV.tmp for writing";
-
-
-    foreach $_ (@lines)
-    {
-    $lineCount++;
-    if ( $lineCount == 10 )
-    {
-        $lineCount = 0;
-        print ".";
-    }
-    # change [TITLE] tag
-    s#\[TITLE\]#$title#go;
-
-    # change [PRODUCTNAME] tag
-    s#\[PRODUCTNAME\]#$productname#go;
-
-    # change color #003399 to #$color1 if color1 was specified!
-    if ( ! "$color1" eq "" )
-    {
-        s/#003399/$color1/go;
-    }
-
-    # change color #99CCFF to #$color2 if color2 was specified!
-    if ( ! "$color2" eq "" )
-    {
-        s/#99CCFF/$color2/go;
-    }
-    print FILEOUT $_;
-    }
-    print " OK\n";
-
-    close FILEOUT;
-    chmod 0666, $ARGV;
-    rename "$ARGV.tmp", $ARGV || die "could not rename $ARGV.tmp to $ARGV";
-}
-
-exit $return;
diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids
new file mode 100755
index 000000000000..868d88526c76
--- /dev/null
+++ b/solenv/bin/create-ids
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# create ID file for the whole LibO tree. run it in toplevel dir
+
+. ./*.Set.sh
+
+dirs="*/$INPATH/inc */$INPATH/misc/build `ls -d */* | sed -e '/\(clone\/\|\/\(common\|unxlng\|unxsol\|unxmac\|wntmsc\|Jamfile\|cscope\.\|tags\|ID\)\)\|^solver\//d'`"
+mkid --lang-map=`dirname $0`/id-lang.map --include='C C++ asm perl make' --statistics $dirs
diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags
new file mode 100755
index 000000000000..12280f62101c
--- /dev/null
+++ b/solenv/bin/create-tags
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+. ./*.Set.sh
+
+omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q"
+ctags -h "+.hdl.hrc" --langmap=c:+.hdl.hrc.src $omnicppoptions \
+      --languages=-HTML,Java \
+      -R --exclude=`echo ${INPATH} | sed 's/\./\\\./g'` --exclude=binfilter --exclude=solver \
+      --exclude=clone --exclude=install --totals=yes --sort=foldcase *
diff --git a/solenv/bin/createpdbrelocators.pl b/solenv/bin/createpdbrelocators.pl
index 75047f3952f5..d32dd7d84508 100644..100755
--- a/solenv/bin/createpdbrelocators.pl
+++ b/solenv/bin/createpdbrelocators.pl
@@ -57,22 +57,13 @@ $id_str =~ /Revision:\s+(\S+)\s+\$/
 print "$script_name -- version: $script_rev\n";
 
 my $inpath    = $ENV{INPATH};
-my $milestone = $ENV{UPDMINOR};
-my $milestoneext = $ENV{UPDMINOREXT};
 
-if ( $ARGV[0] ) {
-    if ( $milestone && ( $milestone ne $ARGV[0] ) ) {
-        die "Error: specified milestone $ARGV[0] does not match your environment";
-    }
-    $milestone = $ARGV[0];
-}
-
-if ( !$inpath || !$milestone ) {
-    print STDERR "$script_name: INAPTH or UPDMINOR not set!\n";
+if ( !$inpath ) {
+    print STDERR "$script_name: INAPTH not set!\n";
     exit(1);
 }
 my $relocators = CreatePDBRelocators->new();
-my $rc = $relocators->create_pdb_relocators($inpath, $milestoneext, "");
+my $rc = $relocators->create_pdb_relocators($inpath, "", "");
 
 if ( !$rc ) {
     print STDERR "$script_name: creating PDB relocators failed!\n";
diff --git a/solenv/bin/cws b/solenv/bin/cws
deleted file mode 100755
index e8bcf5060f39..000000000000
--- a/solenv/bin/cws
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-if [ x${SOLARENV}x = xx ]; then
-    echo No environment found, please use 'configure'
-    exit 1
-fi
-exec perl -w $SOLARENV/bin/cws.pl "$@"
diff --git a/solenv/bin/cws.btm b/solenv/bin/cws.btm
deleted file mode 100644
index 31bff3ab2d0f..000000000000
--- a/solenv/bin/cws.btm
+++ /dev/null
@@ -1,11 +0,0 @@
-@echo off
-iff "%SOLARENV%" == "" then
-    echo No environment found, please use 'configure' or 'setsolar'
-	goto end
-endiff
-iff "%PERL%" == "" then
-	call perl5 -I%SOLARENV%\bin\modules %SOLARENV%\bin\cws.pl %1&
-else
-	call %PERL% -I%SOLARENV%\bin\modules %SOLARENV%\bin\cws.pl %1&
-endiff
-:end
diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl
deleted file mode 100644
index 62a6b2763761..000000000000
--- a/solenv/bin/cws.pl
+++ /dev/null
@@ -1,2116 +0,0 @@
-#!/usr/bin/perl -w
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#*************************************************************************
-#
-# cws.pl   - wrap common childworkspace operations
-#
-use strict;
-use Getopt::Long;
-use File::Basename;
-use File::Path;
-use File::Copy;
-use Cwd;
-use Benchmark;
-
-#### module lookup
-my @lib_dirs;
-BEGIN {
-    if ( !defined($ENV{SOLARENV}) ) {
-        die "No environment found (environment variable SOLARENV is undefined)";
-    }
-    push(@lib_dirs, "$ENV{SOLARENV}/bin/modules");
-}
-use lib (@lib_dirs);
-
-use Cws;
-
-#### script id #####
-
-( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
-
-#### globals ####
-
-# TODO: replace dummy vales with actual source_config migration milestone
-my $ooo320_source_config_milestone = 'm999';
-
-# valid command with possible abbreviations
-my @valid_commands = (
-                        'help', 'h', '?',
-                        'create',
-                        'fetch',  'f',
-                        'query', 'q',
-                        'task', 't',
-                        'eisclone',
-                        'setcurrent'
-                     );
-
-# list the valid options to each command
-my %valid_options_hash = (
-                            'help'       => ['help'],
-                            'create'     => ['help', 'milestone', 'migration', 'hg'],
-                            'fetch'      => ['help', 'milestone', 'childworkspace','platforms','noautocommon',
-                                            'quiet', 'onlysolver', 'additionalrepositories'],
-                            'query'      => ['help', 'milestone','masterworkspace','childworkspace'],
-                            'task'       => ['help'],
-                            'setcurrent' => ['help', 'milestone'],
-                            'eisclone'   => ['help']
-                         );
-
-my %valid_commands_hash;
-for (@valid_commands) {
-    $valid_commands_hash{$_}++;
-}
-
-#  set by --debug switch
-my $debug = 0;
-#  set by --profile switch
-my $profile = 0;
-
-
-#### main ####
-
-my ($command, $args_ref, $options_ref) = parse_command_line();
-dispatch_command($command, $args_ref, $options_ref);
-exit(0);
-
-#### subroutines ####
-
-# Parses the command line. does prelimiary argument and option verification
-sub parse_command_line
-{
-    if (@ARGV == 0) {
-        usage();
-        exit(1);
-    }
-
-    my %options_hash;
-    Getopt::Long::Configure ("no_auto_abbrev", "no_ignorecase");
-    my $success = GetOptions(\%options_hash, 'milestone|m=s',
-                                             'masterworkspace|master|M=s',
-                                             'hg',
-                                             'migration',
-                                             'childworkspace|child|c=s',
-                                             'debug',
-                                             'profile',
-                                             'commit|C',
-                                             'platforms|p=s',
-                                             'additionalrepositories|r=s',
-                                             'noautocommon|x=s',
-                                             'onlysolver|o',
-                                             'quiet|q',
-                                             'help|h'
-                            );
-
-    my $command = shift @ARGV;
-
-    if (!exists $valid_commands_hash{$command}) {
-        print_error("Unkown command: '$command'\n");
-        usage();
-        exit(1);
-    }
-
-    if ($command eq 'h' || $command eq '?') {
-        $command = 'help';
-    }
-    elsif ($command eq 'f') {
-        $command = 'fetch';
-    }
-    elsif ($command eq 'q') {
-        $command = 'query';
-    }
-    elsif ($command eq 't') {
-        $command = 'task';
-    }
-
-    # An unkown option might be accompanied with a valid command.
-    # Show the command specific help
-    if ( !$success ) {
-        do_help([$command])
-    }
-
-    verify_options($command, \%options_hash);
-    return ($command, \@ARGV, \%options_hash);
-}
-
-# Verify options against the valid options list.
-sub verify_options
-{
-    my $command     = shift;
-    my $options_ref = shift;
-
-    my $valid_command_options_ref = $valid_options_hash{$command};
-
-    my %valid_command_options_hash;
-    foreach (@{$valid_command_options_ref}) {
-        $valid_command_options_hash{$_}++;
-    }
-
-    # check all specified options against the valid options for the sub command
-    foreach (keys %{$options_ref}) {
-        if ( /debug/ ) {
-            $debug = 1;
-            next;
-        }
-        if ( /profile/ ) {
-            $profile = 1;
-            next;
-        }
-        if (!exists $valid_command_options_hash{$_}) {
-            print_error("can't use option '--$_' with subcommand '$command'.", 1);
-        }
-    }
-
-}
-
-# Dispatches to the do_xxx() routines depending on command.
-sub dispatch_command
-{
-    my $command     = shift;
-    my $args_ref    = shift;
-    my $options_ref = shift;
-
-    no strict 'refs';
-    &{"do_".$command}($args_ref, $options_ref);
-}
-
-# Returns the global cws object.
-BEGIN {
-my $the_cws;
-
-    sub get_this_cws {
-        if (!defined($the_cws)) {
-            $the_cws = Cws->new();
-            return $the_cws;
-        }
-        else {
-            return $the_cws;
-        }
-    }
-}
-
-# Returns a list of the master workspaces.
-sub get_master_workspaces
-{
-    my $cws = get_this_cws();
-    my @masters = $cws->get_masters();
-
-    return wantarray ? @masters : \@masters;
-}
-
-# Checks if master argument is a valid MWS name.
-BEGIN {
-    my %master_hash;
-
-    sub is_master
-    {
-        my $master_name = shift;
-
-        if (!%master_hash) {
-            my @masters = get_master_workspaces();
-            foreach (@masters) {
-                $master_hash{$_}++;
-            }
-        }
-        return exists $master_hash{$master_name} ? 1 : 0;
-    }
-}
-
-# Fetches the current CWS from environment, returns a Cws object
-sub get_cws_from_environment
-{
-    my $child  = $ENV{CWS_WORK_STAMP};
-    my $master = $ENV{WORK_STAMP};
-
-    if ( !$child ) {
-        print_error("Environment variable CWS_WORK_STAMP is not set. Please set it to your CWS name.", 2);
-    }
-
-    if ( !$master ) {
-        print_error("Environment variable WORK_STAMP is not set. Please set it to the MWS name.", 2);
-    }
-
-    my $cws = get_this_cws();
-    $cws->child($child);
-    $cws->master($master);
-
-    # Check if we got a valid child workspace.
-    my $id = $cws->eis_id();
-    if ( $debug ) {
-        print STDERR "CWS-DEBUG: ... master: $master, child: $child, $id\n";
-    }
-    if ( !$id ) {
-        print_error("Child workspace $child for master workspace $master not found in EIS database.", 2);
-    }
-    return ($cws);
-}
-
-# Fetches the CWS by name, returns a Cws object
-sub get_cws_by_name
-{
-    my $child  = shift;
-
-    my $cws = get_this_cws();
-    $cws->child($child);
-
-    # Check if we got a valid child workspace.
-    my $id = $cws->eis_id();
-    if ( $debug ) {
-        print STDERR "CWS-DEBUG: child: $child, $id\n";
-    }
-    if ( !$id ) {
-        print_error("Child workspace $child not found in EIS database.", 2);
-    }
-
-    # Update masterws part of Cws object.
-    my $masterws = $cws->get_mws();
-    if ( $cws->master() ne $masterws ) {
-        # can this still happen?
-        if ( $debug ) {
-            print STDERR "CWS-DEBUG: get_cws_by_name(): fixup of masterws in cws object detected\n";
-        }
-        $cws->master($masterws);
-    }
-    return ($cws);
-}
-
-# Register child workspace with eis.
-sub register_child_workspace
-{
-    my $cws          = shift;
-    my $scm          = shift;
-    my $is_promotion = shift;
-
-    my $milestone = $cws->milestone();
-    my $child     = $cws->child();
-    my $master    = $cws->master();
-
-    # TODO: introduce a EIS_USER in the configuration, which should be used here
-    my $config = CwsConfig->new();
-    my $vcsid  = $config->vcsid();
-    # TODO: there is no real need for socustom anymore, should go ASAP
-    my $socustom = $config->sointernal();
-
-    if ( !$vcsid ) {
-        if ( $socustom ) {
-            print_error("Can't determine owner for CWS '$child'. Please set VCSID environment variable.", 11);
-        }
-        else {
-            print_error("Can't determine owner for CWS '$child'. Please set CVS_ID entry in \$HOME/.cwsrc.", 11);
-        }
-    }
-
-    if ( $is_promotion ) {
-        my $rc = $cws->set_scm($scm);
-        if ( !$rc ) {
-            print_error("Failed to set the SCM property '$scm' on child workspace '$child'.\nContact EIS administrator!\n", 12);
-        }
-
-        $rc = $cws->promote($vcsid, "");
-
-        if ( !$rc ) {
-            print_error("Failed to promote child workspace '$child' to status 'new'.\n", 12);
-        }
-        else {
-            print "\n***** Successfully ***** promoted child workspace '$child' to status 'new'.\n";
-            print "Milestone: '$milestone'.\n";
-        }
-    }
-    else {
-
-        my $eis_id = $cws->register($vcsid, "");
-
-        if ( !defined($eis_id) ) {
-            print_error("Failed to register child workspace '$child' for master '$master'.", 12);
-        }
-        else {
-            my $rc = $cws->set_scm($scm);
-            if ( !$rc ) {
-                print_error("Failed to set the SCM property '$scm' on child workspace '$child'.\nContact EIS administrator!\n", 12);
-            }
-            print "\n***** Successfully ***** registered child workspace '$child'\n";
-            print "for master workspace '$master' (milestone '$milestone').\n";
-            print "Child workspace Id: $eis_id.\n";
-        }
-    }
-    return 0;
-}
-
-sub print_time_elapsed
-{
-    my $t_start = shift;
-    my $t_stop  = shift;
-
-    my $time_diff = timediff($t_stop, $t_start);
-    print_message("... finished in " . timestr($time_diff));
-}
-
-sub hgrc_append_push_path_and_hooks
-{
-    my $target     = shift;
-    my $cws_source = shift;
-
-    $cws_source =~ s/http:\/\//ssh:\/\/hg@/;
-    if ( $debug ) {
-        print STDERR "CWS-DEBUG: hgrc_append_push_path_and_hooks(): default-push path: '$cws_source'\n";
-    }
-    if ( !open(HGRC, ">>$target/.hg/hgrc") ) {
-        print_error("Can't append to hgrc file of repository '$target'.\n", 88);
-    }
-    print HGRC "default-push = " . "$cws_source\n";
-    print HGRC "[extensions]\n";
-    print HGRC "hgext.win32text=\n";
-    print HGRC "[hooks]\n";
-    print HGRC "# Reject commits which would introduce windows-style CR/LF files\n";
-    print HGRC "pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n";
-    close(HGRC);
-}
-
-sub hg_clone_cws_or_milestone
-{
-    my $rep_type             = shift;
-    my $cws                  = shift;
-    my $target               = shift;
-    my $clone_milestone_only = shift;
-
-    my ($hg_local_source, $hg_lan_source, $hg_remote_source);
-    my $config = CwsConfig->new();
-
-    $hg_local_source = $config->get_hg_source(uc $rep_type, 'LOCAL');
-    $hg_lan_source = $config->get_hg_source(uc $rep_type, 'LAN');
-    $hg_remote_source = $config->get_hg_source(uc $rep_type, 'REMOTE');
-
-    my $masterws = $cws->master();
-    my ($master_local_source, $master_lan_source);
-
-    $master_local_source = "$hg_local_source/" . $masterws;
-    $master_lan_source = "$hg_lan_source/" . $masterws;
-
-    my $milestone_tag;
-    if ( $clone_milestone_only ) {
-        $milestone_tag = uc($masterws) . '_' . $clone_milestone_only;
-    }
-    else {
-        my @tags = $cws->get_tags();
-        $milestone_tag = $tags[3];
-    }
-
-    if ( $debug ) {
-        print STDERR "CWS-DEBUG: master_local_source: '$master_local_source'\n";
-        print STDERR "CWS-DEBUG: master_lan_source: '$master_lan_source'\n";
-        if ( !-d $master_local_source ) {
-            print STDERR "CWS-DEBUG: not a directory '$master_local_source'\n";
-        }
-    }
-
-    my $pull_from_remote = 0;
-    my $cws_remote_source;
-    if ( !$clone_milestone_only ) {
-        if ($rep_type eq "ooo" || $rep_type eq "so")
-        {
-            $cws_remote_source = "$hg_remote_source/cws/" . $cws->child();
-        }
-        # e.g. cws_l10n
-        else
-        {
-            $cws_remote_source = "$hg_remote_source/cws_".$rep_type."/" . $cws->child();
-        }
-
-        # The outgoing repository might not yet be available. Which is not
-        # an error. Since pulling from the cws outgoing URL results in an ugly
-        # and hardly understandable error message, we check for availibility
-        # first. TODO: incorporate configured proxy instead of env_proxy. Use
-        # a dedicated request and content-type to find out if the repo is there
-        # instead of parsing the content of the page
-        print_message("... check availibility of 'outgoing' repository '$cws_remote_source'.");
-        require LWP::Simple;
-        my $content = LWP::Simple::get($cws_remote_source);
-        my $pattern = "<title>cws/". $cws->child();
-        my $pattern2 = "<title>cws_".$rep_type."/". $cws->child();
-        if ( $content && ($content =~ /$pattern/ || $content =~ /$pattern2/) ) {
-            $pull_from_remote = 1;
-        }
-        else {
-            print_message("... 'outgoing' repository '$cws_remote_source' is not accessible/available yet.");
-        }
-    }
-
-    # clone repository (without working tree if we still need to pull from remote)
-    my $clone_with_update = !$pull_from_remote;
-    hg_clone_repository($master_local_source, $master_lan_source, $target, $milestone_tag, $clone_with_update);
-
-    # now pull from the remote cws outgoing repository if its already available
-    if ( $pull_from_remote ) {
-        hg_remote_pull_repository($cws_remote_source, $target);
-    }
-
-    # if we fetched a CWS adorn the result with push-path and hooks
-    if ( $cws_remote_source ) {
-        hgrc_append_push_path_and_hooks($target, $cws_remote_source);
-    }
-
-    # update the result if necessary
-    if ( !$clone_with_update ) {
-        hg_update_repository($target);
-    }
-
-}
-
-sub hg_clone_repository
-{
-    my $local_source    = shift;
-    my $lan_source    = shift;
-    my $dest          = shift;
-    my $milestone_tag = shift;
-    my $update        = shift;
-
-    my $t1 = Benchmark->new();
-    my $source;
-    my $clone_option = $update ? '' : '-U ';
-    if ( -d $local_source && can_use_hardlinks($local_source, $dest) ) {
-        $source = $local_source;
-        if ( !hg_milestone_is_latest_in_repository($local_source, $milestone_tag) ) {
-                $clone_option .= "-r $milestone_tag";
-        }
-        print_message("... clone LOCAL repository '$local_source' to '$dest'");
-    }
-    else {
-        $source = $lan_source;
-        $clone_option .= "-r $milestone_tag";
-        print_message("... clone LAN repository '$lan_source' to '$dest'");
-    }
-    hg_clone($source, $dest, $clone_option);
-
-    my $t2 = Benchmark->new();
-    print_time_elapsed($t1, $t2) if $profile;
-}
-
-sub hg_remote_pull_repository
-{
-    my $remote_source = shift;
-    my $dest          = shift;
-
-    my $t1 = Benchmark->new();
-    print_message("... pull from REMOTE repository '$remote_source' to '$dest'");
-    hg_pull($dest, $remote_source);
-    my $t2 = Benchmark->new();
-    print_time_elapsed($t1, $t2) if $profile;
-}
-
-sub hg_update_repository
-{
-    my $dest          = shift;
-
-    my $t1 = Benchmark->new();
-    print_message("... update repository '$dest'");
-    hg_update($dest);
-    my $t2 = Benchmark->new();
-    print_time_elapsed($t1, $t2) if $profile;
-}
-
-sub hg_milestone_is_latest_in_repository
-{
-    my $repository = shift;
-    my $milestone_tag = shift;
-
-    # Our milestone is the lastest thing in the repository
-    # if the parent of the repository tip is adorned
-    # with the milestone tag.
-    my $tags_of_parent_of_tip = hg_parent($repository, 'tip', "--template='{tags}\\n'");
-    if ( $tags_of_parent_of_tip =~ /\b$milestone_tag\b/ ) {
-        return 1;
-    }
-    return 0;
-}
-
-# Check if clone source and destination are on the same filesystem,
-# in that case hg clone can employ hard links.
-sub can_use_hardlinks
-{
-    my $source = shift;
-    my $dest = shift;
-
-    if ( $^O eq 'cygwin' ) {
-        # no hard links on windows
-        return 0;
-    }
-    # st_dev is the first field return by stat()
-    my @stat_source = stat($source);
-    my @stat_dest = stat(dirname($dest));
-
-    if ( $debug ) {
-        my $source_result = defined($stat_source[0]) ? $stat_source[0] : 'stat failed';
-        my $dest_result = defined($stat_dest[0]) ? $stat_dest[0] : 'stat failed';
-        print STDERR "CWS-DEBUG: can_use_hardlinks(): source device: '$stat_source[0]', destination device: '$stat_dest[0]'\n";
-    }
-    if ( defined($stat_source[0]) && defined($stat_dest[0]) && $stat_source[0] == $stat_dest[0] ) {
-        return 1;
-    }
-    return 0;
-}
-
-sub query_cws
-{
-    my $query_mode = shift;
-    my $options_ref = shift;
-    # get master and child workspace
-    my $masterws  = exists $options_ref->{'masterworkspace'} ? uc($options_ref->{'masterworkspace'}) : $ENV{WORK_STAMP};
-    my $childws   = exists $options_ref->{'childworkspace'} ? $options_ref->{'childworkspace'} : $ENV{CWS_WORK_STAMP};
-    my $milestone = exists $options_ref->{'milestone'} ? $options_ref->{'milestone'} : 'latest';
-
-    if ( !defined($masterws) && $query_mode ne 'masters') {
-        print_error("Can't determine master workspace environment.\n", 30);
-    }
-
-    if ( ($query_mode eq 'integratedinto' || $query_mode eq 'incompatible' || $query_mode eq 'taskids' || $query_mode eq 'status' || $query_mode eq 'current' || $query_mode eq 'owner' || $query_mode eq 'qarep' || $query_mode eq 'issubversion' || $query_mode eq 'ispublic' || $query_mode eq 'build') && !defined($childws) ) {
-        print_error("Can't determine child workspace environment.\n", 30);
-    }
-
-    my $cws = Cws->new();
-    if ( defined($childws) ) {
-        $cws->child($childws);
-    }
-    if ( defined($masterws) ) {
-        $cws->master($masterws);
-    }
-
-    no strict;
-    &{"query_".$query_mode}($cws, $milestone);
-    return;
-}
-
-sub query_integratedinto
-{
-    my $cws = shift;
-
-    if ( is_valid_cws($cws) ) {
-        my $milestone = $cws->get_milestone_integrated();
-        print_message("Integrated into:");
-        print defined($milestone) ? "$milestone\n" : "unkown\n";
-    }
-    return;
-}
-
-sub query_incompatible
-{
-    my $cws = shift;
-
-    if ( is_valid_cws($cws) ) {
-        my @modules = $cws->incompatible_modules();
-        print_message("Incompatible Modules:");
-        foreach (@modules) {
-            if ( defined($_) ) {
-                print "$_\n";
-            }
-        }
-    }
-    return;
-}
-
-sub query_taskids
-{
-    my $cws = shift;
-
-    if ( is_valid_cws($cws) ) {
-        my @taskids = $cws->taskids();
-        print_message("Task ID(s):");
-        foreach (@taskids) {
-            if ( defined($_) ) {
-                print "$_\n";
-            }
-        }
-    }
-    return;
-}
-
-sub query_status
-{
-    my $cws = shift;
-
-    if ( is_valid_cws($cws) ) {
-        my $status = $cws->get_approval();
-        if ( !$status ) {
-            print_error("Internal error: can't get approval status.", 3);
-        } else {
-            print_message("Approval status:");
-            print "$status\n";
-        }
-    }
-    return;
-}
-
-sub query_scm
-{
-    my $cws = shift;
-    my $masterws = $cws->master();
-    my $childws  = $cws->child();
-
-    if ( is_valid_cws($cws) ) {
-        my $scm = $cws->get_scm();
-        if ( !defined($scm) ) {
-            print_error("Internal error: can't retrieve scm info.", 3);
-        } else {
-                print_message("Child workspace uses '$scm'.");
-        }
-    }
-    return;
-}
-
-sub query_ispublic
-{
-    my $cws = shift;
-    my $masterws = $cws->master();
-    my $childws  = $cws->child();
-
-    if ( is_valid_cws($cws) ) {
-        my $ispublic = $cws->get_public_flag();
-        if ( !defined($ispublic) ) {
-            print_error("Internal error: can't get isPublic flag.", 3);
-        } else {
-            if ( $ispublic==1 ) {
-                print_message("Child workspace is public");
-            } else {
-                print_message("Child workspace is internal");
-            }
-        }
-    }
-
-    return;
-}
-
-sub query_current
-{
-    my $cws = shift;
-
-    if ( is_valid_cws($cws) ) {
-        my $milestone = $cws->milestone();
-        if ( !$milestone ) {
-            print_error("Internal error: can't get current milestone.", 3);
-        } else {
-            print_message("Current milestone:");
-            print "$milestone\n";
-        }
-    }
-    return;
-}
-
-sub query_owner
-{
-    my $cws = shift;
-
-    if ( is_valid_cws($cws) ) {
-        my $owner = $cws->get_owner();
-        print_message("Owner:");
-        if ( !$owner ) {
-            print "not set\n" ;
-        } else {
-            print "$owner\n";
-        }
-    }
-    return;
-}
-
-sub query_qarep
-{
-    my $cws = shift;
-
-    if ( is_valid_cws($cws) ) {
-        my $qarep = $cws->get_qarep();
-        print_message("QA Representative:");
-        if ( !$qarep ) {
-            print "not set\n" ;
-        } else {
-            print "$qarep\n";
-        }
-    }
-    return;
-}
-
-
-sub query_build
-{
-    my $cws = shift;
-
-    if ( is_valid_cws($cws) ) {
-        my $build = $cws->get_build();
-        print_message("Build:");
-        if ( $build ) {
-            print "$build\n";
-        }
-    }
-    return;
-}
-
-sub query_latest
-{
-    my $cws = shift;
-
-    my $masterws = $cws->master();
-    my $latest = $cws->get_current_milestone($masterws);
-
-
-    if ( $latest ) {
-        print_message("Master workspace '$masterws':");
-        print_message("Latest milestone available for update:");
-        print "$masterws $latest\n";
-    }
-    else {
-        print_error("Can't determine latest milestone of '$masterws' available for update.", 3);
-    }
-
-    return;
-}
-
-sub query_masters
-{
-    my $cws = shift;
-
-    my @mws = $cws->get_masters();
-    my $list="";
-
-    if ( @mws ) {
-        foreach (@mws) {
-            if ( $list ne "" ) {
-                $list .= ", ";
-            }
-            $list .= $_;
-        }
-        print_message("Master workspaces available: $list");
-    }
-    else {
-        print_error("Can't determine masterworkspaces.", 3);
-    }
-
-    return;
-}
-
-sub query_milestones
-{
-    my $cws = shift;
-    my $masterws = $cws->master();
-
-    my @milestones = $cws->get_milestones($masterws);
-    my $list="";
-
-    if ( @milestones ) {
-        foreach (@milestones) {
-            if ( $list ne "" ) {
-                $list .= ", ";
-            }
-            $list .= $_;
-        }
-        print_message("Master workspace '$masterws':");
-        print_message("Milestones known on Master: $list");
-    }
-    else {
-        print_error("Can't determine milestones of '$masterws'.", 3);
-    }
-
-    return;
-}
-
-sub query_ispublicmaster
-{
-    my $cws = shift;
-    my $masterws = $cws->master();
-
-    my $ispublic = $cws->get_publicmaster_flag();
-    my $list="";
-
-    if ( defined($ispublic) ) {
-        print_message("Master workspace '$masterws':");
-        if ( !defined($ispublic) ) {
-            print_error("Internal error: can't get isPublicMaster flag.", 3);
-        } else {
-            if ( $ispublic==1 ) {
-                print_message("Master workspace is public");
-            } else {
-                print_message("Master workspace is internal");
-            }
-        }
-    }
-    else {
-        print_error("Can't determine isPublicMaster flag of '$masterws'.", 3);
-    }
-
-    return;
-}
-
-sub query_buildid
-{
-    my $cws       = shift;
-    my $milestone = shift;
-
-    my $masterws = $cws->master();
-    if ( $milestone eq 'latest' ) {
-        $milestone = $cws->get_current_milestone($masterws);
-    }
-
-    if ( !$milestone ) {
-        print_error("Can't determine latest milestone of '$masterws'.", 3);
-    }
-
-    if ( !$cws->is_milestone($masterws, $milestone) ) {
-        print_error("Milestone '$milestone' is no a valid milestone of '$masterws'.", 3);
-    }
-
-    my $buildid = $cws->get_buildid($masterws, $milestone);
-
-
-    if ( $buildid ) {
-        print_message("Master workspace '$masterws':");
-        print_message("BuildId for milestone '$milestone':");
-        print("$buildid\n");
-    }
-
-    return;
-}
-
-sub query_integrated
-{
-    my $cws       = shift;
-    my $milestone = shift;
-
-    my $masterws = $cws->master();
-    if ( $milestone eq 'latest' ) {
-        $milestone = $cws->get_current_milestone($masterws);
-    }
-
-    if ( !$milestone ) {
-        print_error("Can't determine latest milestone of '$masterws'.", 3);
-    }
-
-    if ( !$cws->is_milestone($masterws, $milestone) ) {
-        print_error("Milestone '$milestone' is no a valid milestone of '$masterws'.", 3);
-    }
-
-    my @integrated_cws = $cws->get_integrated_cws($masterws, $milestone);
-
-
-    if ( @integrated_cws ) {
-        print_message("Master workspace '$masterws':");
-        print_message("Integrated CWSs for milestone '$milestone':");
-        foreach (@integrated_cws) {
-            print "$_\n";
-        }
-    }
-
-    return;
-}
-
-sub query_approved
-{
-    my $cws       = shift;
-
-    my $masterws = $cws->master();
-
-    my @approved_cws = $cws->get_cws_with_state($masterws, 'approved by QA');
-
-    if ( @approved_cws ) {
-        print_message("Master workspace '$masterws':");
-        print_message("CWSs approved by QA:");
-        foreach (@approved_cws) {
-            print "$_\n";
-        }
-    }
-
-    return;
-}
-
-sub query_nominated
-{
-    my $cws       = shift;
-
-    my $masterws = $cws->master();
-
-    my @nominated_cws = $cws->get_cws_with_state($masterws, 'nominated');
-
-    if ( @nominated_cws ) {
-        print_message("Master workspace '$masterws':");
-        print_message("Nominated CWSs:");
-        foreach (@nominated_cws) {
-            print "$_\n";
-        }
-    }
-
-    return;
-}
-
-sub query_ready
-{
-    my $cws       = shift;
-
-    my $masterws = $cws->master();
-
-    my @ready_cws = $cws->get_cws_with_state($masterws, 'ready for QA');
-
-    if ( @ready_cws ) {
-        print_message("Master workspace '$masterws':");
-        print_message("CWSs ready for QA:");
-        foreach (@ready_cws) {
-            print "$_\n";
-        }
-    }
-
-    return;
-}
-
-sub query_new
-{
-    my $cws       = shift;
-
-    my $masterws = $cws->master();
-
-    my @ready_cws = $cws->get_cws_with_state($masterws, 'new');
-
-    if ( @ready_cws ) {
-        print_message("Master workspace '$masterws':");
-        print_message("CWSs with state 'new':");
-        foreach (@ready_cws) {
-            print "$_\n";
-        }
-    }
-
-    return;
-}
-
-sub query_planned
-{
-    my $cws       = shift;
-
-    my $masterws = $cws->master();
-
-    my @ready_cws = $cws->get_cws_with_state($masterws, 'planned');
-
-    if ( @ready_cws ) {
-        print_message("Master workspace '$masterws':");
-        print_message("CWSs with state 'planned':");
-        foreach (@ready_cws) {
-            print "$_\n";
-        }
-    }
-
-    return;
-}
-
-sub is_valid_cws
-{
-    my $cws = shift;
-
-    my $masterws = $cws->master();
-    my $childws  = $cws->child();
-    # check if we got a valid child workspace
-    my $id = $cws->eis_id();
-    if ( !$id ) {
-        print_error("Child workspace '$childws' for master workspace '$masterws' not found in EIS database.", 2);
-    }
-    print STDERR "Master workspace '$masterws', child workspace '$childws'\n";
-    return 1;
-}
-
-sub query_release
-{
-    my $cws = shift;
-
-    if ( is_valid_cws($cws) ) {
-        my $release = $cws->get_release();
-            print_message("Release target:");
-        if ( !$release ) {
-            print "not set\n";
-        } else {
-            print "$release\n";
-        }
-    }
-    return;
-}
-
-sub query_due
-{
-    my $cws = shift;
-
-    if ( is_valid_cws($cws) ) {
-        my $due = $cws->get_due_date();
-            print_message("Due date:");
-        if ( !$due ) {
-            print "not set\n";
-        } else {
-            print "$due\n";
-        }
-    }
-    return;
-}
-
-sub query_due_qa
-{
-    my $cws = shift;
-
-    if ( is_valid_cws($cws) ) {
-        my $due_qa = $cws->get_due_date_qa();
-            print_message("Due date (QA):");
-        if ( !$due_qa ) {
-            print "not set\n";
-        } else {
-            print "$due_qa\n";
-        }
-    }
-    return;
-}
-
-sub query_help
-{
-    my $cws = shift;
-
-    if ( is_valid_cws($cws) ) {
-        my $help = $cws->is_helprelevant();
-            print_message("Help relevant:");
-        if ( !$help ) {
-            print "false\n";
-        } else {
-            print "true\n";
-        }
-    }
-    return;
-}
-
-sub query_ui
-{
-    my $cws = shift;
-
-    if ( is_valid_cws($cws) ) {
-        my $help = $cws->is_uirelevant();
-            print_message("UI relevant:");
-        if ( !$help ) {
-            print "false\n";
-        } else {
-            print "true\n";
-        }
-    }
-    return;
-}
-
-sub verify_milestone
-{
-    my $cws = shift;
-    my $qualified_milestone = shift;
-
-    my $invalid = 0;
-    my ($master, $milestone);
-    $invalid++ if $qualified_milestone =~ /-/;
-
-    if ( $qualified_milestone =~ /:/ ) {
-        ($master, $milestone) = split(/:/, $qualified_milestone);
-        $invalid++ unless ( $master && $milestone );
-    }
-    else {
-        $milestone = $qualified_milestone;
-    }
-
-    if ( $invalid ) {
-        print_error("Invalid milestone", 0);
-        usage();
-        exit(1);
-    }
-
-    $master = $cws->master() if !$master;
-    if ( !$cws->is_milestone($master, $milestone) ) {
-        print_error("Milestone '$milestone' is not registered with master workspace '$master'.", 21);
-    }
-    return ($master, $milestone);
-}
-
-sub relink_workspace {
-    my $linkdir = shift;
-    my $restore = shift;
-
-    # The list of obligatorily added modules, build will not work
-    # if these are not present.
-    my %added_modules_hash;
-    if (defined $ENV{ADDED_MODULES}) {
-        for ( split(/\s/, $ENV{ADDED_MODULES}) ) {
-            $added_modules_hash{$_}++;
-        }
-    }
-
-    # clean out pre-existing linkdir
-    my $bd = dirname($linkdir);
-    if ( !opendir(DIR, $bd) ) {
-        print_error("Can't open directory '$bd': $!.", 44);
-    }
-    my @old_link_dirs = grep { /^src.m\d+/ } readdir(DIR);
-    close(DIR);
-
-    if ( @old_link_dirs > 1 ) {
-        print_error("Found more than one old link directories:", 0);
-        foreach (@old_link_dirs) {
-            print STDERR "@old_link_dirs\n";
-        }
-        if ( $restore ) {
-            print_error("Please remove all old link directories but the last one", 67);
-        }
-    }
-
-    # Originally the extension .lnk indicated a linked module. This turned out to be
-    # not an overly smart choice. Cygwin has some heuristics which regards .lnk
-    # files as Windows shortcuts, breaking the build. Use .link instead.
-    # When in restoring mode still consider .lnk as link to modules (for old CWSs)
-    my $old_link_dir = "$bd/" . $old_link_dirs[0];
-    if ( $restore ) {
-        if ( !opendir(DIR, $old_link_dir) ) {
-            print_error("Can't open directory '$old_link_dir': $!.", 44);
-        }
-        my @links = grep { !(/\.lnk/ || /\.link/)   } readdir(DIR);
-        close(DIR);
-        # everything which is not a link to a directory can't be an "added" module
-        foreach (@links) {
-            next if /^\./;
-            my $link = "$old_link_dir/$_";
-            if ( -s $link && -d $link ) {
-                $added_modules_hash{$_} = 1;
-            }
-        }
-    }
-    print_message("... removing '$old_link_dir'");
-    rmtree([$old_link_dir], 0);
-
-    print_message("... (re)create '$linkdir'");
-    if ( !mkdir("$linkdir") ) {
-        print_error("Can't create directory '$linkdir': $!.", 44);
-    }
-    if ( !opendir(DIR, "$bd/ooo") ) {
-        print_error("Can't open directory '$bd/sun': $!.", 44);
-    }
-    my @ooo_top_level_dirs = grep { !/^\./ } readdir(DIR);
-    close(DIR);
-    if ( !opendir(DIR, "$bd/sun") ) {
-        print_error("Can't open directory '$bd/sun': $!.", 44);
-    }
-    my @so_top_level_dirs = grep { !/^\./ } readdir(DIR);
-    close(DIR);
-    my $savedir = getcwd();
-    if ( !chdir($linkdir) ) {
-        print_error("Can't chdir() to directory '$linkdir': $!.", 44);
-    }
-    my $suffix = '.link';
-    foreach(@ooo_top_level_dirs) {
-        if ( $_ eq 'REBASE.LOG' || $_ eq 'REBASE.CONFIG_DONT_DELETE'  ) {
-            next;
-        }
-        my $target = $_;
-        if ( -d "../ooo/$_" && !exists $added_modules_hash{$_} ) {
-            $target .= $suffix;
-        }
-        if ( !symlink("../ooo/$_", $target) ) {
-            print_error("Can't symlink directory '../ooo/$_ -> $target': $!.", 44);
-        }
-    }
-    foreach(@so_top_level_dirs) {
-        if ( $_ eq 'REBASE.LOG' || $_ eq 'REBASE.CONFIG_DONT_DELETE'  ) {
-            next;
-        }
-        my $target = $_;
-        if ( -d "../sun/$_" && !exists $added_modules_hash{$_} ) {
-            $target .= $suffix;
-        }
-        if ( !symlink("../sun/$_", $target) ) {
-            print_error("Can't symlink directory '../sun/$_ -> $target': $!.", 44);
-        }
-    }
-    if ( !chdir($savedir) ) {
-        print_error("Can't chdir() to directory '$linkdir': $!.", 44);
-    }
-}
-
-sub fetch_external_tarballs
-{
-    my $source_root_dir = shift;
-    my $external_tarballs_source = shift;
-
-    my $ooo_external_file = "$source_root_dir/ooo/ooo.lst";
-    my $sun_external_file = "$source_root_dir/sun/sun.lst";
-    my $sun_path          = "$source_root_dir/sun";
-
-    my @external_sources_list;
-    push(@external_sources_list, read_external_file($ooo_external_file));
-    if ( -d $sun_path ) {
-        if ( -e $sun_external_file ) {
-            push(@external_sources_list, read_external_file($sun_external_file));
-        }
-        else {
-            print_error("Can't find external file list '$sun_external_file'.", 8);
-        }
-    }
-
-    my $ext_sources_dir = "$source_root_dir/ext_sources";
-    print_message("Copy external tarballs to '$ext_sources_dir'");
-    if ( ! -d $ext_sources_dir) {
-        if ( !mkdir($ext_sources_dir) ) {
-            print_error("Can't create directory '$ext_sources_dir': $!.", 44);
-        }
-    }
-    foreach (@external_sources_list) {
-        if ( ! copy("$external_tarballs_source/$_", $ext_sources_dir) ) {
-            print_error("Can't copy file '$external_tarballs_source' -> '$ext_sources_dir': $!", 0);
-        }
-    }
-    return;
-}
-
-sub read_external_file
-{
-    my $external_file = shift;
-
-    my @external_sources;
-    open(EXT, "<$external_file") or print_error("Can't open file '$external_file' for reading: $!", 98);
-    while(<EXT>) {
-        if ( !/^http:/ ) {
-            chomp;
-            push(@external_sources, $_);
-        }
-    }
-    close(EXT);
-    return @external_sources;
-}
-
-sub update_solver
-{
-    my $platform      = shift;
-    my $source        = shift;
-    my $solver        = shift;
-    my $milestone     = shift;
-    my $source_config = shift;
-
-    my @zip_sub_dirs = ('bin', 'doc', 'idl', 'inc', 'lib', 'par', 'pck', 'pdb', 'pus', 'rdb', 'res', 'xml', 'sdf');
-
-    use Archive::Zip qw( :ERROR_CODES :CONSTANTS );
-
-    my $platform_solver = "$solver/$platform";
-
-    if ( -d $platform_solver ) {
-        print_message("... removing old solver for platform '$platform'");
-        if ( !rmtree([$platform_solver]) ) {
-            print_error("Can't remove directory '$platform_solver': $!.", 44);
-        }
-    }
-
-    if ( !mkdir("$platform_solver") ) {
-        print_error("Can't create directory '$platform_solver': $!.", 44);
-    }
-
-    my $platform_source = "$source/$platform/zip.$milestone";
-    if ( !opendir(DIR, "$platform_source") ) {
-        print_error("Can't open directory '$platform_source': $!.", 44);
-    }
-    my @zips = grep { /\.zip$/ } readdir(DIR);
-    close(DIR);
-
-    my $nzips = @zips;
-    print_message("... unzipping $nzips zip archives for platform '$platform'");
-
-
-    foreach(@zips) {
-        my $zip = Archive::Zip->new();
-        unless ( $zip->read( "$platform_source/$_" ) == AZ_OK ) {
-            print_error("Can't read zip file '$platform_source/$_': $!.", 44);
-        }
-        # TODO: check for erorrs
-        foreach (@zip_sub_dirs) {
-            my $extract_destination = $source_config ? "$platform_solver/$_" : "$platform_solver/$_.$milestone";
-            unless ( $zip->extractTree($_, $extract_destination) == AZ_OK ) {
-                print_error("Can't extract stream from zip file '$platform_source/$_': $!.", 44);
-            }
-        }
-     }
-}
-
-# TODO: special provisions for "source_config" migration, remove this
-# some time after migration
-sub get_source_config_for_milestone
-{
-    my $masterws = shift;
-    my $milestone = shift;
-
-    my $milestone_sequence_number = extract_milestone_sequence_number($milestone);
-    my $ooo320_migration_sequence_number = extract_milestone_sequence_number($ooo320_source_config_milestone);
-
-    my $source_config = 1;
-    if ( $masterws eq 'OOO320' ) {
-        if ( $milestone_sequence_number < $ooo320_migration_sequence_number ) {
-            $source_config = 0;
-        }
-    }
-    return $source_config;
-}
-
-sub extract_milestone_sequence_number
-{
-    my $milestone = shift;
-
-    my $milestone_sequence_number;
-    if ( $milestone =~ /m(\d+)/ ) {
-        $milestone_sequence_number = $1;
-    }
-    else {
-        print_error("can't extract milestone sequence number from milestone '$milestone'", 99);
-    }
-    return $milestone_sequence_number;
-}
-
-# Executes the help command.
-sub do_help
-{
-    my $args_ref    = shift;
-    my $options_ref = shift;
-
-    if (@{$args_ref} == 0) {
-        print STDERR "usage: cws <subcommand> [options] [args]\n";
-        print STDERR "Type 'cws help <subcommand>' for help on a specific subcommand.\n";
-        print STDERR "\n";
-        print STDERR "Available subcommands:\n";
-        print STDERR "\thelp (h,?)\n";
-        print STDERR "\tcreate\n";
-        print STDERR "\tfetch (f)\n";
-        print STDERR "\tquery (q)\n";
-        print STDERR "\ttask (t)\n";
-        print STDERR "\tsetcurrent\n";
-        print STDERR "\teisclone *** release engineers only ***\n";
-    }
-
-    my $arg = $args_ref->[0];
-
-    if (!defined($arg) || $arg eq 'help') {
-        print STDERR "help (h, ?): Describe the usage of this script or its subcommands\n";
-        print STDERR "usage: help [subcommand]\n";
-    }
-    elsif ($arg eq 'create') {
-        print STDERR "create: Create a new child workspace\n";
-        print STDERR "usage: create [-m milestone] <master workspace> <child workspace>\n";
-        print STDERR "\t-m milestone:          Milestone to base the child workspace on. If ommitted the\n";
-        print STDERR "\t                       last published milestone will be used.\n";
-        print STDERR "\t--milestone milestone: Same as -m milestone.\n";
-    }
-    elsif ($arg eq 'task') {
-        print STDERR "task: Add a task to a child workspace\n";
-        print STDERR "usage: task <task id> [task id ...]\n";
-    }
-    elsif ($arg eq 'query') {
-        print STDERR "query: Query child workspace for miscellaneous information\n";
-        print STDERR "usage: query [-M master] [-c child] <current|integratedinto|incompatible|owner|qarep|status|taskids>\n";
-        print STDERR "       query [-M master] [-c child] <release|due|due_qa|help|ui|ispublic|scm|build>\n";
-        print STDERR "       query [-M master] <latest|milestones|ispublicmaster>\n";
-        print STDERR "       query  <masters>\n";
-        print STDERR "       query [-M master] [-m milestone] <integrated|buildid>\n";
-        print STDERR "       query [-M master] <planned|new|approved|nominated|ready>\n";
-        print STDERR "\t-M master:\t\toverride MWS specified in environment\n";
-        print STDERR "\t-c child:\t\toverride CWS specified in environment\n";
-        print STDERR "\t-m milestone:\t\toverride latest milestone with specified one\n";
-        print STDERR "\t--master master:\tSame as -M master\t\n";
-        print STDERR "\t--child child:\t\tSame -c child\n";
-        print STDERR "\t--milestone milestone:\tSame as -m milestone\n";
-        print STDERR "Modes:\n";
-        print STDERR "\tcurrent\t\tquery current milestone of CWS\n";
-        print STDERR "\tincompatible\tquery modules which should be build incompatible\n";
-        print STDERR "\towner\t\tquery CWS owner\n";
-        print STDERR "\tqarep\t\tquery CWS QA Representative\n";
-        print STDERR "\tstatus\t\tquery approval status of CWS\n";
-        print STDERR "\ttaskids\t\tquery taskids to be handled on the CWS\n";
-        print STDERR "\trelease\t\tquery for target release of CWS\n";
-        print STDERR "\tdue\t\tquery for due date of CWS\n";
-        print STDERR "\tdue_qa\t\tquery for due date (QA) of CWS\n";
-        print STDERR "\thelp\t\tquery if the CWS is help relevant\n";
-        print STDERR "\tui\t\tquery if the CWS is UI relevant\n";
-        print STDERR "\tbuild\t\tquery build String for CWS\n";
-        print STDERR "\tlatest\t\tquery the latest milestone available for resync\n";
-        print STDERR "\tbuildid\t\tquery build ID for milestone\n";
-        print STDERR "\tintegrated\tquery integrated CWSs for milestone\n";
-        print STDERR "\tintegratedinto\tquery milestone which CWS was integrated into\n";
-        print STDERR "\tplanned\t\tquery for planned CWSs\n";
-        print STDERR "\tnew\t\tquery for new CWSs\n";
-        print STDERR "\tapproved\tquery CWSs approved by QA\n";
-        print STDERR "\tnominated\tquery nominated CWSs\n";
-        print STDERR "\tready\t\tquery CWSs ready for QA\n";
-        print STDERR "\tispublic\tquery public flag of CWS\n";
-        print STDERR "\tscm\t\tquery Source Control Management (SCM) system used for CWS\n";
-        print STDERR "\tmasters\t\tquery available MWS\n";
-        print STDERR "\tmilestones\tquery which milestones are know on the given MWS\n";
-        print STDERR "\tispublicmaster\tquery public flag of MWS\n";
-
-     }
-    elsif ($arg eq 'fetch') {
-        print STDERR "fetch: fetch a milestone or CWS\n";
-        print STDERR "usage: fetch [-q] [-p platforms] [-r additionalrepositories] [-o] <-m milestone> <workspace>\n";
-        print STDERR "usage: fetch [-q] [-p platforms] [-r additionalrepositories] [-o] <-c cws> <workspace>\n";
-        print STDERR "usage: fetch [-q] [-x platforms] [-r additionalrepositories] [-o] <-m milestone> <workspace>\n";
-        print STDERR "usage: fetch [-q] [-x platforms] [-r additionalrepositories] [-o] <-c cws> <workspace>\n";
-        print STDERR "usage: fetch [-q] <-m milestone> <workspace>\n";
-        print STDERR "usage: fetch [-q] <-c cws> <workspace>\n";
-        print STDERR "\t-m milestone:            Checkout milestone <milestone> to workspace <workspace>\n";
-        print STDERR "\t                         Use 'latest' for the for lastest published milestone on the current master\n";
-        print STDERR "\t                         For cross master checkouts use the form <MWS>:<milestone>\n";
-        print STDERR "\t--milestone milestone:   Same as -m milestone\n";
-        print STDERR "\t-c childworkspace:       Checkout CWS <childworkspace> to workspace <workspace>\n";
-        print STDERR "\t--child childworkspace:  Same as -c childworkspace\n";
-        print STDERR "\t-p platform:             Copy one or more prebuilt platforms 'platform'. \n";
-        print STDERR "\t                         Separate multiple platforms with commas.\n";
-        print STDERR "\t                         Automatically adds 'common[.pro]' as required.\n";
-        print STDERR "\t--platforms platform:    Same as -p\n";
-        print STDERR "\t-x platform:             Copy one or more prebuilt platforms 'platform'. \n";
-        print STDERR "\t                         Separate multiple platforms with commas.\n";
-        print STDERR "\t                         Does not automatically adds 'common[.pro]'.\n";
-        print STDERR "\t-r additionalrepositories Checkout additional repositories. \n";
-        print STDERR "\t                         Separate multiple repositories with commas.\n";
-        print STDERR "\t--noautocommon platform: Same as -x\n";
-        print STDERR "\t-o:                      Omit checkout of sources, copy only solver. \n";
-        print STDERR "\t--onlysolver:            Same as -o\n";
-        print STDERR "\t-q:                      Silence some of the output of the command.\n";
-        print STDERR "\t--quiet:                 Same as -q\n";
-    }
-    elsif ($arg eq 'setcurrent') {
-        print STDERR "setcurrent: Set the current milestone for the CWS (only hg based CWSs)\n";
-        print STDERR "usage: setcurrent [-m milestone]\n";
-        print STDERR "\t-m milestone:           Set milestone to <milestone> to workspace <workspace>\n";
-        print STDERR "\t                        Use 'latest' for the for lastest published milestone on the current master\n";
-        print STDERR "\t                        For cross master change use the form <MWS>:<milestone>\n";
-        print STDERR "\t--milestone milestone:  Same as -m milestone\n";
-    }
-    else {
-        print STDERR "'$arg': unknown subcommand\n";
-        exit(1);
-    }
-    exit(0);
-}
-
-# Executes the create command.
-sub do_create
-{
-    my $args_ref    = shift;
-    my $options_ref = shift;
-
-    if ( exists $options_ref->{'help'} || @{$args_ref} != 2) {
-        do_help(['create']);
-    }
-
-    if ( exists $options_ref->{'hg'} ) {
-        print_warning("All childworkspaces are now hosted on Mercurial. The switch --hg is obsolete.");
-    }
-
-    my $master   = uc $args_ref->[0];
-    my $cws_name = $args_ref->[1];
-
-    if (!is_master($master)) {
-        print_error("'$master' is not a valid master workspace.", 7);
-    }
-
-    # check if cws name fits the convention
-    if ( $cws_name !~ /^\w[\w\.\#]*$/ ) {
-        print_error("Invalid child workspace name '$cws_name'.\nCws names should consist of alphanumeric characters, preferable all lowercase and starting with a letter.\nThe characters . and # are allowed if they are not the first character.", 7);
-    }
-
-    my $cws = get_this_cws();
-    $cws->master($master);
-    $cws->child($cws_name);
-
-    # check if child workspace already exists
-    my $eis_id = $cws->eis_id();
-    if ( !defined($eis_id) ) {
-        print_error("Connection with EIS database failed.", 8);
-    }
-
-    my $is_promotion = 0;
-    if ( $eis_id > 0 ) {
-        if ( $cws->get_approval() eq 'planned' ) {
-            print "Promote child workspace '$cws_name' from 'planned' to 'new'.\n";
-            $is_promotion++;
-        }
-        else {
-            print_error("Child workspace '$cws_name' already exists.", 7);
-        }
-    }
-    else {
-        # check if child workspace name is still available
-        if ( !$cws->is_cws_name_available()) {
-            print_error("Child workspace name '$cws_name' is already in use.", 7);
-        }
-    }
-
-    my $milestone;
-    # verify milestone or query latest milestone
-    if ( exists $options_ref->{'milestone'} ) {
-        $milestone=$options_ref->{'milestone'};
-        # check if milestone exists
-        if ( !$cws->is_milestone($master, $milestone) ) {
-            print_error("Milestone '$milestone' is not registered with master workspace '$master'.", 8);
-        }
-    }
-    else {
-        $milestone=$cws->get_current_milestone($cws->master());
-    }
-
-    # set milestone
-    $cws->milestone($milestone);
-
-    register_child_workspace($cws, 'hg', $is_promotion);
-
-    return;
-}
-
-# Executes the fetch command.
-sub do_fetch
-{
-    my $args_ref    = shift;
-    my $options_ref = shift;
-
-    my $time_fetch_start = Benchmark->new();
-    if ( exists $options_ref->{'help'} || @{$args_ref} != 1) {
-        do_help(['fetch']);
-    }
-
-    my $milestone_opt = $options_ref->{'milestone'};
-    my $additional_repositories_opt = $options_ref->{'additionalrepositories'};
-    $additional_repositories_opt = "", if ( !defined $additional_repositories_opt );
-    my $child = $options_ref->{'childworkspace'};
-    my $platforms = $options_ref->{'platforms'};
-    my $noautocommon = $options_ref->{'noautocommon'};
-    my $quiet  = $options_ref->{'quiet'}  ? 1 : 0 ;
-    my $switch = $options_ref->{'switch'} ? 1 : 0 ;
-    my $onlysolver = $options_ref->{'onlysolver'} ? 1 : 0 ;
-
-    if ( !defined($milestone_opt) && !defined($child) ) {
-        print_error("Specify one of these options: -m or -c", 0);
-        do_help(['fetch']);
-    }
-
-    if ( defined($milestone_opt) && defined($child) ) {
-        print_error("Options -m and -c are mutally exclusive", 0);
-        do_help(['fetch']);
-    }
-
-    if ( defined($platforms) && defined($noautocommon) ) {
-        print_error("Options -p and -x are mutally exclusive", 0);
-        do_help(['fetch']);
-    }
-
-    if ( $onlysolver && !(defined($platforms) || defined($noautocommon)) ) {
-        print_error("Option '-o' is Only usuable combination with option '-p' or '-x'.", 0);
-        do_help(['fetch']);
-    }
-
-    my $cws = get_this_cws();
-    my $masterws = $ENV{WORK_STAMP};
-    if ( !defined($masterws) ) {
-        print_error("Can't determine current master workspace: check environment variable WORK_STAMP", 21);
-    }
-    $cws->master($masterws);
-    my $milestone;
-    if( defined($milestone_opt) ) {
-        if ( $milestone_opt eq 'latest' ) {
-            $cws->master($masterws);
-            my $latest = $cws->get_current_milestone($masterws);
-
-            if ( !$latest ) {
-                print_error("Can't determine latest milestone of master workspace '$masterws'.", 22);
-            }
-            $milestone = $cws->get_current_milestone($masterws);
-        }
-        else {
-            ($masterws, $milestone) =  verify_milestone($cws, $milestone_opt);
-        }
-    }
-    elsif ( defined($child) ) {
-        $cws = get_cws_by_name($child);
-        $masterws = $cws->master(); # CWS can have another master than specified in ENV
-        $milestone = $cws->milestone();
-    }
-    else {
-        do_help(['fetch']);
-    }
-
-    my $config = CwsConfig->new();
-    # $so_svn_server is still required to determine if we are in SO environment
-    # TODO: change this configuration setting to something more meaningful
-    my $so_svn_server = $config->get_so_svn_server();
-    my $prebuild_dir = $config->get_prebuild_binaries_location();
-    my $external_tarball_source = $prebuild_dir;
-    # Check early for platforms so we can bail out before anything time consuming is done
-    # in case of a missing platform
-    my @platforms;
-    if ( defined($platforms) || defined($noautocommon) ) {
-        use Archive::Zip; # warn early if module is missing
-        if ( !defined($prebuild_dir ) ) {
-            print_error("PREBUILD_BINARIES not configured, can't find platform solvers", 99);
-        }
-        $prebuild_dir = "$prebuild_dir/$masterws";
-
-        if ( defined($platforms) ) {
-            @platforms = split(/,/, $platforms);
-
-            my $added_product = 0;
-            my $added_nonproduct = 0;
-            foreach(@platforms) {
-                if ( $_ eq 'common.pro' ) {
-                    $added_product = 1;
-                    print_warning("'$_' is added automatically to the platform list, don't specify it explicit");
-                }
-                if ( $_ eq 'common' ) {
-                    $added_nonproduct = 1;
-                    print_warning("'$_' is added automatically to the platform list, don't specify it explicit");
-                }
-            }
-
-            # add common.pro/common to platform list
-            if ( $so_svn_server ) {
-                my $product = 0;
-                my $nonproduct = 0;
-                foreach(@platforms) {
-                    if ( /\.pro$/ ) {
-                        $product = 1;
-                    }
-                    else {
-                        $nonproduct = 1;
-                    }
-                }
-                unshift(@platforms, 'common.pro') if ($product && !$added_product);
-                unshift(@platforms, 'common') if ($nonproduct && !$added_nonproduct);
-            }
-        }
-        else {
-            @platforms = split(/,/, $noautocommon);
-        }
-
-        foreach(@platforms) {
-            if ( ! -d "$prebuild_dir/$_") {
-                print_error("Can't find prebuild binaries for platform '$_'.", 22);
-            }
-        }
-
-    }
-
-    my $cwsname = $cws->child();
-    my $linkdir = $milestone_opt ? "src.$milestone" : "src." . $cws->milestone;
-
-    my $workspace = $args_ref->[0];
-
-    if ( !$onlysolver ) {
-        if ( -e $workspace ) {
-            print_error("File or directory '$workspace' already exists.", 8);
-        }
-
-        my $clone_milestone_only = $milestone_opt ? $milestone : 0;
-        if ( defined($so_svn_server) ) {
-            if ( !mkdir($workspace) ) {
-                print_error("Can't create directory '$workspace': $!.", 8);
-            }
-            my $work_master = "$workspace/$masterws";
-            if ( !mkdir($work_master) ) {
-                print_error("Can't create directory '$work_master': $!.", 8);
-            }
-
-            my %unique = map { $_ => 1 } split( /,/ , $additional_repositories_opt);
-            my @unique_repo_list = keys %unique;
-
-            if (defined($additional_repositories_opt))
-            {
-                foreach my $repo(@unique_repo_list)
-                {
-                    # do not double clone ooo and sun
-                    hg_clone_cws_or_milestone($repo, $cws, "$work_master/".$repo, $clone_milestone_only), if $repo ne "ooo" && $repo ne "sun";
-                }
-
-            }
-
-            hg_clone_cws_or_milestone('ooo', $cws, "$work_master/ooo", $clone_milestone_only);
-            hg_clone_cws_or_milestone('so', $cws, "$work_master/sun", $clone_milestone_only);
-
-            if ( get_source_config_for_milestone($masterws, $milestone) ) {
-                # write source_config file
-                my $source_config_file = "$work_master/source_config";
-                if ( !open(SOURCE_CONFIG, ">$source_config_file") ) {
-                    print_error("Can't create source_config file '$source_config_file': $!.", 8);
-                }
-                print SOURCE_CONFIG "[repositories]\n";
-                print SOURCE_CONFIG "ooo=active\n";
-                print SOURCE_CONFIG "sun=active\n";
-                foreach my $repo(@unique_repo_list)
-                {
-                    print SOURCE_CONFIG $repo."=active\n", if $repo ne "ooo" || $repo ne "sun";
-                }
-                close(SOURCE_CONFIG);
-            }
-            else {
-                my $linkdir = "$work_master/src.$milestone";
-                if ( !mkdir($linkdir) ) {
-                    print_error("Can't create directory '$linkdir': $!.", 8);
-                }
-                relink_workspace($linkdir);
-            }
-        }
-        else {
-            hg_clone_cws_or_milestone('ooo', $cws, $workspace, $clone_milestone_only);
-        }
-    }
-
-    if ( !$onlysolver && defined($external_tarball_source) ) {
-        my $source_root_dir = "$workspace/$masterws";
-        $external_tarball_source .= "/$masterws/ext_sources";
-        if ( -e "$source_root_dir/ooo/ooo.lst" && -d $external_tarball_source ) {
-            fetch_external_tarballs($source_root_dir, $external_tarball_source);
-        }
-    }
-
-    if ( defined($platforms) || defined($noautocommon) ) {
-        if ( !-d $workspace ) {
-            if ( !mkdir($workspace) ) {
-                print_error("Can't create directory '$workspace': $!.", 8);
-            }
-        }
-        my $solver = defined($so_svn_server) ? "$workspace/$masterws" : "$workspace/solver";
-        if ( !-d $solver ) {
-            if ( !mkdir($solver) ) {
-                print_error("Can't create directory '$solver': $!.", 8);
-            }
-        }
-        my $source_config = get_source_config_for_milestone($masterws, $milestone);
-        foreach(@platforms) {
-            my $time_solver_start = Benchmark->new();
-            print_message("... copying platform solver '$_'.");
-            update_solver($_, $prebuild_dir, $solver, $milestone, $source_config);
-            my $time_solver_stop = Benchmark->new();
-            print_time_elapsed($time_solver_start, $time_solver_stop) if $profile;
-        }
-    }
-    my $time_fetch_stop = Benchmark->new();
-    my $time_fetch = timediff($time_fetch_stop, $time_fetch_start);
-    print_message("cws fetch: total time required " . timestr($time_fetch));
-}
-
-sub do_query
-{
-    my $args_ref    = shift;
-    my $options_ref = shift;
-
-    # list of available query modes
-    my @query_modes = qw(integratedinto incompatible taskids status latest current owner qarep build buildid integrated approved nominated ready new planned release due due_qa help ui milestones masters scm ispublic ispublicmaster);
-    my %query_modes_hash = ();
-    foreach (@query_modes) {
-        $query_modes_hash{$_}++;
-    }
-
-    if ( exists $options_ref->{'help'} || @{$args_ref} != 1) {
-        do_help(['query']);
-    }
-    my $mode = lc($args_ref->[0]);
-
-    # cwquery mode 'state' has been renamed to 'status' to be more consistent
-    # with CVS etc. 'state' is still an alias for 'status'
-    $mode = 'status' if $mode eq 'state';
-
-    # cwquery mode 'vcs' has been renamed to 'scm' to be more consistent
-    # with general use etc. 'vcs' is still an alias for 'scm'
-    $mode = 'scm' if $mode eq 'vcs';
-
-    # there will be more query modes over time
-    if ( !exists $query_modes_hash{$mode} ) {
-        do_help(['query']);
-    }
-    query_cws($mode, $options_ref);
-}
-
-sub do_task
-{
-    my $args_ref    = shift;
-    my $options_ref = shift;
-
-    if ( exists $options_ref->{'help'} ) {
-        do_help(['task']);
-    }
-
-    # CWS states for which adding tasks are blocked.
-    my @states_blocked_for_adding = (
-                                        "integrated",
-                                        "nominated",
-                                        "approved by QA",
-                                        "cancelled",
-                                        "finished"
-                                    );
-    my $cws = get_cws_from_environment();
-
-    # register taskids with EIS database;
-    # checks taksids for sanity, will notify user
-    # if taskid is already registered.
-    my $status = $cws->get_approval();
-
-    my $child = $cws->child();
-    my $master = $cws->master();
-
-    my @registered_taskids = $cws->taskids();
-
-    # if called without ids to register just query for tasks
-    if ( @{$args_ref} == 0 ) {
-        print_message("Task ID(s):");
-        foreach (@registered_taskids) {
-            if ( defined($_) ) {
-                print "$_\n";
-            }
-        }
-    }
-
-    if ( !defined($status) ) {
-        print_error("Can't determine status of child workspace `$child`.", 20);
-    }
-
-    if ( grep($status eq $_, @states_blocked_for_adding) ) {
-        print_error("Can't add tasks to child workspace '$child' with state '$status'.", 21);
-    }
-
-    # Create hash for easier searching.
-    my %registered_taskids_hash = ();
-    for (@registered_taskids) {
-        $registered_taskids_hash{$_}++;
-    }
-
-    my @new_taskids = ();
-    foreach (@{$args_ref}) {
-        if ( $_ !~ /^([ib]?\d+)$/ ) {
-            print_error("'$_' is an invalid task ID.", 22);
-        }
-        if ( exists $registered_taskids_hash{$1} ) {
-            print_warning("Task ID '$_' already registered, skipping.");
-            next;
-        }
-        push(@new_taskids, $_);
-    }
-
-    # TODO: introduce a EIS_USER in the configuration, which should be used here
-    my $config = CwsConfig->new();
-    my $vcsid  = $config->vcsid();
-    my $added_taskids_ref = $cws->add_taskids($vcsid, @new_taskids);
-    if ( !$added_taskids_ref )  {
-        my $taskids_str = join(" ", @new_taskids);
-        print_error("Couldn't register taskID(s) '$taskids_str' with child workspace '$child'.", 23);
-    }
-    my @added_taskids = @{$added_taskids_ref};
-    if ( @added_taskids ) {
-        my $taskids_str = join(" ", @added_taskids);
-        print_message("Registered taskID(s) '$taskids_str' with child workspace '$child'.");
-    }
-    return;
-}
-
-sub do_setcurrent
-{
-    my $args_ref    = shift;
-    my $options_ref = shift;
-
-    if ( exists $options_ref->{'help'} || @{$args_ref} != 0) {
-        do_help(['setcurrent']);
-    }
-
-    if ( !exists $options_ref->{'milestone'} ) {
-        do_help(['setcurrent']);
-    }
-
-    my $cws = get_cws_from_environment();
-    my $old_masterws = $cws->master();
-    my $new_masterws;
-    my $new_milestone;
-
-    my $milestone = $options_ref->{'milestone'};
-    if ( $milestone eq 'latest' ) {
-        my $latest = $cws->get_current_milestone($old_masterws);
-
-        if ( !$latest ) {
-            print_error("Can't determine latest milestone of '$old_masterws'.", 22);
-        }
-        $new_masterws  = $old_masterws;
-        $new_milestone = $latest;
-    }
-    else {
-        ($new_masterws, $new_milestone) =  verify_milestone($cws, $milestone);
-    }
-
-    print_message("... updating EIS database");
-    my $push_return = $cws->set_master_and_milestone($new_masterws, $new_milestone);
-    # sanity check
-    if ( $$push_return[1] ne $new_milestone) {
-        print_error("Couldn't push new milestone '$new_milestone' to database", 0);
-    }
-}
-
-sub do_eisclone
-{
-    my $args_ref    = shift;
-    my $options_ref = shift;
-
-    print_error("not yet implemented.", 2);
-}
-
-sub print_message
-{
-    my $message     = shift;
-
-    print "$message\n";
-    return;
-}
-
-sub print_warning
-{
-    my $message     = shift;
-    print STDERR "$script_name: ";
-    print STDERR "WARNING: $message\n";
-    return;
-}
-
-sub print_error
-{
-    my $message     = shift;
-    my $error_code  = shift;
-
-    print STDERR "$script_name: ";
-    print STDERR "ERROR: $message\n";
-
-    if ( $error_code ) {
-        print STDERR "\nFAILURE: $script_name aborted.\n";
-        exit($error_code);
-    }
-    return;
-}
-
-sub usage
-{
-        print STDERR "Type 'cws help' for usage.\n";
-}
-
-### HG glue ###
-
-sub hg_clone
-{
-    my $source  = shift;
-    my $dest    = shift;
-    my $options = shift;
-
-    if ( $debug ) {
-        print STDERR "CWS-DEBUG: ... hg clone: '$source -> $dest', options: '$options'\n";
-    }
-
-    # The to be cloned revision might not yet be avaliable. In this case clone
-    # the available tip.
-    my @result = execute_hg_command(0, 'clone', $options, $source, $dest);
-    if ( defined($result[0]) && $result[0] =~ /abort: unknown revision/ ) {
-        $options =~ s/-r \w+//;
-        @result = execute_hg_command(1, 'clone', $options, $source, $dest);
-    }
-    return @result;
-}
-
-sub hg_parent
-{
-    my $repository  = shift;
-    my $rev_id = shift;
-    my $options = shift;
-
-    if ( $debug ) {
-        print STDERR "CWS-DEBUG: ... hg parent: 'repository', revision: '$rev_id', options: $options\n";
-    }
-
-    my @result = execute_hg_command(0, 'parent', "--cwd $repository", "-r $rev_id", $options);
-    my $line = $result[0];
-    chomp($line);
-    return $line;
-}
-
-sub hg_pull
-{
-    my $repository  = shift;
-    my $remote = shift;
-
-    if ( $debug ) {
-        print STDERR "CWS-DEBUG: ... hg pull: 'repository', remote: '$remote'\n";
-    }
-
-    my @result = execute_hg_command(0, 'pull', "--cwd $repository", $remote);
-    my $line = $result[0];
-    if ($line =~ /abort: /) {
-        return undef;
-    }
-}
-
-sub hg_update
-{
-    my $repository  = shift;
-
-    if ( $debug ) {
-        print STDERR "CWS-DEBUG: ... hg update: 'repository'\n";
-    }
-
-    my @result = execute_hg_command(1, 'update', "--cwd $repository");
-    return @result;
-}
-
-sub hg_show
-{
-    if ( $debug ) {
-        print STDERR "CWS-DEBUG: ... hg show\n";
-    }
-    my $result = execute_hg_command(0, 'show', '');
-    return $result;
-}
-
-sub execute_hg_command
-{
-    my $terminate_on_rc = shift;
-    my $command = shift;
-    my $options = shift;
-    my @args = @_;
-
-    my $args_str = join(" ", @args);
-
-    # we can only parse english strings, hopefully a C locale is available everywhere
-    $ENV{LC_ALL}='C';
-    $command = "hg $command $options $args_str";
-
-    if ( $debug ) {
-        print STDERR "CWS-DEBUG: ... execute command line: '$command'\n";
-    }
-
-    my @result;
-    open(OUTPUT, "$command 2>&1 |") or print_error("Can't execute mercurial command line client", 98);
-    while (<OUTPUT>) {
-        push(@result, $_);
-    }
-    close(OUTPUT);
-
-    my $rc = $? >> 8;
-
-    if ( $rc > 0 && $terminate_on_rc) {
-        print STDERR @result;
-        print_error("The mercurial command line client failed with exit status '$rc'", 99);
-    }
-    return wantarray ? @result : \@result;
-}
-
-
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/cwsattach b/solenv/bin/cwsattach
deleted file mode 100755
index 99bcde52977a..000000000000
--- a/solenv/bin/cwsattach
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-if [ x${SOLARENV}x = xx ]; then
-    echo No environment found, please use 'configure' or 'setsolar'
-    exit 1
-fi
-exec perl -w $SOLARENV/bin/cwsattach.pl "$@"
-
diff --git a/solenv/bin/cwsattach.btm b/solenv/bin/cwsattach.btm
deleted file mode 100644
index 94a0f28c7ab8..000000000000
--- a/solenv/bin/cwsattach.btm
+++ /dev/null
@@ -1,11 +0,0 @@
-@echo off
-iff "%SOLARENV%" == "" then
-    echo No environment found, please use 'configure' or 'setsolar'
-	goto end
-endiff
-iff "%PERL%" == "" then
-	call perl5 -I%SOLARENV%\bin\modules %SOLARENV%\bin\cwsattach.pl %1&
-else
-	call %PERL% -I%SOLARENV%\bin\modules %SOLARENV%\bin\cwsattach.pl %1&
-endiff
-:end
diff --git a/solenv/bin/cwsattach.pl b/solenv/bin/cwsattach.pl
deleted file mode 100644
index 05e1b8df3cb4..000000000000
--- a/solenv/bin/cwsattach.pl
+++ /dev/null
@@ -1,220 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-#
-# cwsattach.pl - attach files to CWS
-#
-
-use strict;
-use Getopt::Long;
-use Cwd;
-
-#### module lookup
-my @lib_dirs;
-BEGIN {
-    if ( !defined($ENV{SOLARENV}) ) {
-        die "No environment found (environment variable SOLARENV is undefined)";
-    }
-    push(@lib_dirs, "$ENV{SOLARENV}/bin/modules");
-    push(@lib_dirs, "$ENV{COMMON_ENV_TOOLS}/modules") if defined($ENV{COMMON_ENV_TOOLS});
-}
-use lib (@lib_dirs);
-
-use Cws;
-
-#### script id #####
-
-( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
-
-my $script_rev;
-my $id_str = ' $Revision: 1.3 $ ';
-$id_str =~ /Revision:\s+(\S+)\s+\$/
-  ? ($script_rev = $1) : ($script_rev = "-");
-
-print STDERR "$script_name -- version: $script_rev\n";
-
-#### global #####
-
-my $is_debug = 1;       # enable debug
-my $opt_master = '';    # option: master workspace
-my $opt_child  = '';    # option: child workspace
-my $opt_mime_type = '';  # option: mime type
-
-
-#### main #####
-
-my $arg_file = parse_options();
-attach_cws($arg_file);
-exit(0);
-
-#### subroutines ####
-
-sub attach_cws
-{
-    my $filename = shift;
-    # get master and child workspace
-    my $masterws = $opt_master ? uc($opt_master) : $ENV{WORK_STAMP};
-    my $childws  = $opt_child  ? $opt_child  : $ENV{CWS_WORK_STAMP};
-
-    if ( !defined($masterws) ) {
-        print_error("Can't determine master workspace environment.\n"
-                    . "Please initialize environment with setsolar ...", 1);
-    }
-
-    if ( !defined($childws) ) {
-        print_error("Can't determine child workspace environment.\n"
-                    . "Please initialize environment with setsolar ...", 1);
-    }
-
-    my $cws = Cws->new();
-    $cws->child($childws);
-    $cws->master($masterws);
-
-    my $mime_type  = $opt_mime_type  ? $opt_mime_type  : find_mime_type($filename);
-
-    no strict;
-
-    if ( is_valid_cws($cws) ) {
-        #print "CWS is valid filename=" . $filename . " mime_type=" . $mime_type . "\n";
-        open(DATA,"<$filename") || die "can't open filename";
-        $data="";
-    while(<DATA>) {
-        $data.=$_;
-    }
-        my $result=$cws->save_attachment($filename,$mime_type,$data);
-    } else {
-        print STDERR "cws is not valid";
-    }
-    exit(0)
-}
-
-
-sub find_mime_type
-{
-    my $filename = shift;
-    $filename=~/(.*)\.(.*$)/;
-    my $ext=$2;
-    my $fmime='';
-
-    if ( defined($ext) ) {
-        open(MIME,"< $ENV{SOLARENV}/inc/mime.types")|| die "can not open mimetype file";
-        while (<MIME>) {
-            my @a=split();
-            my $iscomment=0;
-            if ( /(\s*\#).*/ ) {
-                $iscomment=1;
-            } else {
-                $iscomment=0;
-            }
-            if ( $iscomment eq 0 && $#a >= 1 && $fmime eq '' ) {
-                my $i=1;
-                for ($i=1; $i<=$#a; $i++) {
-                    if ( $a[$i] eq $ext ) {
-                        $fmime=$a[0];
-                    }
-                }
-            }
-        }
-
-    }
-    if ( $fmime eq '' ) {
-        $fmime="application/octet-stream";
-    }
-    return $fmime;
-}
-
-
-sub is_valid_cws
-{
-    my $cws = shift;
-
-    my $masterws = $cws->master();
-    my $childws  = $cws->child();
-    # check if we got a valid child workspace
-    my $id = $cws->eis_id();
-    if ( !$id ) {
-        print_error("Child workspace '$childws' for master workspace '$masterws' not found in EIS database.", 2);
-    }
-    print_message("Master workspace '$masterws', child workspace '$childws':");
-    return 1;
-}
-
-sub parse_options
-{
-    # parse options and do some sanity checks
-    my $help = 0;
-    my $success = GetOptions('h' => \$help, 'm=s' => \$opt_master, 'c=s'=> \$opt_child, 't=s'=> \$opt_mime_type);
-    if ( $help || !$success || $#ARGV < 0 ) {
-        usage();
-        exit(1);
-    }
-
-    return $ARGV[0];
-}
-
-sub print_message
-{
-    my $message     = shift;
-
-    print STDERR "$script_name: ";
-    print STDERR "$message\n";
-    return;
-}
-
-sub print_error
-{
-    my $message     = shift;
-    my $error_code  = shift;
-
-    print STDERR "$script_name: ";
-    print STDERR "ERROR: $message\n";
-
-    if ( $error_code ) {
-        print STDERR "\nFAILURE: $script_name aborted.\n";
-        exit($error_code);
-    }
-    return;
-}
-
-sub usage
-{
-    print STDERR "Usage: cwsattach [-h] [-m master] [-c child] [-t mimetype] filename\n";
-    print STDERR "\n";
-    print STDERR "Attach files to CWS in EIS database\n";
-    print STDERR "\n";
-    print STDERR "Options:\n";
-    print STDERR "\t-h\t\thelp\n";
-    print STDERR "\t-m master\toverride MWS specified in environment\n";
-    print STDERR "\t-c child\toverride CWS specified in environment\n";
-    print STDERR "\t-t mimetype\texplicitly set mime type\n";
-    print STDERR "Examples:\n";
-    print STDERR "\tcwsattach barfoo.html\n";
-    print STDERR "\tcwsattach -t text bar.cxx\n";
-    print STDERR "\tcwsattach -t text/rtf foo.rtf\n";
-}
diff --git a/solenv/bin/cwscreate b/solenv/bin/cwscreate
deleted file mode 100755
index c3260f746e39..000000000000
--- a/solenv/bin/cwscreate
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-if [ x${SOLARENV}x = xx ]; then
-    echo No environment found, please use 'configure' or 'setsolar'
-    exit 1
-fi
-echo "Please use the 'cws create' command for creating new child workspaces!"
diff --git a/solenv/bin/cwstestresult b/solenv/bin/cwstestresult
deleted file mode 100755
index 29b1c0c8e99d..000000000000
--- a/solenv/bin/cwstestresult
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-if [ x${SOLARENV}x = xx ]; then
-    echo No environment found, please use 'configure' or 'setsolar'
-    exit 1
-fi
-exec perl -w $SOLARENV/bin/cwstestresult.pl "$@"
-
diff --git a/solenv/bin/cwstestresult.btm b/solenv/bin/cwstestresult.btm
deleted file mode 100644
index 38a012996500..000000000000
--- a/solenv/bin/cwstestresult.btm
+++ /dev/null
@@ -1,11 +0,0 @@
-@echo off
-iff "%SOLARENV%" == "" then
-    echo No environment found, please use 'configure' or 'setsolar'
-	goto end
-endiff
-iff "%PERL%" == "" then
-	call perl5 -I%SOLARENV%\bin\modules %SOLARENV%\bin\cwstestresult.pl %1&
-else
-	call %PERL% -I%SOLARENV%\bin\modules %SOLARENV%\bin\cwstestresult.pl %1&
-endiff
-:end
diff --git a/solenv/bin/cwstestresult.pl b/solenv/bin/cwstestresult.pl
deleted file mode 100644
index 43b41ff7b5e8..000000000000
--- a/solenv/bin/cwstestresult.pl
+++ /dev/null
@@ -1,192 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-#
-# cwstestresult.pl - publish results of CWS tests to EIS
-#
-
-use strict;
-use Getopt::Long;
-use Cwd;
-
-#### module lookup
-my @lib_dirs;
-BEGIN {
-    if ( !defined($ENV{SOLARENV}) ) {
-        die "No environment found (environment variable SOLARENV is undefined)";
-    }
-    push(@lib_dirs, "$ENV{SOLARENV}/bin/modules");
-    push(@lib_dirs, "$ENV{COMMON_ENV_TOOLS}/modules") if defined($ENV{COMMON_ENV_TOOLS});
-}
-use lib (@lib_dirs);
-
-use Cws;
-
-#### global #####
-( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
-
-my $is_debug = 1;           # enable debug
-my $opt_master;             # option: master workspace
-my $opt_child;              # option: child workspace
-my $opt_milestone;              # option: milestone
-my $opt_testrunName;        # option: testrunName
-my $opt_testrunPlatform;    # option: testrunPlatfrom
-my $opt_resultPage;         # option: resultPage
-
-
-#### main #####
-
-my $arg_status= parse_options();
-testresult($arg_status);
-exit(0);
-
-#### subroutines ####
-
-sub testresult
-{
-    my $status = shift;
-    # get master and child workspace
-    my $masterws = $opt_master ? uc($opt_master) : $ENV{WORK_STAMP};
-    my $milestone = $opt_milestone ? $opt_milestone : $ENV{UPDMINOR};
-    my $childws  = $opt_milestone ? undef : ( $opt_child  ? $opt_child  : $ENV{CWS_WORK_STAMP} );
-
-    if ( !defined($masterws) ) {
-        print_error("Can't determine master workspace environment.\n"
-                    . "Please initialize environment with setsolar ...", 1);
-    }
-
-    if ( !defined($childws) && !defined($milestone) ) {
-        print_error("Can't determine child workspace environment or milestone.\n"
-                    . "Please initialize environment with setsolar ...", 1);
-    }
-    if ( !defined($opt_resultPage) ) {
-    $opt_resultPage="";
-    }
-    my $cws = Cws->new();
-    if ( defined($childws) ) {
-        $cws->child($childws);
-    }
-    $cws->master($masterws);
-    my $eis = $cws->eis();
-
-    no strict;
-    my $result='';
-
-    if ( defined($childws) ) {
-        $opt_resultPage=SOAP::Data->type(string => $opt_resultPage);
-        my $id = $cws->eis_id();
-        if ( is_valid_cws($cws) ) {
-            $result=$eis->submitTestResult($id,$opt_testrunName,$opt_testrunPlatform, $opt_resultPage, $status);
-    } else {
-         print STDERR "cws is not valid";
-    }
-    } else {
-        $opt_resultPage=SOAP::Data->type(string => $opt_resultPage);
-        $result=$eis->submitTestResultMWS($masterws,$milestone,$opt_testrunName,$opt_testrunPlatform, $opt_resultPage, $status);
-    }
-
-    exit(0)
-}
-
-
-sub is_valid_cws
-{
-    my $cws = shift;
-
-    my $masterws = $cws->master();
-    my $childws  = $cws->child();
-    # check if we got a valid child workspace
-    my $id = $cws->eis_id();
-    if ( !$id ) {
-        print_error("Child workspace '$childws' for master workspace '$masterws' not found in EIS database.", 2);
-    }
-    return 1;
-}
-
-sub parse_options
-{
-    # parse options and do some sanity checks
-    Getopt::Long::Configure("no_ignore_case");
-    my $help = 0;
-    my $success = GetOptions('h' => \$help, 'M=s' => \$opt_master, 'm=s' => \$opt_milestone, 'c=s' => \$opt_child, 'n=s' => \$opt_testrunName, 'p=s' => \$opt_testrunPlatform , 'r=s' => \$opt_resultPage );
-    if ( $help || !$success || $#ARGV < 0 || (!defined($opt_testrunName)) || ( !defined($opt_testrunPlatform)) ) {
-        usage();
-        exit(1);
-    }
-    if ( defined($opt_milestone) && defined($opt_child) ) {
-    print_error("-m and -c are mutually exclusive options",1);
-    }
-
-    return $ARGV[0];
-}
-
-sub print_message
-{
-    my $message     = shift;
-
-    print STDERR "$script_name: ";
-    print STDERR "$message\n";
-    return;
-}
-
-sub print_error
-{
-    my $message     = shift;
-    my $error_code  = shift;
-
-    print STDERR "$script_name: ";
-    print STDERR "ERROR: $message\n";
-
-    if ( $error_code ) {
-        print STDERR "\nFAILURE: $script_name aborted.\n";
-        exit($error_code);
-    }
-    return;
-}
-
-sub usage
-{
-    print STDERR "Usage: cwstestresult[-h] [-m masterws] [-m milestone|-c childws] <-n testrunName> <-p testrunPlatform> <-r resultPage> statusName\n";
-    print STDERR "\n";
-    print STDERR "Publish result of CWS- or milestone-test to EIS\n";
-    print STDERR "\n";
-    print STDERR "Options:\n";
-    print STDERR "\t-h\t\t\thelp\n";
-    print STDERR "\t-M master\t\toverride MWS specified in environment\n";
-    print STDERR "\t-m milestone\t\toverride milestone specified in environment\n";
-    print STDERR "\t-c child\t\toverride CWS specified in environment\n";
-    print STDERR "\t-n testrunName\t\tspecifiy name of the test\n";
-    print STDERR "\t-p testrunPlatform\tspecify platform where the test ran on\n";
-    print STDERR "\t-r resultPage\t\tspecify name of attachment or hyperlink\n";
-    print STDERR "\t\t\t\tfor resultPage\n";
-
-
-    print STDERR "\nExample:\n";
-    print STDERR "\tcwstestresult -c mycws -n Performance -p Windows -r PerfomanceTestWindows.html ok\n";
-}
diff --git a/solenv/bin/cwstouched b/solenv/bin/cwstouched
deleted file mode 100755
index dac08c07f9a7..000000000000
--- a/solenv/bin/cwstouched
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-if [ x${SOLARENV}x = xx ]; then
-    echo No environment found, please use 'configure' or 'setsolar'
-    exit 1
-fi
-exec perl -w $SOLARENV/bin/cwstouched.pl
diff --git a/solenv/bin/cwstouched.btm b/solenv/bin/cwstouched.btm
deleted file mode 100755
index 33e442dbb51c..000000000000
--- a/solenv/bin/cwstouched.btm
+++ /dev/null
@@ -1,11 +0,0 @@
-@echo off
-iff "%SOLARENV%" == "" then
-    echo No environment found, please use 'configure' or 'setsolar'
-	goto end
-endiff
-iff "%PERL%" == "" then
-	call perl5 -I%SOLARENV%\bin\modules %SOLARENV%\bin\cwstouched.pl %1&
-else
-	call %PERL% -I%SOLARENV%\bin\modules %SOLARENV%\bin\cwstouched.pl %1&
-endiff
-:end
diff --git a/solenv/bin/cwstouched.pl b/solenv/bin/cwstouched.pl
deleted file mode 100755
index eb306277580c..000000000000
--- a/solenv/bin/cwstouched.pl
+++ /dev/null
@@ -1,151 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***********************************************************************/
-
-use strict;
-use Cwd;
-
-#### module lookup
-my @lib_dirs;
-BEGIN {
-    if ( !defined($ENV{SOLARENV}) ) {
-        die "No environment found (environment variable SOLARENV is undefined)";
-    }
-    push(@lib_dirs, "$ENV{SOLARENV}/bin/modules");
-}
-use lib (@lib_dirs);
-
-use Cws;
-
-# Prototypes
-sub getMinor($);
-sub getCwsWorkStamp();
-
-my $workstamp = $ENV{'WORK_STAMP'};
-my $solenv= $ENV{'SOLARENV'};
-my $cwsWorkStamp = getCwsWorkStamp();
-my $minor = getMinor($cwsWorkStamp);
-
-my $oldWorkStamp = $workstamp."_".$minor;
-my $svndiff="svn diff --summarize --old=svn://svn.services.openoffice.org/ooo/tags/".$oldWorkStamp." --new=svn://svn.services.openoffice.org/ooo/cws/".$cwsWorkStamp;
-
-my @diff = `$svndiff`;
-
-my @modules;
-foreach(@diff)
-{
-    if (/.*svn:\/\/svn.services.openoffice.org.*/)
-    {
-        $_ =~ /.*$oldWorkStamp\/(\w*)/;
-        my $newModule=$1;
-        if (defined($newModule))
-        {
-            if ( ! grep(/$newModule/,@modules))
-            {
-                push(@modules, $newModule);
-            }
-
-        }
-    }
-}
-
-foreach(@modules)
-{
-    print "$_\n";
-}
-
-exit(0);
-
-sub getMinor($)
-{
-    my $workst = shift;
-    my $min="";
-
-    if ( ! defined($ENV{'UPDMINOR'}))
-    {
-        my $cws = Cws->new();
-        $cws->child($workst);
-        $cws->master($ENV{'WORK_STAMP'});
-        my $masterws = $cws->master();
-        my $childws  = $cws->child();
-
-        # check if we got a valid child workspace
-        my $id = $cws->eis_id();
-        if ( !$id )
-        {
-            print("Child workspace '$childws' for master workspace '$masterws' not found in EIS database.\n");
-            exit(1);
-        }
-
-        my @milestones = $cws->milestone();
-        foreach (@milestones) {
-            if ( defined($_) )
-            {
-                $min=$_;
-            }
-        }
-    }
-    else
-    {
-        $min = $ENV{'UPDMINOR'};
-    }
-
-    chomp($min);
-    return $min;
-}
-
-sub getCwsWorkStamp()
-{
-    my $cwsWorkSt="";
-
-    if ( ! defined($ENV{'CWS_WORK_STAMP'}))
-    {
-        my $currPath= cwd;
-
-        chdir($ENV{'SOLARENV'});
-
-        my @info = `svn info`;
-
-        foreach(@info)
-        {
-            if ( /URL:.*/ )
-            {
-                # URL: svn+ssh://svn@svn.services.openoffice.org/ooo/cws/qadev37/solenv
-                $_ =
~ /.*svn.services.openoffice.org(.*\/(.*))\/\w*/;
-                $cwsWorkSt=$2; #qadev37
-            }
-        }
-
-    }
-    else
-    {
-        $cwsWorkSt = $ENV{'CWS_WORK_STAMP'};
-    }
-    return $cwsWorkSt
-}
diff --git a/solenv/bin/cwstouched.py b/solenv/bin/cwstouched.py
deleted file mode 100755
index 87dfe4b03595..000000000000
--- a/solenv/bin/cwstouched.py
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/python
-
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***********************************************************************/
-
-import os
-import sys
-import string
-from os import path
-
-def getCurrPath():
-    currPath = sys.path[0] or os.getcwd()
-    currPath = path.abspath(currPath)
-    return currPath
-    
-def getCwsWorkStamp():
-    cwsWorkStamp=os.getenv('CWS_WORK_STAMP')
-    
-    if not cwsWorkStamp:
-        currPath=getCurrPath()
-        
-        os.chdir(os.getenv('SOLARENV'))
-        
-        (input, output) = os.popen4("svn info")
-        
-        for outline in output.readlines():
-            if outline.startswith("URL:"):
-                cwsWorkStamp = outline[outline.index("svn.services"):outline.index("solenv")-1]
-                cwsWorkStamp = cwsWorkStamp[cwsWorkStamp.rfind("/")+1:len(cwsWorkStamp)]
-                break
-                
-        os.putenv("CWS_WORK_STAMP",cwsWorkStamp);
-        os.chdir(currPath)
-    
-    return string.strip(cwsWorkStamp)
-    
-def getMinor(cwsWorkStamp):
-    minor = os.getenv('UPDMINOR')
-    
-    if not minor:
-        if (os.getenv('OSTYPE') == "cygwin"):
-            bash=os.getenv("SHELL")
-            (input, output) = os.popen4("cygpath -w "+bash)
-            winbash=string.strip(output.readlines()[0])
-            cws=winbash+" -c 'cws  query -c "+cwsWorkStamp+" current'"
-        else:
-            cws="cws query -c "+cwsWorkStamp+" current"
-
-        (input, output) = os.popen4(cws)
-        
-        found=0
-        for outline in output.readlines():
-            if found:
-                minor=outline
-                break
-            elif outline.find("Current milestone:") != -1:
-                found=1
-    
-    return string.strip(minor)
-    
-    
-workstamp = os.getenv('WORK_STAMP')
-solenv= os.getenv('SOLARENV')
-cwsWorkStamp=getCwsWorkStamp()
-minor = getMinor(cwsWorkStamp)
-
-oldWorkStamp = workstamp + "_" + minor
-diff="svn diff --summarize --old=svn://svn.services.openoffice.org/ooo/tags/"+oldWorkStamp+" --new=svn://svn.services.openoffice.org/ooo/cws/"+cwsWorkStamp
-
-modules=[]
-(input, output) = os.popen4(diff)
-
-for outline in output.readlines():
-    if outline.find("svn://svn.services.openoffice.org"):
-        index = outline.index(oldWorkStamp)+len(oldWorkStamp)+1
-        newModule=""
-        if outline.find("/",index) != -1:
-            # seems to be a file
-            newModule=string.strip(outline[index:outline.index("/",index)])
-        else:
-            #seems to be a folder
-            if len(outline[index:]) > 0:
-                newModule=string.strip(outline[index:])
-        if newModule != "" and not modules.count(newModule): 
-            modules.append(newModule)
-
-for module in modules:
-    print module
\ No newline at end of file
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index b87665c6b011..1d1c53618105 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -43,11 +43,6 @@ use File::Spec;
 
 ( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
 
-$id_str = ' $Revision: 275594 $ ';
-$id_str =~ /Revision:\s+(\S+)\s+\$/
-  ? ($script_rev = $1) : ($script_rev = "-");
-
-
 #### globals ####
 
 ### valid actions ###
@@ -141,8 +136,6 @@ use sigtrap 'handler' => \&cleanup_and_die, 'normal-signals';
 
 parse_options();
 
-print "$script_name -- version: $script_rev\n" if !$opt_silent;
-
 if ( ! $opt_delete ) {
     if ( $ENV{GUI} eq 'WNT' ) {
         if ($ENV{COM} eq 'GCC') {
@@ -238,7 +231,7 @@ sub do_linklib
     return unless $has_symlinks;
 
     $from_dir = expand_macros('../%__SRC%/lib');
-    $to_dir = expand_macros('%_DEST%/lib%_EXT%');
+    $to_dir = expand_macros('%_DEST%/lib');
 
     @globbed_files = glob("$from_dir/$lib");
 
@@ -268,7 +261,6 @@ sub do_linklib
         }
         else
         {
-            # $lib =~ /^(lib[\w-]+(\.so|\.dylib))\.(\d+)$/;
             $long = 0;
         }
 
@@ -368,13 +360,13 @@ sub do_symlink
         }
     }
     else {
+        return unless -e $fullfrom;
         print "REMOVE: $to\n" if $opt_verbose;
         unlink $to;
         if ( $opt_delete ) {
             push_on_ziplist($to) if $opt_zip;
             return;
         }
-        return unless -e $fullfrom;
         print "SYMLIB: $from -> $to\n" if $opt_verbose;
         if ( !symlink("$from", "$to") ) {
             print_error("can't symlink $from -> $to: $!",0);
@@ -446,7 +438,6 @@ sub parse_options
 
 sub init_globals
 {
-    my $ext;
     ($module, $repository, $base_dir, $dlst_file) =  get_base();
 
     # for CWS:
@@ -459,38 +450,18 @@ sub init_globals
         $umask = 22;
     }
 
-    my $build_sosl    = $ENV{'BUILD_SOSL'};
     my $common_outdir = $ENV{'COMMON_OUTDIR'};
     my $inpath        = $ENV{'INPATH'};
     my $solarversion  = $ENV{'SOLARVERSION'};
     my $updater       = $ENV{'UPDATER'};
-    my $updminor      = $ENV{'UPDMINOR'};
-    my $updminorext   = $ENV{'UPDMINOREXT'};
     my $work_stamp    = $ENV{'WORK_STAMP'};
 
-    # special security check for release engineers
-    if ( defined($updater) && !defined($build_sosl) && !$opt_force) {
-        my $path = getcwd();
-        if ( $path !~ /$work_stamp/io ) {
-            print_error("can't deliver from local directory to SOLARVERSION");
-            print STDERR "\nDANGER! Release Engineer:\n";
-            print STDERR "do you really want to deliver from $path to SOLARVERSION?\n";
-            print STDERR "If so, please use the -force switch\n\n";
-            exit(7);
-        }
-    }
-
     # do we have a valid environment?
     if ( !defined($inpath) ) {
             print_error("no environment", 0);
             exit(3);
     }
 
-    $ext = "";
-    if ( ($updminor) && !$dest ) {
-        $ext = "$updminorext";
-    }
-
     # Do we have common trees?
     if ( defined($ENV{'common_build'}) && $ENV{'common_build'} eq 'TRUE' ) {
         $common_build = 1;
@@ -530,7 +501,6 @@ sub init_globals
                 [ '%__PRJROOT%',        $base_dir       ],
                 [ '%__SRC%',            $inpath         ],
                 [ '%_DEST%',            $dest           ],
-                [ '%_EXT%',             $ext            ],
                 [ '%COMMON_OUTDIR%',    $common_outdir  ],
                 [ '%COMMON_DEST%',      $common_dest    ],
                 [ '%GUI%',              $gui            ]
@@ -601,7 +571,7 @@ sub parse_dlst
             if ( /\.res\s/ ) {
                 my $imagelist = $_;
                 $imagelist =~ s/\.res/\.$ilst_ext/g;
-                $imagelist =~ s/\\bin%_EXT%\\/\\res%_EXT%\\img\\/;
+                $imagelist =~ s/DEST%\\bin\\/DEST%\\res\\img\\/;
                 push(@action_data, ['copy', $imagelist]);
             }
         }
@@ -829,10 +799,6 @@ sub copy_if_newer
             }
         }
         fix_file_permissions($$from_stat_ref[2], $temp_file);
-        if ( $^O eq 'os2' )
-        {
-            $rc = unlink($to); # YD OS/2 can't rename if $to exists!
-        }
         # Ugly hack: on windows file locking(?) sometimes prevents renaming.
         # Until we've found and fixed the real reason try it repeatedly :-(
         my $try = 0;
@@ -1021,33 +987,33 @@ sub push_default_actions
     if ( ! $opt_delete ) {
         # create all the subdirectories on solver
         foreach $subdir (@subdirs) {
-            push(@action_data, ['mkdir', "%_DEST%/$subdir%_EXT%"]);
+            push(@action_data, ['mkdir', "%_DEST%/$subdir"]);
         }
         if ( $common_build ) {
             foreach $subdir (@common_subdirs) {
-                push(@action_data, ['mkdir', "%COMMON_DEST%/$subdir%_EXT%"]);
+                push(@action_data, ['mkdir', "%COMMON_DEST%/$subdir"]);
             }
         }
     }
-    push(@action_data, ['mkdir', "%_DEST%/inc%_EXT%/$module"]);
+    push(@action_data, ['mkdir', "%_DEST%/inc/$module"]);
     if ( $common_build ) {
-        push(@action_data, ['mkdir', "%COMMON_DEST%/inc%_EXT%/$module"]);
-        push(@action_data, ['mkdir', "%COMMON_DEST%/res%_EXT%/img"]);
+        push(@action_data, ['mkdir', "%COMMON_DEST%/inc/$module"]);
+        push(@action_data, ['mkdir', "%COMMON_DEST%/res/img"]);
     } else {
-        push(@action_data, ['mkdir', "%_DEST%/res%_EXT%/img"]);
+        push(@action_data, ['mkdir', "%_DEST%/res/img"]);
     }
 
     # deliver build.lst to $dest/inc/$module
-    push(@action_data, ['copy', "build.lst %_DEST%/inc%_EXT%/$module/build.lst"]);
+    push(@action_data, ['copy', "build.lst %_DEST%/inc/$module/build.lst"]);
     if ( $common_build ) {
         # ... and to $common_dest/inc/$module
-        push(@action_data, ['copy', "build.lst %COMMON_DEST%/inc%_EXT%/$module/build.lst"]);
+        push(@action_data, ['copy', "build.lst %COMMON_DEST%/inc/$module/build.lst"]);
     }
 
     # need to copy libstaticmxp.dylib for Mac OS X
     if ( $^O eq 'darwin' )
     {
-        push(@action_data, ['copy', "../%__SRC%/lib/lib*static*.dylib %_DEST%/lib%_EXT%/lib*static*.dylib"]);
+        push(@action_data, ['copy', "../%__SRC%/lib/lib*static*.dylib %_DEST%/lib/lib*static*.dylib"]);
     }
 }
 
@@ -1120,20 +1086,8 @@ sub push_on_ziplist
     return if ( $opt_check );
     # strip $dest from path since we don't want to record it in zip file
     if ( $file =~ s#^\Q$dest\E/##o ) {
-        if ( $updminor ){
-            # strip minor from path
-            my $ext = "%_EXT%";
-            $ext = expand_macros($ext);
-            $file =~ s#^$ext##o;
-        }
         push(@zip_list, $file);
     } elsif ( $file =~ s#^\Q$common_dest\E/##o ) {
-        if ( $updminor ){
-            # strip minor from path
-            my $ext = "%_EXT%";
-            $ext = expand_macros($ext);
-            $file =~ s#^$ext##o;
-        }
         push(@common_zip_list, $file);
     }
 }
@@ -1163,10 +1117,6 @@ sub push_on_loglist
     my $solarversion  = $ENV{'SOLARVERSION'};
     $solarversion =~ s#\\#/#g;
     $entry[2] =~ s/^\Q$solarversion\E\///;
-    # strip minor from 'to'
-    my $ext = "%_EXT%";
-    $ext = expand_macros($ext);
-    $entry[2] =~ s#$ext([\\\/])#$1#o;
 
     if ( $common ) {
         push @common_log_list, [@entry];
@@ -1182,21 +1132,18 @@ sub zip_files
     $zipexe .= ' -y' unless  $^O eq 'MSWin32';
 
     my ($platform_zip_file, $common_zip_file);
-    $platform_zip_file = "%_DEST%/zip%_EXT%/$module.zip";
+    $platform_zip_file = "%_DEST%/zip/$module.zip";
     $platform_zip_file = expand_macros($platform_zip_file);
     my (%dest_dir, %list_ref);
     $dest_dir{$platform_zip_file} = $dest;
     $list_ref{$platform_zip_file} = \@zip_list;
     if ( $common_build ) {
-        $common_zip_file = "%COMMON_DEST%/zip%_EXT%/$module.zip";
+        $common_zip_file = "%COMMON_DEST%/zip/$module.zip";
         $common_zip_file = expand_macros($common_zip_file);
         $dest_dir{$common_zip_file}   = $common_dest;
         $list_ref{$common_zip_file}   = \@common_zip_list;
     }
 
-    my $ext = "%_EXT%";
-    $ext = expand_macros($ext);
-
     my @zipfiles;
     $zipfiles[0] = $platform_zip_file;
     if ( $common_build ) {
@@ -1314,8 +1261,8 @@ sub get_tempfilename
 sub write_log
 {
     my (%log_file, %file_date);
-    $log_file{\@log_list} = "%_DEST%/inc%_EXT%/$module/deliver.log";
-    $log_file{\@common_log_list} = "%COMMON_DEST%/inc%_EXT%/$module/deliver.log";
+    $log_file{\@log_list} = "%_DEST%/inc/$module/deliver.log";
+    $log_file{\@common_log_list} = "%COMMON_DEST%/inc/$module/deliver.log";
     $file_date{\@log_list} = $logfiledate;
     $file_date{\@common_log_list} = $commonlogfiledate;
 
diff --git a/solenv/bin/fix_def_file.cmd b/solenv/bin/fix_def_file.cmd
deleted file mode 100644
index 4db97f8ce435..000000000000
--- a/solenv/bin/fix_def_file.cmd
+++ /dev/null
@@ -1,52 +0,0 @@
-/* os2 build scripts

-

-this script is used to process def results

-

-*/

-

-lmax = 0

-smax = ''

-ordinal = 1

-

-do while( lines())

-

-	l = strip(linein())

-	l = strip(l,,X2C(9))

-	l = strip(l,,";")

-	if LEFT( l,4) \= 'Java' THEN l = '_'l

-

-	/* remove comments */

-	if POS(';', l) > 0 then l = LEFT( l, POS(';', l)-1)

-	if POS('#', l) > 0 then l = LEFT( l, POS('#', l)-1)

-	/* remove wildcards */

-	if POS('*', l) > 0 then l = ''

-

-	/* remove empty lines */

-	if l = '_' then l = ''

-

-	/* remove component_getDescriptionFunc, since it is already added by tg_def */

-	if l = '_component_getDescriptionFunc' then l = ''

-	if l = '_GetVersionInfo' then l = ''

-

-	/* remove GLOBAL symbols */

-/*

-	if POS('_GLOBAL_', l) > 0 then l = ';'l

-	if POS('_ZN4_STL', l) > 0 then l = ';'l

-	if POS('_ZNK4_STL', l) > 0 then l = ';'l

-*/

-	/* if LENGTH(l) > 254 then l = ';(>254)'left(l,100)*/

-

-	IF LENGTH(l)>0 THEN DO

-	  say l

-  	  ordinal = ordinal + 1

-	END

-

-	if LENGTH(l)>lmax then do

-          lmax = LENGTH(l)

-          smax = l

-        end

-

-end

-

-say ';lmax='lmax

-say ';smax='smax

diff --git a/solenv/bin/fix_def_ord.cmd b/solenv/bin/fix_def_ord.cmd
deleted file mode 100644
index eaeb666626db..000000000000
--- a/solenv/bin/fix_def_ord.cmd
+++ /dev/null
@@ -1,19 +0,0 @@
-/* os2 build scripts

-

-this script is used to process def results.

-Adds ordinal number to every line.

-

-*/

-

-lmax = 0

-smax = ''

-

-ord = 1

-do while( lines())

-

-	l = linein()

-	IF LENGTH(l)>0 THEN DO

-  	  say l /* ' @'ord ' RESIDENTNAME' */

-	  ord = ord + 1

-	END

-end

diff --git a/solenv/bin/fix_dxp_file.cmd b/solenv/bin/fix_dxp_file.cmd
deleted file mode 100644
index 66149c1207ea..000000000000
--- a/solenv/bin/fix_dxp_file.cmd
+++ /dev/null
@@ -1,30 +0,0 @@
-/* os2 build scripts

-

-this script is used to process dxp files produced from .map

-

-*/

-

-do while( lines())

-

-	l = linein()

-

-	l = strip(l)

-	l = strip(l,,X2C(9))

-	l = strip(l,,";")

-	if LEFT( l,4) \= 'Java' THEN l = '_'l

-

-	/* remove empty lines */

-	if l = '_' then l = ''

-

-	/* remove component_getDescriptionFunc, since it is already added by tg_def */

-	if l = '_component_getDescriptionFunc' then l = ''

-	if l = '_GetVersionInfo' then l = ''

-

-	/* remove GLOBAL symbols */

-/*

-	if WORDPOS( l, '_GLOBAL_') > 0 then l = ''

-*/

-

-	say l

-

-end

diff --git a/solenv/bin/fix_exp_file.cmd b/solenv/bin/fix_exp_file.cmd
deleted file mode 100644
index bec416c06e05..000000000000
--- a/solenv/bin/fix_exp_file.cmd
+++ /dev/null
@@ -1,54 +0,0 @@
-/* os2 build scripts

-

-this script is used to process emxexp results

-

-*/

-

-lmax = 0

-ordinal = 1

-

-do while( lines())

-

-	l = strip(linein())

-	if POS(';', l) > 0 then l = LEFT(l,POS(';', l)-1)

-

-	l = strip(translate(l,'','"'))

-	l = strip(l,,X2C(9))

-

-	/* remove empty lines */

-	if l = '_' then l = ''

-

-	/* remove component_getDescriptionFunc, since it is already added by tg_def */

-	if l = '_component_getDescriptionFunc' then l = ''

-	if l = '_GetVersionInfo' then l = ''

-

-

-	/* remove GLOBAL symbols */

-	if POS('_GLOBAL_', l) > 0 then l = ';'l

-/*

-	if POS('!', l) > 0 then l = ';'l

-	if POS('_ZN4_STL', l) > 0 then l = ';'l

-	if POS('_ZNK4_STL', l) > 0 then l = ';'l

-	if POS('ImplClass', l) > 0 then l = ';'l

-	if POS('ImplHelper', l) > 0 then l = ';'l

-	if POS('UsageHelper', l) > 0 then l = ';'l

-	if POS('com3sun4star3', l) > 0 then l = ';'l

-*/

-	/* if LENGTH(l) > 254 then l = ';(>254)'left(l,100) */

-

-	if POS(';', l) > 0 then l = LEFT(l,POS(';', l)-1)

-

-	IF LENGTH(l)>0 THEN DO

-	  say l

-  	  ordinal = ordinal + 1

-	END

-

-	if LENGTH(l)>lmax then do

-          lmax = LENGTH(l)

-          smax = l

-        end

-

-end

-

-say ';lmax='lmax

-say ';smax='smax

diff --git a/solenv/bin/fix_lin_file.cmd b/solenv/bin/fix_lin_file.cmd
deleted file mode 100644
index 0d074ce9f706..000000000000
--- a/solenv/bin/fix_lin_file.cmd
+++ /dev/null
@@ -1,13 +0,0 @@
-/* os2 build scripts

-*/

-

-parse arg dir

-

-do while( lines())

-

-	l = linein()

-

-	/* skip empty lines */

-	if l \= '' then say dir || '\' || l

-

-end

diff --git a/solenv/bin/fix_shl.cmd b/solenv/bin/fix_shl.cmd
deleted file mode 100644
index ca13abb2074e..000000000000
--- a/solenv/bin/fix_shl.cmd
+++ /dev/null
@@ -1,11 +0,0 @@
-/* os2 build scripts

-

-will return a 8.3 conformant name for modname.

-

-21/02/2006 Actually this is a simple truncation, seems nothing more needed.

-

-*/

-

-parse arg modname

-if pos('.',modname)>0 then modname = left(modname, pos('.',modname)-1)

-say strip(left(modname,8))

diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl
index 90c8f02a3e06..654c95b7290a 100755
--- a/solenv/bin/gccinstlib.pl
+++ b/solenv/bin/gccinstlib.pl
@@ -38,19 +38,23 @@ if ($Dest =~ /--help/ || @ARGV < 1) {
     print "Syntax:\n  gcc-instlib <library-in-libpath ...> <destination-dir>\n";
     exit (0);
 }
+
+%SrcAndDest = ();
+
 foreach $File (@ARGV) {
     my $string;
-
-    open (GCCOut, "LANGUAGE=C LC_ALL=C $cc -print-file-name=$File|") || die "Failed to exec $cc -print-file-name=$File $!";
+    my $normalized_file = $File;
+    $normalized_file =~ s/\.so\.\d+/.so/;
+    open (GCCOut, "LANGUAGE=C LC_ALL=C $cc -print-file-name=$normalized_file|") || die "Failed to exec $cc -print-file-name=$normalized_file $!";
     $string=<GCCOut>;
     chomp ($string);
-    push (@CopySrc, $string);
+    $SrcAndDest{$string} = "$Dest/$File";
     close (GCCOut);
 }
 
-foreach $Src (@CopySrc) {
-    printf "copy $Src to $Dest\n";
-    system ("/bin/cp $Src $Dest") && die "copy failed: $!";
+while (($Src, $FullDest) = each %SrcAndDest) {
+    printf "copy $Src to $FullDest\n";
+    system ("/bin/cp $Src $FullDest") && die "copy failed: $!";
 }
 
 
diff --git a/solenv/bin/gdb_cxa-atexit_trace-stdout b/solenv/bin/gdb_cxa-atexit_trace-stdout
new file mode 100644
index 000000000000..25cfe98974ce
--- /dev/null
+++ b/solenv/bin/gdb_cxa-atexit_trace-stdout
@@ -0,0 +1,8 @@
+set pagination off
+break __cxa_atexit
+commands
+    bt
+    cont
+end
+run
+quit
diff --git a/solenv/bin/gdbtrycatchtrace b/solenv/bin/gdbtrycatchtrace
new file mode 100644
index 000000000000..636985a14d45
--- /dev/null
+++ b/solenv/bin/gdbtrycatchtrace
@@ -0,0 +1,21 @@
+set pagination off
+catch throw
+commands
+    bt
+    cont
+end
+catch catch
+commands
+    bt
+    cont
+end
+echo log will be saved as gdbtrace.log, this will take some time, patience...\n
+set logging redirect on
+set logging file gdbtrace.log
+set logging on
+set logging overwrite on
+run
+bt
+quit
+set logging off
+echo log is saved as gdbtrace.log\n
diff --git a/solenv/bin/gdbtrycatchtrace-stdout b/solenv/bin/gdbtrycatchtrace-stdout
new file mode 100644
index 000000000000..e606a4f12f86
--- /dev/null
+++ b/solenv/bin/gdbtrycatchtrace-stdout
@@ -0,0 +1,14 @@
+set pagination off
+catch throw
+commands
+    bt
+    cont
+end
+catch catch
+commands
+    bt
+    cont
+end
+run
+bt
+quit
diff --git a/solenv/bin/gen_userfeedback_VCL_names.pl b/solenv/bin/gen_userfeedback_VCL_names.pl
index e65968e6b6c2..5cfb5d4c7f9d 100755
--- a/solenv/bin/gen_userfeedback_VCL_names.pl
+++ b/solenv/bin/gen_userfeedback_VCL_names.pl
@@ -59,7 +59,7 @@ for (<HID>) {
 
   if ( exists $hids{$upperlongname} && ( $hids{$upperlongname} != $ID ) )
   {
-    print STDERR "errror: unclear definition of longname: $longname = $hids{$upperlongname} or $ID\n";
+    print STDERR "warn: unclear definition of longname: $longname = $hids{$upperlongname} or $ID\n";
   }
   $hids{$upperlongname} = $ID;
 
@@ -121,7 +121,7 @@ foreach ( glob("$winpath/*win") ) {
       $upperlongname =~ tr/a-z/A-Z/;
       if ( $shortname !~ /^[\+\*]/ && !exists $hids{$upperlongname} )
       {
-        print STDERR "errror: Longname not in hid.lst: $filename $longname\n";
+        print STDERR "warn: Longname not in hid.lst: $filename $longname\n";
       }
       if ( exists $hids{$upperlongname} )
       {
@@ -131,7 +131,6 @@ foreach ( glob("$winpath/*win") ) {
     }
 
     $iteminfo = "$shortname $longname $ID";
-#    print "$iteminfo\n" if ( ! ( $shortname && $longname && $ID ));
     $iteminfo =~ s/^\*//;
     $iteminfo =~ s/^\+//;
 
diff --git a/solenv/bin/gsicheck b/solenv/bin/gsicheck
index fb2f65cbe01d..5a09880b9014 100755
--- a/solenv/bin/gsicheck
+++ b/solenv/bin/gsicheck
@@ -5,14 +5,9 @@ exit 1
 fi
 
 if [ "${OS?}" = MACOSX ]; then
-    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
 else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
-fi
-
-if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
-    exec $SOLARVERSION/$INPATH/bin/gsicheck "$@"
-else
-    exec $SOLARVERSION/$INPATH/bin$UPDMINOREXT/gsicheck "$@"
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
 fi
 
+exec $SOLARVERSION/$INPATH/bin/gsicheck "$@"
diff --git a/solenv/bin/guw.pl b/solenv/bin/guw.pl
index c5326204eb49..0e1e0e6654b4 100755
--- a/solenv/bin/guw.pl
+++ b/solenv/bin/guw.pl
@@ -301,15 +301,7 @@ sub replace_cyg_env {
         'SOLARVERSION',
         'SOLARVER',
         'SRC_ROOT',
-        'LOCALINI',
-        'GLOBALINI',
         'SOLARENV',
-        'STAR_INSTPATH',
-        'STAR_SOLARPATH',
-        'STAR_PACKMISC',
-        'STAR_SOLARENVPATH',
-        'STAR_INITROOT',
-        'STAR_STANDLST',
         'CLASSPATH',
         'JAVA_HOME'
     );
diff --git a/solenv/bin/hicontrast-to-theme.pl b/solenv/bin/hicontrast-to-theme.pl
deleted file mode 100644
index 027d7405dab2..000000000000
--- a/solenv/bin/hicontrast-to-theme.pl
+++ /dev/null
@@ -1,125 +0,0 @@
-:
-    eval 'exec perl -S $0 ${1+"$@"}'
-        if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-#
-# Create ordinary theme from HiContrast images.
-#
-
-use File::Copy;
-use File::Find;
-use File::Path;
-use File::Spec;
-
-( $src, $dst ) = @ARGV;
-
-if ( $src eq "" || $dst eq "" ) {
-    print STDERR "Usage: hicontrast-to-theme.pl src dest\n\n";
-    print STDERR "Create ordinary theme from HiContrast images.\n";
-    exit 1;
-}
-
-$dst = File::Spec->rel2abs( $dst );
-
-@hc_table = (
-    [ ".*_h.png",         "_h.png",    ".png" ],
-    [ ".*_sch.png",       "_sch.png",  ".png" ],
-    [ ".*_hc.png",        "_hc.png",   ".png" ],
-    [ "lch_.*.png",       "lch_",      "lc_" ],
-    [ "sch_.*.png",       "sch_",      "sc_" ],
-    [ "lch[0-9].*.png",   "lch",       "lc" ],
-    [ "sch[0-9].*.png",   "sch",       "sc" ],
-    [ "loh[0-9].*.png",   "loh",       "lo" ],
-    [ "lxh[0-9].*.png",   "lxh",       "lx" ],
-    [ "sxh[0-9].*.png",   "sxh",       "sx" ],
-    [ "avh[0-9].*.png",   "avh",       "av" ],
-    [ "avlh[0-9].*.png",  "avlh",      "avl" ],
-    [ "idh[0-9].*.png",   "idh",       "id" ],
-    [ "imh[0-9].*.png",   "imh",       "im" ],
-    [ "mih[0-9].*.png",   "mih",       "mi" ],
-    [ "tbh[0-9].*.png",   "tbh",       "tb" ],
-    [ "nah[0-9].*.png",   "nah",       "na" ],
-    [ "nch[0-9].*.png",   "nch",       "nc" ],
-    [ "nvh[0-9].*.png",   "nvh",       "nv" ],
-    [ "ouh[0-9].*.png",   "ouh",       "ou" ],
-    [ "ddh[0-9].*.png",   "ddh",       "dd" ],
-    [ "sfh[0-9].*.png",   "sfh",       "sf" ],
-    [ "srh[0-9].*.png",   "srh",       "sr" ],
-    [ "wrh[0-9].*.png",   "wrh",       "wr" ],
-    [ "alh[0-9].*.png",   "alh",       "al" ],
-    [ "ath[0-9].*.png",   "ath",       "at" ],
-    [ "bih[0-9].*.png",   "bih",       "bi" ],
-    [ "coh[0-9].*.png",   "coh",       "co" ],
-    [ "foh[0-9].*.png",   "foh",       "fo" ],
-    [ "fuh[0-9].*.png",   "fuh",       "fu" ],
-    [ "oph[0-9].*.png",   "oph",       "op" ],
-    [ "unh[0-9].*.png",   "unh",       "un" ],
-    [ "edh[0-9].*.png",   "edh",       "ed" ],
-    [ "cdh[0-9].*.png",   "cdh",       "cd" ],
-    [ "frh[0-9].*.png",   "frh",       "fr" ],
-    [ "fwh[0-9].*.png",   "fwh",       "fw" ],
-    [ "nuh[0-9].*.png",   "nuh",       "nu" ],
-    [ "prh[0-9].*.png",   "prh",       "pr" ],
-    [ "shh[0-9].*.png",   "shh",       "sh" ],
-    [ "trh[0-9].*.png",   "trh",       "tr" ],
-    [ "reh[0-9].*.png",   "reh",       "re" ],
-    [ "joh[0-9].*.png",   "joh",       "jo" ],
-    [ "fph[0-9].*.png",   "fph",       "fp" ],
-    [ "dah[0-9].*.png",   "dah",       "da" ]
-);
-
-my (@from_stat, @to_stat);
-
-sub copy_normalized {
-    $file = $_;
-    for $hc ( @hc_table ) {
-        ( $what, $from, $to ) = @$hc;
-        if ( $file =~ /$what/&&!($file=~/\.svn/) ) {
-            my $dir = File::Spec->catdir( $dst, $File::Find::dir );
-
-            if ( ! -d $dir ) {
-                mkpath( $dir );
-            }
-
-            ( my $copy = $file ) =~ s/$from/$to/;
-            $copy = File::Spec->catfile( $dir, $copy );
-
-            @from_stat = stat($file);
-            @to_stat = stat($copy);
-            if ( $from_stat[9] > $to_stat[9] ) {
-                copy( $file, $copy ) || die $!;
-                utime( $from_stat[9], $from_stat[9], $copy );
-            }
-
-            last;
-        }
-    }
-}
-
-chdir( $src );
-find( \&copy_normalized, '.' );
diff --git a/solenv/bin/id-lang.map b/solenv/bin/id-lang.map
new file mode 100644
index 000000000000..acc5afc0cba6
--- /dev/null
+++ b/solenv/bin/id-lang.map
@@ -0,0 +1,105 @@
+# Welcome to the mkid language mapper.
+#
+# The format of each line is:
+#
+#       <pattern> <language> [options]
+#
+# Filenames are matched top-to-bottom against the patterns, and the
+# first match is chosen.  The special language `IGNORE' means that
+# this file should be ignored by mkid.  The options are
+# language-specific command-line options to mkid.
+#
+# If a file name doesn't match any pattern, it is assigned the default
+# language.  The default language may be specified here with the
+# special pattern `**', or overridden from the mkid command-line with
+# the `--default-lang=LANG' option.
+#
+# The special pattern `***' means to include the named file that
+# immediately follows.  If no file is named, then the default system
+# language mapper file (i.e., this file) is included.
+
+# Default language
+**          IGNORE  # Although this is listed first,
+                # the default language pattern is
+                # logically matched last.
+
+# Backup files
+*~          IGNORE
+*.bak           IGNORE
+*.bk[0-9]       IGNORE
+
+# SCCS files
+[sp].*          IGNORE
+
+# C dependencies created by automake
+*/.deps/*       IGNORE
+
+*.h         C
+*.h.in          C
+*.H         C++
+*.hh            C++
+*.hpp           C++
+*.hxx           C++
+
+*.l         C
+*.lex           C
+*.y         C
+*.yacc          C
+
+*.c         C
+*.C         C++
+*.cc            C++
+*.cpp           C++
+*.cxx           C++
+
+*.java          Java
+
+ChangeLog*      Cdoc
+
+*.[sS]          asm --comment=;
+*.asm           asm --comment=;
+
+# [nt]roff
+*.[0-9]         roff
+*.ms            roff
+*.me            roff
+*.mm            roff
+
+*.tex           TeX
+*.ltx           TeX
+*.texi          texinfo
+*.texinfo       texinfo
+
+# portable object (i18n)
+*.po            po
+
+*.el            lisp
+*.elc           lisp
+*.lisp          lisp
+*.scm           lisp
+
+*.am            make
+Makefile        make
+Makefile.*      make
+
+*.doc           text
+*.txt           text
+
+*.m4            m4
+
+*.pl            perl
+*.pm            perl
+
+*.gz            FILTER gzip -d <%s
+*.Z         FILTER gzip -d <%s
+
+######### OOo-specific stuff #######################################
+
+# Treat OOo resource header files as C files
+*.hrc           C
+# Treat OOo header files generated from *.idl as C++ files
+*.hdl           C++
+# Treat OOo resource files as C files
+*.src           C
+# Treat OOo *.mk files as makefiles
+*.mk            make
diff --git a/solenv/bin/image-sort.pl b/solenv/bin/image-sort.pl
index 16c792608c66..e4fd8491baf2 100755
--- a/solenv/bin/image-sort.pl
+++ b/solenv/bin/image-sort.pl
@@ -28,7 +28,7 @@ sub read_new_icons($$)
     my @new_icons;
     my %new_icons;
     for my $icon (@images) {
-    my $iname = "res/commandimagelist/" . $prefix . $icon . ".png";
+    my $iname = "cmd/" . $prefix . $icon . ".png";
     if (!defined $global_hash{$iname} &&
         !defined $new_icons{$iname}) {
         push @new_icons, $iname;
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index fe75d0d562d4..b1fdc6e271d0 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -2,6 +2,8 @@
     eval 'exec perl -S $0 ${1+"$@"}'
         if 0;
 
+use strict;
+
 #*************************************************************************
 #
 #    This app makes it easy to link a live build
@@ -33,53 +35,71 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
+# This file substantially, if not wholely written by volunteers, not Oracle
+#
 #*************************************************************************
 
 # ends up in program/ooenv
-( $moz_lib = `pkg-config --variable=libdir mozilla-nss` ) =~ tr/\n/:/;
-$env_script = '
-java_path=`./javaldx`
-export LD_LIBRARY_PATH=".:$java_path:' . $moz_lib . '$LD_LIBRARY_PATH"
+( my $moz_lib = `pkg-config --variable=libdir mozilla-nss` ) =~ tr/\n/:/;
+my $env_script = '
+java_path=`$thisdir/../basis-link/ure-link/bin/javaldx 2>/dev/null`
+export LD_LIBRARY_PATH="$thisdir:$java_path:' . $moz_lib . '$LD_LIBRARY_PATH"
 ulimit -c unlimited
-export PATH=".:$PATH"
+export PATH="$thisdir/:$thisdir/../basis-link/program:$thisdir/../basis-link/ure-link/bin:$PATH"
 export GNOME_DISABLE_CRASH_DIALOG=1
-export STAR_RESOURCEPATH=`pwd`/resource
+export STAR_RESOURCEPATH=$thisdir/../basis-link/program/resource
 # debugging assistance
-export OOO_FORCE_SYSALLOC=1
+export SAL_DISABLE_FLOATGRAB=1
+export G_SLICE=always-malloc
 export MALLOC_CHECK_=2
 export OOO_DISABLE_RECOVERY=1
+export SAL_ALLOW_LINKOO_SYMLINKS=1
 ';
 
-$program_dir = 'program';
-$program_dir = 'MacOS' if ($ENV{OS} eq 'MACOSX');
+my $dry_run = 0;
+my $usage = 0;
+my $LANG;
+my $TARGET;
+my $LIBVER;
+my $OOO_BUILD;
+my $OOO_INSTALL;
+
+my $program_dir = 'basis-link/program';
+my $brand_program_dir = 'program';
+my $ure_misc_dir = 'basis-link/ure-link/share/misc';
+my $ure_java_dir = 'basis-link/ure-link/share/java';
+my $ure_lib_dir = 'basis-link/ure-link/lib';
+
+$program_dir = 'openoffice.org/basis-link/MacOS' if ($ENV{OS} eq 'MACOSX'); # FIXME probably wrong
 
 my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
 
-%replaceable = (
-	$program_dir => '\.so',
+my %replaceable = (
+    $program_dir => '\.so',
     $program_dir . '/resource' => '\.res$',
     $program_dir . '/classes' => '\.jar$',
-    'share/config' => '\.zip$',
+    'basis-link/share/config' => '\.zip$',
 #    'share/uno_packages' => '\.zip$'
 );
 
 # strangely enough, OSX has those small differences...
 $replaceable{$program_dir} = '\.dylib$' if ($ENV{OS} eq 'MACOSX');
+$replaceable{$ure_lib_dir} = '\.dylib$' if ($ENV{OS} eq 'MACOSX');
 
-@search_dirs = ( 'lib', 'bin', 'class' );
+my @search_dirs = ( 'lib', 'bin', 'class' );
 
-@known_duplicates = ( 'db.jar', 'libi18n' );
+my @known_duplicates = ( 'db.jar', 'libi18n' );
 
 sub sniff_target($)
 {
     my $build_dir = shift;
     my ($dirhandle, $fname);
-    my ($target, $libver, $lang) = ( 'unxlngi4.pro', '680', 'en-US' ); # defaults
-    
+    my ($target, $libver, $lang) = ( 'unxlngi6.pro', '680', 'en-US' ); # defaults
+
     opendir ($dirhandle, $build_dir) || die "Can't open $build_dir";
     while ($fname = readdir ($dirhandle)) {
 	$fname =~ /Set.sh$/ || next;
-	
+
 	my $file;
 	open ($file, "$build_dir/$fname") || die "Can't open $build_dir/$fname";
 	while (<$file>) {
@@ -175,12 +195,45 @@ sub do_link($$$$@)
     }
 }
 
+sub scan_one_dir($$$$)
+{
+    my ($installed_files, $build_files, $path, $solver) = @_;
+
+    for my $elem (@search_dirs) {
+	my $dirh_module;
+	my $module_path = "$path/$elem";
+	if (opendir ($dirh_module, $module_path)) {
+	    while (my $file = readdir ($dirh_module)) {
+		if (defined $installed_files->{$file}) {
+		    if (defined $build_files->{$file}) {
+			my $known = 0;
+			for my $regexp (@known_duplicates) {
+			    if ($file =~ m/$regexp/) {
+				$known = 1;
+			    }
+			}
+			if (!$known && !$solver) {
+			    print STDERR "\nlinkoo:: Unknown duplicate file '$file' in: '" . 
+				$build_files->{$file} . "' vs '" .
+				$module_path . "' in module $path\n";
+			    exit (1);
+			}
+		    } else {
+			$build_files->{$file} = $module_path;
+		    }
+		}
+	    }
+	}
+	closedir ($dirh_module);
+    }
+}
+
 sub scan_and_link_files($$$)
 {
     my $build_path = shift;
     my $installed_files = shift;
     my $target = shift;
-    
+
     my @modules = ();
     my $dirh_toplevel;
     opendir ($dirh_toplevel, $build_path) || die "Can't open '$build_path': $!";
@@ -192,42 +245,21 @@ sub scan_and_link_files($$$)
     }
     closedir ($dirh_toplevel);
 
-# FIXME: re-implement the $product functionality
-    my $module;
+    # Scan the old-style module/$target/lib directories ...
     my %build_files;
-    for $module (@modules) {
-	for $elem (@search_dirs) {
-	    my $dirh_module;
-	    my $module_path = "$module/$elem";
-	    if (opendir ($dirh_module, $module_path)) {
-			while (my $file = readdir($dirh_module)) {
-				if (defined $installed_files->{$file}) {
-					if (defined $build_files{$file}) {
-						my $known = 0;
-						for my $regexp (@known_duplicates) {
-							if ($file =~ m/$regexp/) {
-								$known = 1;
-							}
-						}
-						if (!$known) {
-							print "Unknown duplicate file '$file' in: '" . 
-							$build_files{$file} . "' vs '" .
-							$module_path . "' in module $module\n";
-							exit (1);
-						}
-					}
-					$build_files{$file} = $module_path;
-				}
-			}
-		}
-	    closedir ($dirh_module);
-	}
+    for my $module (@modules) {
+	scan_one_dir ($installed_files, \%build_files, $module, 0);
     }
 
+    # Now scan the solver
+    my $upd = 300;
+    $upd = $ENV{UPD} if (defined $ENV{UPD});
+    scan_one_dir ($installed_files, \%build_files, "$build_path/solver/$upd/$target", 1);
+
     for my $file (keys %build_files) {
 	my $src = $build_files{$file};
 	my $dest = $installed_files->{$file};
-	
+
 	do_link ($src, $dest, $file, $file);
     }
     print "\n";
@@ -257,8 +289,8 @@ sub evilness($)
 sub link_iso_res()
 {
     print "Special iso.res case: ";
-    my $ooo_res="$OOO_INSTALL/" . $program_dir . "/resource/ooo".$LIBVER.$LANG.".res";
-    my $star_res="$OOO_INSTALL/" . $program_dir . "/resource/iso".$LIBVER.$LANG.".res";
+    my $ooo_res="$OOO_INSTALL/" . $brand_program_dir . "/resource/ooo".$LIBVER.$LANG.".res";
+    my $star_res="$OOO_INSTALL/" . $brand_program_dir . "/resource/iso".$LIBVER.$LANG.".res";
     if (-l $ooo_res && -l $star_res) {
 	if ($dry_run) {
 	    print "link $ooo_res to $star_res";
@@ -272,39 +304,39 @@ sub link_iso_res()
 }
 
 # Hack for (renamed) types.rdb (types.db)
+sub link_oovbaapi_rdb()
+{
+    print "oovbaapi.rdb case:";
+    my $src  = "$OOO_BUILD/oovbaapi/$TARGET/ucr";
+    my $dest = "$OOO_INSTALL/" . $program_dir;
+    do_link ($src, $dest, 'oovbaapi.db', 'oovbaapi.rdb');
+    print "\n";
+}
+
 sub link_types_rdb()
 {
     print "Types.rdb case:";
     my $src  = "$OOO_BUILD/offapi/$TARGET/ucr";
-    my $dest = "$OOO_INSTALL/" . $program_dir;
+    my $dest = "$OOO_INSTALL/" . $ure_misc_dir;
     do_link ($src, $dest, 'types.db', 'types.rdb');
     print "\n";
 }
 
-# link installed files back into src tree:
-sub link_soffice_bin_files()
+sub link_pagein_files()
 {
-    my $dest;
-    my $src = "$OOO_INSTALL/" . $program_dir;
-
-    print "soffice files";
-    $dest = "$OOO_BUILD/desktop/$TARGET/bin";
-    do_link ($src, $dest, 'soffice', 'soffice.bin', 1);
-    do_link ($src, $dest, 'bootstraprc', 'bootstraprc', 1);
-    do_link ($src, $dest, 'intro.bmp', 'intro.bmp', 1);
-    do_link ("$OOO_INSTALL", "$OOO_BUILD/desktop/$TARGET", 'share', 'share', 1);
-
+    print "pagein case:";
+    my $src  = "$OOO_BUILD/desktop/$TARGET/misc";
+    my $dest = "$OOO_INSTALL/" . $program_dir;
+    for my $c ('calc', 'draw', 'impress', 'writer', 'common') {
+	do_link ($src, $dest, "pagein-$c", "pagein-$c");
+    }
     print "\n";
 }
 
-my $a;
-my $usage = 0;
-for $a (@ARGV) {
+for my $a (@ARGV) {
 
 # options
-    if ($a =~ /--product/) {
-	$product = 1;
-    } elsif ($a =~ /--dry-run/) {
+    if ($a =~ /--dry-run/) {
         $dry_run = 1;
     } elsif (($a eq '--help') || ($a eq '-h')) {
 	$usage = 1;
@@ -325,7 +357,7 @@ if (!defined $OOO_BUILD && defined $ENV{SRC_ROOT}) {
 }
 
 if ($usage || !defined $OOO_INSTALL || !defined $OOO_BUILD) {
-    printf "Usage: linkoo </path/to/ooo/install> [</path/to/ooo/build/tree>] [--product] [--dry-run]\n";
+    printf "Usage: linkoo </path/to/ooo/install> [</path/to/ooo/build/tree>] [--dry-run]\n";
     exit (1);
 }
 
@@ -346,12 +378,16 @@ my $installed_files = build_installed_list ($OOO_INSTALL);
 scan_and_link_files ($OOO_BUILD, $installed_files, $TARGET);
 link_iso_res();
 link_types_rdb();
-link_soffice_bin_files();
-
-if (!-f "$OOO_INSTALL/" . $program_dir . "/ooenv") {
-    print "Creating '$OOO_INSTALL/", $program_dir, "/ooenv'\n";
-    open ($ooenv, ">$OOO_INSTALL/" . $program_dir . "/ooenv") || die "Can't open $OOO_INSTALL/" . $program_dir . "/ooenv: $!";
+link_oovbaapi_rdb();
+link_pagein_files();
+
+if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") {
+    my $ooenv;
+    print "Creating '$OOO_INSTALL/", $brand_program_dir, "/ooenv'\n";
+    open ($ooenv, ">$OOO_INSTALL/" . $brand_program_dir . "/ooenv") || die "Can't open $OOO_INSTALL/" . $brand_program_dir . "/ooenv: $!";
+    print $ooenv "thisdir=$OOO_INSTALL/" . $brand_program_dir . "/\n";
     print $ooenv $env_script;
+    print $ooenv "# testtool\nexport SRC_ROOT=$OOO_BUILD\n";
     close ($ooenv);
 }
 
diff --git a/solenv/bin/localize b/solenv/bin/localize
index ef5550e72e67..9504e8ee37ed 100755
--- a/solenv/bin/localize
+++ b/solenv/bin/localize
@@ -7,14 +7,9 @@ fi
 # localize.pl calls localize_sl in solver bin directory which depends on dynamic
 # libraries in solver lib directory but has no correct RPATH (or equivalent):
 if [ "${OS?}" = MACOSX ]; then
-    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
 else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
-fi
-
-if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
-    exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@"
-else
-    exec perl -w $SOLARVERSION/$INPATH/bin$UPDMINOREXT/localize.pl "$@"
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
 fi
 
+exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@"
diff --git a/solenv/bin/localize_sl b/solenv/bin/localize_sl
index af7f8351406c..d0db56084a19 100755
--- a/solenv/bin/localize_sl
+++ b/solenv/bin/localize_sl
@@ -5,14 +5,9 @@ exit 1
 fi
 
 if [ "${OS?}" = MACOSX ]; then
-    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
 else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
-fi
-
-if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
-    exec $SOLARVERSION/$INPATH/bin/localize_sl "$@"
-else
-    exec $SOLARVERSION/$INPATH/bin$UPDMINOREXT/localize_sl "$@"
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
 fi
 
+exec $SOLARVERSION/$INPATH/bin/localize_sl "$@"
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index d6eb83ff99ef..29bf64de2b6b 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -48,6 +48,7 @@ sub action($$$)
          'shl/BOXT/URELIB' => '@executable_path/urelibs',
          'shl/BOXT/OOO' => '@loader_path/../../../basis-link/program',
          'shl/NONE/URELIB' => '@__VIA_LIBRARY_PATH__',
+         'shl/OOO/NONE' => '@__VIA_LIBRARY_PATH__',
          'shl/NONE/OOO' => '@__VIA_LIBRARY_PATH__',
          'shl/NONE/NONE' => '@__VIA_LIBRARY_PATH__');
     my ($type, $loc1, $loc2) = @_;
@@ -111,6 +112,8 @@ foreach $file (@ARGV)
     {
         $change .= " -change $1 " . action($type, $loc, $2) . "$3"
             if m'^\s*(@_{50}([^/]+)(/.+)) \(compatibility version \d+\.\d+\.\d+, current version \d+\.\d+\.\d+\)\n$';
+        $change .= ' -change '.$1.' @loader_path/'.$2
+            if m'^\s*(/python-inst/(OOoPython.framework/Versions/[^/]+/OOoPython))';
     }
     close(IN);
     if ($change ne "")
diff --git a/solenv/bin/macosx-dylib-link-list.pl b/solenv/bin/macosx-dylib-link-list.pl
index 1554bbe56016..ab2279f62cd8 100644
--- a/solenv/bin/macosx-dylib-link-list.pl
+++ b/solenv/bin/macosx-dylib-link-list.pl
@@ -76,6 +76,7 @@ foreach $file (@todo)
         {
             my $full = $1;
             my $loc = locate($2);
+            $loc = locate($1) if $full =~ m'^\s*@loader_path/(OOoPython.framework/Versions/[^/]+/OOoPython)';
             if (defined $loc)
             {
                 handle($full, $loc) unless defined $done{$full};
diff --git a/solenv/bin/make_download.pl b/solenv/bin/make_download.pl
index dd492ea3bfa1..62d8888bc383 100644
--- a/solenv/bin/make_download.pl
+++ b/solenv/bin/make_download.pl
@@ -68,9 +68,6 @@ foreach my $infofilename ( @{$infofilelist} )
         installer::logger::print_message( "... WARNING: Signing only for Windows platforms active ...\n" );
     }
 
-    # installer::logger::include_header_into_logfile("Reading include pathes");
-    # installer::worker::collect_all_files_from_includepathes($followmeinfohash->{'includepatharray'});
-
     if (( $installer::globals::iswindowsbuild ) && ( $installer::globals::dosign ))
     {
         $followmeinfohash->{'finalinstalldir'} = installer::windows::sign::sign_install_set($followmeinfohash, $do_copy, $temppath);
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index c85aaffcde07..561dcef6d16c 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -44,11 +44,10 @@ use installer::exiter;
 use installer::files;
 use installer::followme;
 use installer::globals;
-use installer::javainstaller;
+use installer::helppack;
 use installer::languagepack;
 use installer::languages;
 use installer::logger;
-use installer::mail;
 use installer::packagelist;
 use installer::packagepool;
 use installer::parameter;
@@ -270,7 +269,6 @@ installer::simplepackage::check_simple_packager_project($allvariableshashref);
 ####################################################################
 
 installer::control::set_addchildprojects($allvariableshashref);
-installer::control::set_addjavainstaller($allvariableshashref);
 installer::control::set_addsystemintegration($allvariableshashref);
 
 ########################################################
@@ -435,8 +433,8 @@ $filesinproductarrayref = installer::scriptitems::remove_delete_only_files_from_
 if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles2.log", $filesinproductarrayref); }
 
 if (( ! $installer::globals::iswindowsbuild ) &&
-    ( ! $installer::globals::islinuxrpmbuild ) &&
-    ( ! $installer::globals::islinuxdebbuild ) &&
+    ( ! $installer::globals::isrpmbuild ) &&
+    ( ! $installer::globals::isdebbuild ) &&
     ( ! $installer::globals::issolarispkgbuild ) &&
     ( $installer::globals::packageformat ne "installed" ) &&
     ( $installer::globals::packageformat ne "dmg" ) &&
@@ -452,6 +450,12 @@ if (! $installer::globals::languagepack)
     if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles2b.log", $filesinproductarrayref); }
 }
 
+if (! $installer::globals::helppack)
+{
+    $filesinproductarrayref = installer::scriptitems::remove_Helppacklibraries_from_Installset($filesinproductarrayref);
+    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles2b2.log", $filesinproductarrayref); }
+}
+
 if (! $installer::globals::patch)
 {
     $filesinproductarrayref = installer::scriptitems::remove_patchonlyfiles_from_Installset($filesinproductarrayref);
@@ -482,6 +486,7 @@ if (( ! $allvariableshashref->{'XPDINSTALLER'} ) || ( ! $installer::globals::isx
 }
 
 if ( $installer::globals::languagepack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
+if ( $installer::globals::helppack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
 if ( $installer::globals::patch ) { installer::scriptitems::use_patch_copy_scpaction($scpactionsinproductarrayref); }
 if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions1b.log", $scpactionsinproductarrayref); }
 
@@ -501,9 +506,6 @@ installer::logger::print_message( "... analyzing unix links ... \n" );
 my $unixlinksinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "Unixlink");
 if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks1.log", $unixlinksinproductarrayref); }
 
-# $unixlinksinproductarrayref = installer::scriptitems::filter_layerlinks_from_unixlinks($unixlinksinproductarrayref);
-# if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks1b.log", $unixlinksinproductarrayref); }
-
 installer::logger::print_message( "... analyzing profile ... \n" );
 
 my $profilesinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "Profile");
@@ -643,6 +645,17 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
         else { $installer::globals::makedownload = 0; }
     }
 
+    if ( $installer::globals::helppack )
+    {
+        $installer::globals::addchildprojects = 0;
+        $installer::globals::addsystemintegration = 0;
+        $installer::globals::makejds = 0;
+        $installer::globals::addlicensefile = 0;
+
+        if ( $allvariableshashref->{'OPENSOURCE'} ) { $installer::globals::makedownload = 1; }
+        else { $installer::globals::makedownload = 0; }
+    }
+
     ############################################################
     # Beginning of language specific logging mechanism
     # Until now only global logging into default: logfile.txt
@@ -810,7 +823,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
         if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10c.log", $filesinproductlanguageresolvedarrayref); }
     }
 
-
     if ( ! $allvariableshashref->{'NO_README_IN_ROOTDIR'} )
     {
         $filesinproductlanguageresolvedarrayref = installer::scriptitems::add_License_Files_into_Installdir($filesinproductlanguageresolvedarrayref, $dirsinproductlanguageresolvedarrayref, $languagesarrayref);
@@ -909,9 +921,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
     ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref, $alldirectoryhash);
     if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist2.log", $directoriesforepmarrayref); }
 
-    # installer::sorter::sorting_array_of_hashes($directoriesforepmarrayref, "HostName");
-    # if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3.log", $directoriesforepmarrayref); }
-
     #########################################################
     # language dependent scpactions part
     #########################################################
@@ -984,7 +993,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
     my $profilesinproductlanguageresolvedarrayref;
     my $profileitemsinproductlanguageresolvedarrayref;
 
-    if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )) && (!($installer::globals::languagepack)))
+    if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )) && (!($installer::globals::languagepack)) && (!($installer::globals::helppack)))
     {
         installer::logger::print_message( "... creating profiles ...\n" );
 
@@ -1089,7 +1098,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
         installer::scriptitems::changing_name_of_language_dependent_keys($modulesinproductlanguageresolvedarrayref);
         if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes_modules($loggingdir . "modules3a.log", $modulesinproductlanguageresolvedarrayref); }
 
-        # installer::scriptitems::collect_language_specific_names($modulesinproductlanguageresolvedarrayref);
         installer::scriptitems::select_required_language_strings($modulesinproductlanguageresolvedarrayref);    # using english strings
 
     }
@@ -1126,6 +1134,35 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
 
     }
 
+    # Help pack projects can now start to select the required information
+    if ( $installer::globals::helppack )
+    {
+        $filesinproductlanguageresolvedarrayref = installer::helppack::select_help_items($filesinproductlanguageresolvedarrayref, $languagesarrayref, "File");
+        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles16b2.log", $filesinproductlanguageresolvedarrayref); }
+        $scpactionsinproductlanguageresolvedarrayref = installer::helppack::select_help_items($scpactionsinproductlanguageresolvedarrayref, $languagesarrayref, "ScpAction");
+        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions6b2.log", $scpactionsinproductlanguageresolvedarrayref); }
+        $linksinproductlanguageresolvedarrayref = installer::helppack::select_help_items($linksinproductlanguageresolvedarrayref, $languagesarrayref, "Shortcut");
+        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks8b2.log", $linksinproductlanguageresolvedarrayref); }
+        $unixlinksinproductlanguageresolvedarrayref = installer::helppack::select_help_items($unixlinksinproductlanguageresolvedarrayref, $languagesarrayref, "Unixlink");
+        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks5b2.log", $unixlinksinproductlanguageresolvedarrayref); }
+        @{$folderitemsinproductlanguageresolvedarrayref} = (); # no folderitems in helppacks
+
+        # Collecting the directories again, to include only the language specific directories
+        ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref);
+        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3ahelppack.log", $directoriesforepmarrayref); }
+        ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref, $alldirectoryhash);
+        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3bhelppack.log", $directoriesforepmarrayref); }
+        installer::sorter::sorting_array_of_hashes($directoriesforepmarrayref, "HostName");
+        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3chelppack.log", $directoriesforepmarrayref); }
+
+        if ( $installer::globals::iswindowsbuild )
+        {
+            $registryitemsinproductlanguageresolvedarrayref = installer::worker::select_helppack_items($registryitemsinproductlanguageresolvedarrayref, "RegistryItem");
+            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "registryitems3aa2.log", $registryitemsinproductlanguageresolvedarrayref); }
+        }
+
+    }
+
     # Collecting all files without flag PATCH (for maintenance reasons)
     if ( $installer::globals::patch ) { installer::worker::collect_all_files_without_patch_flag($filesinproductlanguageresolvedarrayref); }
 
@@ -1253,12 +1290,13 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
         # Creating directories
         ####################################################
 
+        if ( $allvariableshashref->{'OOODOWNLOADNAME'} ) { installer::download::set_download_filename($languagestringref, $allvariableshashref); }
+        else { installer::download::resolve_variables_in_downloadname($allvariableshashref, "", $languagestringref); }
+
         $installdir = installer::worker::create_installation_directory($shipinstalldir, $languagestringref, \$current_install_number);
 
         my $listfiledir = installer::systemactions::create_directories("listfile", $languagestringref);
         my $installlogdir = installer::systemactions::create_directory_next_to_directory($installdir, "log");
-        # installer::packagelist::add_defaultpathes_into_filescollector($filesinproductlanguageresolvedarrayref);
-        # my $installchecksumdir = installer::systemactions::create_directory_next_to_directory($installdir, "checksum");
 
         ####################################################
         # Reading for Solaris all package descriptions
@@ -1283,6 +1321,11 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
 
             if ( $installer::globals::languagepack ) { installer::languagepack::replace_languagestring_variable($onepackage, $languagestringref); }
 
+            # checking, if this is a help pack
+            # Creating help packs only, if $installer::globals::helppack is set. Parameter: -helppack
+
+            if ( $installer::globals::helppack ) { installer::helppack::replace_languagestring_variable($onepackage, $languagestringref); }
+
             my $onepackagename = $onepackage->{'module'};           # name of the top module (required)
 
             my $shellscriptsfilename = "";
@@ -1326,6 +1369,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
                 my $oldpackagename = $packagename;
                 $installer::globals::add_required_package = $oldpackagename;    # the link rpm requires the non-linked version
                 if ( $installer::globals::languagepack ) { $packagename = $packagename . "_u"; }
+                elsif ( $installer::globals::helppack ) { $packagename = $packagename . "_v"; } # wtf...
                 else { $packagename = $packagename . "u"; }
                 my $savestring = $oldpackagename . "\t" . $packagename;
                 push(@installer::globals::linkrpms, $savestring);
@@ -1347,6 +1391,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
 
             if (( $installer::globals::patch ) ||
                 ( $installer::globals::languagepack ) ||
+                ( $installer::globals::helppack ) ||
                 ( $installer::globals::packageformat eq "native" ) ||
                 ( $installer::globals::packageformat eq "portable" ) ||
                 ( $installer::globals::packageformat eq "osx" )) { $allvariableshashref->{'POOLPRODUCT'} = 0; }
@@ -1382,6 +1427,8 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
             {
                 $packagerootpath = $onepackage->{'destpath'};
                 installer::packagelist::resolve_packagevariables(\$packagerootpath, $allvariableshashref, 1);
+                # we put branding and common stuff into the same prefix on unixes => $packagerootpath must be the whole prefix, including the product name
+                if ($installer::globals::isunix) { $packagerootpath .= "/$allvariableshashref->{'UNIXBASISROOTNAME'}"; }
                 if ( $^O =~ /darwin/i ) { $packagerootpath =~ s/\/opt\//\/Applications\//; }
             }
             else
@@ -1445,7 +1492,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
             #################################################################
 
             # Linux Patch: The complete RPM has to be built, if one file in the RPM has the flag PATCH (also for DEBs)
-            if (( $installer::globals::patch ) && (( $installer::globals::islinuxrpmbuild ) || ( $installer::globals::islinuxdebbuild )))
+            if (( $installer::globals::patch ) && (( $installer::globals::isrpmbuild ) || ( $installer::globals::isdebbuild )))
             {
                 my $patchfiles = installer::worker::collect_all_items_with_special_flag($filesinpackage ,"PATCH");
                 if ( ! ( $#{$patchfiles} > -1 ))
@@ -1478,7 +1525,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
             {
                 # special handling for all RPMs in $installer::globals::linuxlinkrpms
 
-                # if (( $installer::globals::linuxlinkrpms =~ /\b$onepackagename\b/ ) || ( $installer::globals::languagepack ))
                 if ( $installer::globals::linuxlinkrpms =~ /\b$onepackagename\b/ )
                 {
                     my $run = 0;
@@ -1593,7 +1639,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
                 installer::epmfile::resolve_path_in_epm_list_before_packaging(\@epmfile, $completeepmfilename, "PRODUCTDIRECTORYNAME", $staticpath);
                 installer::epmfile::resolve_path_in_epm_list_before_packaging(\@epmfile, $completeepmfilename, "SOLSUREPACKAGEPREFIX", $allvariableshashref->{'SOLSUREPACKAGEPREFIX'});
                 installer::epmfile::resolve_path_in_epm_list_before_packaging(\@epmfile, $completeepmfilename, "UREPACKAGEPREFIX", $allvariableshashref->{'UREPACKAGEPREFIX'});
-                # installer::epmfile::resolve_path_in_epm_list_before_packaging(\@epmfile, $completeepmfilename, "BASISDIRECTORYVERSION", $allvariableshashref->{'OOOBASEVERSION'});
                 installer::files::save_file($completeepmfilename ,\@epmfile);
 
                 #######################################################
@@ -1651,7 +1696,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
                     # Solaris: Adding into the pkginfo file: BASEDIR=/opt
                     # Attention: Changing of the path can influence the shell scripts
 
-                    if (( $installer::globals::is_special_epm ) && ( ($installer::globals::islinuxrpmbuild) || ($installer::globals::issolarispkgbuild) ))  # special handling only for Linux RPMs and Solaris Packages
+                    if (( $installer::globals::is_special_epm ) && ( ($installer::globals::isrpmbuild) || ($installer::globals::issolarispkgbuild) ))   # special handling only for Linux RPMs and Solaris Packages
                     {
                         if ( $installer::globals::call_epm )    # only do something, if epm is really executed
                         {
@@ -1677,7 +1722,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
                             $installer::globals::postprocess_specialepm = 1;
 
                             # solaris patch not needed anymore
-                            # if (( $installer::globals::patch ) && ( $installer::globals::issolarisx86build )) { installer::worker::fix2_solaris_x86_patch($packagename, $installer::globals::epmoutpath); }
                         }
                     }
                     else    # this is the standard epm (not relocatable) or ( nonlinux and nonsolaris )
@@ -1693,7 +1737,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
 
                             if ( $installer::globals::call_epm ) { installer::epmfile::call_epm($epmexecutable, $completeepmfilename, $packagename, $includepatharrayref); }
 
-                            if (($installer::globals::islinuxrpmbuild) || ($installer::globals::issolarispkgbuild) || ($installer::globals::debian))
+                            if (($installer::globals::isrpmbuild) || ($installer::globals::issolarispkgbuild) || ($installer::globals::debian))
                             {
                                 $installer::globals::postprocess_standardepm = 1;
                             }
@@ -1716,7 +1760,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
 
             if ( $installer::globals::isxpdplatform )
             {
-                if (( ! $installer::globals::languagepack ) && ( ! $installer::globals::patch ))
+                if (( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ) && ( ! $installer::globals::patch ))
                 {
                     if (( $allvariableshashref->{'XPDINSTALLER'} ) && ( $installer::globals::call_epm != 0 ))
                     {
@@ -1747,7 +1791,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
             if ( $installer::globals::addsystemintegration ) { installer::epmfile::put_systemintegration_into_installset($installer::globals::epmoutpath, $includepatharrayref, $allvariableshashref, $modulesinproductarrayref); }
 
             # Adding license and readme into installation set
-            # if ($installer::globals::addlicensefile) { installer::epmfile::put_installsetfiles_into_installset($installer::globals::epmoutpath); }
             if ($installer::globals::addlicensefile) { installer::worker::put_scpactions_into_installset("."); }
 
             # Adding child projects to installation dynamically
@@ -1759,20 +1802,20 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
             # Creating installation set for Unix language packs, that are not part of multi lingual installation sets
             if ( ( $installer::globals::languagepack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::languagepack::build_installer_for_languagepack($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
 
+            # Creating installation set for Unix help packs, that are not part of multi lingual installation sets
+            if ( ( $installer::globals::helppack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::helppack::build_installer_for_helppack($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
+
             # Finalizing patch installation sets
             if (( $installer::globals::patch ) && ( $installer::globals::issolarispkgbuild )) { installer::epmfile::finalize_patch($installer::globals::epmoutpath, $allvariableshashref); }
-            if (( $installer::globals::patch ) && ( $installer::globals::islinuxrpmbuild )) { installer::epmfile::finalize_linux_patch($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref); }
+            if (( $installer::globals::patch ) && ( $installer::globals::isrpmbuild )) { installer::epmfile::finalize_linux_patch($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref); }
 
             # Copying the xpd installer into the installation set
             if (( $allvariableshashref->{'XPDINSTALLER'} ) && ( $installer::globals::isxpdplatform ) && ( $installer::globals::xpd_files_prepared ))
             {
                 installer::xpdinstaller::create_xpd_installer($installdir, $allvariableshashref, $languagestringref);
-                $installer::globals::addjavainstaller = 0;  # only one java installer possible
             }
 
-            # Copying the java installer into the installation set
             chdir($currentdir); # changing back into start directory
-            if ( $installer::globals::addjavainstaller ) { installer::javainstaller::create_java_installer($installdir, $installer::globals::epmoutpath, $languagestringref, $languagesarrayref, $allvariableshashref, $includepatharrayref, $modulesinproductarrayref); }
         }
 
         if ( $installer::globals::postprocess_standardepm )
@@ -1788,7 +1831,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
             if ( $installer::globals::addsystemintegration ) { installer::epmfile::put_systemintegration_into_installset($newepmdir, $includepatharrayref, $allvariableshashref, $modulesinproductarrayref); }
 
             # Adding license and readme into installation set
-            # if ($installer::globals::addlicensefile) { installer::epmfile::put_installsetfiles_into_installset($newepmdir); }
             if ($installer::globals::addlicensefile) { installer::worker::put_scpactions_into_installset("."); }
 
             # Adding license file into setup
@@ -1797,6 +1839,9 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
             # Creating installation set for Unix language packs, that are not part of multi lingual installation sets
             if ( ( $installer::globals::languagepack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::languagepack::build_installer_for_languagepack($newepmdir, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
 
+            # Creating installation set for Unix help packs, that are not part of multi lingual installation sets
+            if ( ( $installer::globals::helppack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::helppack::build_installer_for_helpepack($newepmdir, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
+
             chdir($currentdir); # changing back into start directory
         }
 
@@ -1894,13 +1939,11 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
          my $idtdirbase = installer::systemactions::create_directories("idt_files", $languagestringref);
          $installer::globals::infodirectory = installer::systemactions::create_directories("info_files", $languagestringref);
         my $installlogdir = installer::systemactions::create_directory_next_to_directory($installdir, "log");
-        # my $installchecksumdir = installer::systemactions::create_directory_next_to_directory($installdir, "checksum");
 
         #################################################################################
         # Preparing cabinet files from package definitions
         #################################################################################
 
-        # installer::packagelist::prepare_cabinet_files($packages, $allvariableshashref, $$languagestringref);
         installer::packagelist::prepare_cabinet_files($packages, $allvariableshashref);
         # printing packages content:
         installer::packagelist::log_cabinet_assignments();
@@ -1947,7 +1990,8 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
         if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles17c.log", $filesinproductlanguageresolvedarrayref); }
         if ( $installer::globals::updatedatabase ) { installer::windows::file::check_file_sequences($allupdatefileorder, $allupdatecomponentorder); }
 
-        installer::windows::directory::create_directory_table($directoriesforepmarrayref, $newidtdir, $allvariableshashref, $shortdirname, $loggingdir);
+        # Attention: The table "Director.idt" contains language specific strings -> parameter: $languagesarrayref !
+        installer::windows::directory::create_directory_table($directoriesforepmarrayref, $languagesarrayref, $newidtdir, $allvariableshashref, $shortdirname, $loggingdir);
         if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles18.log", $filesinproductlanguageresolvedarrayref); }
         if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt1.log", $directoriesforepmarrayref); }
 
@@ -1989,7 +2033,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
 
         installer::windows::upgrade::create_upgrade_table($newidtdir, $allvariableshashref);
 
-        if ( ! $installer::globals::languagepack )   # the following tables not for language packs
+        if (( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack )) # the following tables not for language packs or help packs
         {
             installer::windows::removefile::create_removefile_table($folderitemsinproductlanguageresolvedarrayref, $newidtdir);
 
@@ -2028,7 +2072,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
 
             installer::windows::idtglobal::prepare_language_idt_directory($languageidtdir, $newidtdir, $onelanguage, $filesinproductlanguageresolvedarrayref, \@iconfilecollector, $binarytablefiles, $allvariableshashref);
 
-            if ( ! $installer::globals::languagepack )
+            if ( ! $installer::globals::languagepack && ! $installer::globals::helppack )
             {
                 # For multilingual installation sets, the dialog for the language selection can now be prepared, with
                 # a checkbox for each available language. This has to happen before the following translation.
@@ -2140,7 +2184,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
 
             # setting patch codes to detect installed products
 
-            if (( $installer::globals::patch ) || ( $installer::globals::languagepack ) || ( $allvariableshashref->{'PDFCONVERTER'} )) { installer::windows::patch::update_patch_tables($languageidtdir, $allvariableshashref); }
+            if (( $installer::globals::patch ) || ( $installer::globals::languagepack ) || ( $installer::globals::helppack ) || ( $allvariableshashref->{'PDFCONVERTER'} )) { installer::windows::patch::update_patch_tables($languageidtdir, $allvariableshashref); }
 
             # Adding Windows Installer CustomActions
 
@@ -2172,7 +2216,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
                 # validating the database   # ToDo
 
                 my $languagefile = installer::files::read_file($installer::globals::idtlanguagepath . $installer::globals::separator . "SIS.mlf");
-                # my $languagefile = installer::files::read_file($installer::globals::idtlanguagepath . $installer::globals::separator . "SIS.ulf");
 
                 installer::windows::msiglobal::write_summary_into_msi_database($msifilename, $onelanguage, $languagefile, $allvariableshashref);
 
@@ -2215,7 +2258,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
 
         installer::logger::print_message( "... copying files into installation set ...\n" );
 
-        # installer::windows::msiglobal::copy_scpactions_into_installset($defaultlanguage, $installdir, $scpactionsinproductlanguageresolvedarrayref);
         installer::worker::put_scpactions_into_installset($installdir);
 
         # ... copying the setup.exe
@@ -2308,6 +2350,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
         my $create_download = 0;
         my $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "downloadname");
         if ( $installer::globals::languagepack ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "langpackdownloadname"); }
+        if ( $installer::globals::helppack ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "helppackdownloadname"); }
         if ( $installer::globals::patch ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "patchdownloadname"); }
 
         if ( $is_success ) { installer::followme::save_followme_info($finalinstalldir, $includepatharrayref, $allvariableshashref, $$downloadname, $languagestringref, $languagesarrayref, $current_install_number, $loggingdir, $installlogdir); }
diff --git a/solenv/bin/makemani.pl b/solenv/bin/makemani.pl
index cdebaab77617..7575d07e688b 100644
--- a/solenv/bin/makemani.pl
+++ b/solenv/bin/makemani.pl
@@ -50,7 +50,6 @@ sub wanted;
 sub wanted {
     /^.*\.xc(s|u)\z/s
     && ( push @findlist, $name );
-#    && ( push @findlist, $name ) && print("$name\n");
 }
 
 sub usage
diff --git a/solenv/bin/mapgen.pl b/solenv/bin/mapgen.pl
index 48c335c2adba..8a8677f12c7b 100644
--- a/solenv/bin/mapgen.pl
+++ b/solenv/bin/mapgen.pl
@@ -135,7 +135,10 @@ sub filter_symbols {
         $env_section = '1' and next if ((/^# SOLARIS #$/) && ($ENV{OS} eq 'SOLARIS'));
         $env_section = '1' and next if ((/^# LINUX #$/) && ($ENV{OS} eq 'LINUX'));
         $env_section = '1' and next if ((/^# FREEBSD #$/) && ($ENV{OS} eq 'FREEBSD'));
-        last if ($env_section && ((/^# SOLARIS #$/) || (/^# FREEBSD #$/) || (/^# LINUX #$/)));
+        $env_section = '1' and next if ((/^# NETBSD #$/) && ($ENV{OS} eq 'NETBSD'));
+        $env_section = '1' and next if ((/^# OPENBSD #$/) && ($ENV{OS} eq 'OPENBSD'));
+        $env_section = '1' and next if ((/^# DRAGONFLY #$/) && ($ENV{OS} eq 'DRAGONFLY'));
+        last if ($env_section && ((/^# SOLARIS #$/) || (/^# FREEBSD #$/) || (/^# LINUX #$/) || (/^# NETBSD #$/) || (/^# OPENBSD #$/) (/^# DRAGONFLY #$/)));
         next if (!$_ || /^#/);
         push(@filters, $_);
     };
diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh
new file mode 100755
index 000000000000..3d6ba295c893
--- /dev/null
+++ b/solenv/bin/mkdocs.sh
@@ -0,0 +1,130 @@
+#!/bin/bash
+#
+# Doxygen Doc generation
+#
+
+# binaries that we need
+which doxygen > /dev/null 2>&1 || {
+    echo "You need doxygen for doc generation"
+    exit 1
+}
+which dot > /dev/null 2>&1 || {
+    echo "You need the graphviz tools to create the nice inheritance graphs"
+    exit 1
+}
+
+# otherwise, aliases are not expanded below
+shopt -s expand_aliases
+
+# Title of the documentation
+DOXYGEN_PROJECT_PREFIX="LibreOffice"
+
+# suck setup
+BINDIR=`dirname $0`
+. $BINDIR/setup
+
+. ./*.Set.sh
+
+# get list of modules in build order - bah, blows RAM & disk, static list below
+INPUT_PROJECTS="o3tl basegfx basebmp comphelper svl vcl canvas cppcanvas oox svtools goodies drawinglayer xmloff slideshow sfx2 editeng svx cui chart2 dbaccess sd starmath sc sw"
+
+# output directory for generated documentation
+BASE_OUTPUT="$1"
+mkdir -p "$BASE_OUTPUT" || {
+    echo "Cannot create $BASE_OUTPUT"
+    exit 1
+}
+
+# paths for binary and configuration file
+BASE_PATH=`pwd`
+DOXYGEN_CFG="$2"
+if test ! -f "$DOXYGEN_CFG"; then
+    echo "doxygen.cfg not found"
+    exit 1
+fi
+
+# strip -I. and bin -I prefix; exlude system headers
+DOXYGEN_INCLUDE_PATH=`echo $SOLARINC | sed -e ' s/-I\.//'g | sed -e ' s/ -I/ /'g | sed -e ' s|/usr/[^ ]*| |g'`
+
+# setup version string
+DOXYGEN_VERSION="$GITTAG"
+
+
+###################################################
+#
+# Generate docs
+#
+###################################################
+
+# cleanup
+rm -rf $BASE_OUTPUT/*
+
+# make the stuff world-readable
+umask 022
+
+# generate docs
+DOXYGEN_REF_TAGFILES=""
+for PROJECT in $INPUT_PROJECTS;
+do
+  # avoid processing of full project subdirs, only add source and inc
+  DOXYGEN_INPUT=`printf "%s" "$PROJECT/source $PROJECT/inc "`
+
+  DOXYGEN_OUTPUT="$BASE_OUTPUT/$PROJECT"
+  DOXYGEN_OUR_TAGFILE="$DOXYGEN_OUTPUT/$PROJECT.tags"
+  DOXYGEN_PROJECTNAME="$DOXYGEN_PROJECT_PREFIX Module $PROJECT"
+
+  # export variables referenced in doxygen config file
+  export DOXYGEN_INPUT
+  export DOXYGEN_OUTPUT
+  export DOXYGEN_INCLUDE_PATH
+  export DOXYGEN_VERSION
+  export DOXYGEN_OUR_TAGFILE
+  export DOXYGEN_REF_TAGFILES
+  export DOXYGEN_PROJECTNAME
+
+  # debug
+  echo "Calling $DOXYGEN_PATH/doxygen $DOXYGEN_CFG with"
+  echo "Input:      $DOXYGEN_INPUT"
+  echo "Output:     $DOXYGEN_OUTPUT"
+  echo "Include:    $DOXYGEN_INCLUDE_PATH"
+  echo "Version:    $DOXYGEN_VERSION"
+  echo "Tagfile:    $DOXYGEN_OUR_TAGFILE"
+  echo "Ref-Tags:   $DOXYGEN_REF_TAGFILES"
+  echo "Title:      $DOXYGEN_PROJECTNAME"
+
+  nice -15 doxygen "$DOXYGEN_CFG"
+
+  # setup referenced tagfiles for next round
+  DOXYGEN_REF_TAGFILES="$DOXYGEN_REF_TAGFILES $DOXYGEN_OUR_TAGFILE=$BASE_URL/$PROJECT/html"
+done
+
+# generate entry page
+cat - > $BASE_OUTPUT/index.html <<EOF
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+    <head>
+        <title>LibreOffice Source Code Documentation (fragmentary)</title>
+    </head>
+    <body>
+        <h1>LibreOffice Source Code Documentation (fragmentary)</h1>
+        <ul>
+EOF
+
+for PROJECT in $INPUT_PROJECTS;
+do
+  echo "<li><a href=\"$PROJECT/html/classes.html\">$PROJECT</a></li>" >> $BASE_OUTPUT/index.html
+done
+
+cat - >> $BASE_OUTPUT/index.html <<EOF
+        </ul>
+        <p>Last updated:
+EOF
+LANG= date >> $BASE_OUTPUT/index.html
+
+cat - >> $BASE_OUTPUT/index.html <<EOF
+        </p>
+    </body>
+</html>
+EOF
+
+## done
diff --git a/solenv/bin/mkout.pl b/solenv/bin/mkout.pl
index 4839b8525bb9..9df626b63568 100755
--- a/solenv/bin/mkout.pl
+++ b/solenv/bin/mkout.pl
@@ -40,12 +40,6 @@ use File::Path;
 
 ( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
 
-$id_str = ' $Revision: 1.8 $ ';
-$id_str =~ /Revision:\s+(\S+)\s+\$/
-  ? ($script_rev = $1) : ($script_rev = "-");
-
-print "$script_name -- version: $script_rev\n";
-
 #### globals ####
 
 $is_debug   = 0;
diff --git a/solenv/bin/modules/CreatePDBRelocators.pm b/solenv/bin/modules/CreatePDBRelocators.pm
index 753075a2bfea..fc488ca3b037 100644
--- a/solenv/bin/modules/CreatePDBRelocators.pm
+++ b/solenv/bin/modules/CreatePDBRelocators.pm
@@ -76,11 +76,6 @@ sub new
     }
     my $SourceConfigObj = SourceConfig->new();
     @repos = $SourceConfigObj->get_repositories();
-    if ( defined $ENV{UPDMINOREXT} ) {
-        foreach my $onedir ( @repos ) {
-            push( @basedirs, $onedir.$ENV{UPDMINOREXT} );
-        }
-    }
     # basdirs is repositories (dmake) + workdir (gnu make)
     push(@basedirs, $relworkdir);
     if (!scalar @basedirs) {
diff --git a/solenv/bin/modules/Cws.pm b/solenv/bin/modules/Cws.pm
deleted file mode 100755
index 6948c21d554e..000000000000
--- a/solenv/bin/modules/Cws.pm
+++ /dev/null
@@ -1,2153 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# Cws.pm - package for accessing/manipulating child workspaces
-#
-
-# TODO: needs some cleanup
-
-package Cws;
-use strict;
-
-use Eis;
-use CwsConfig;
-use Carp;
-use URI::Escape;
-
-my $config = CwsConfig::get_config();
-
-##### class data #####
-
-my %CwsClassData = (
-    # EIS database connectivity
-    EIS_URI        => 'urn:ChildWorkspaceDataService',
-    EIS_PROXY_LIST => $config->cws_db_url_list_ref(),
-    NET_PROXY      => $config->net_proxy(),
-    EIS            => undef
-);
-
-##### ctor #####
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    # instance data
-    # initialize CWS name from environment
-    $self->{CHILD}        = undef;    # name of child workspace
-    $self->{MASTER}       = undef;    # name of master workspace
-    $self->{EIS_ID}       = undef;    # id of child workspace in EIS
-    $self->{FILES}        = undef;    # list of files registered with child
-                                      # any file can be registered multiple times
-    $self->{PATCH_FILES}  = undef     # list of product patch files registered with
-                                      # child, each file can be added only once
-    $self->{MILESTONE}    = undef;    # master milestone to which child is related
-    $self->{MODULES}      = undef;    # list of modules belonging to child
-    $self->{INCOMPATIBLE_MODULES}      = undef;    # list of modules belonging to child
-    $self->{NEW_MODULES}      = undef; # list of public new modules belonging to child
-    $self->{NEW_MODULES_PRIV}      = undef; # list of private new modules belonging to child
-    $self->{TASKIDS}      = undef;    # list of tasks registered with child
-    $self->{_CACHED_TAGS} = undef;    # list of cached tags (tags are looked up frequently)
-    bless($self, $class);
-    return $self;
-}
-
-#### methods to access instance data ####
-
-# Get the EIS ID for child workspace,
-# return value: undef => not yet asked EIS for ID
-#                        or connection failed
-#               0     => queried EIS but didn't find such
-#                        a child workspace for this master
-# silently ignore any parameter, only the EIS database,
-# hands out EIS IDs.
-sub eis_id
-{
-    my $self = shift;
-    if ( !defined($self->{EIS_ID} ) ) {
-            $self->{EIS_ID} = $self->get_eis_id();
-    }
-    return $self->{EIS_ID};
-}
-
-# Generate remaining instance data accessor methods;
-# if this looks strange see 'perldoc perltootc'
-
-# Accessor methods for single value instance data
-for my $datum (qw(master milestone)) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        my $ucdatum = uc($datum);
-        if ( @_ ) {
-            # set item in database
-            my $item = shift;
-            # if we already have a valid EIS registered CWS then reset EIS value
-            # otherwise just set member to the given value
-            if ( !$self->{uc($datum)} # keep order of evaluation
-                || !$self->eis_id()
-                || $self->set_item_in_eis($datum, $item) )
-            {
-               $self->{uc($datum)} = $item;
-
-            }
-        }
-        else {
-            if ( !defined($self->{$ucdatum} ) ) {
-                # fetch item from database
-                $self->{$ucdatum} = $self->fetch_item_from_eis($datum);
-            }
-        }
-        return $self->{uc($datum)};
-    }
-}
-
-# Accessor methods for instance data consisting of item lists
-# like modules and taskids
-for my $datum (qw(files patch_files modules incompatible_modules new_modules new_modules_priv taskids)) {
-    no strict "refs";
-    *$datum = sub {
-        # get current item list
-        # fetch list from EIS database if called the first time
-        my $self = shift;
-        my $ucdatum = uc($datum);
-        if ( !defined($self->{$ucdatum}) ) {
-            # fetch item list from databse
-            $self->{$ucdatum} = $self->fetch_items_from_eis($datum);
-            return undef if !defined($self->{$ucdatum});
-        }
-        return wantarray ? @{$self->{$ucdatum}} : $self->{$ucdatum}
-    }
-}
-
-for my $datum (qw(child)) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        $self->{uc($datum)} = shift if @_;
-        return $self->{uc($datum)};
-    }
-}
-
-
-#### additional public methods ####
-
-# For resync: Sets master and milestone simultaneously
-# In case of a cross master resync it does not make sense to
-# change both items separately
-sub set_master_and_milestone
-{
-    my $self      = shift;
-    my $master    = shift or return undef;
-    my $milestone = shift or return undef;
-
-    # if we do not yet have a valid EIS registered CWS use the above more basic methods
-    if ( !$self->master()
-         || !$self->milestone()
-         || !$self->eis_id() )
-    {
-        $self->master($master);
-        $self->milestone($milestone);
-    } else {
-        if ( $self->set_master_and_milestone_in_eis($master, $milestone) ) {
-            $self->{'MASTER'} = $self->fetch_item_from_eis('master');
-            $self->{'MILESTONE'} = $self->fetch_item_from_eis('milestone');
-        }
-    }
-    my @retarray = ($self->{'MASTER'}, $self->{'MILESTONE'});
-    return wantarray ? @retarray : \@retarray;
-}
-
-# Query if CWS name is still available. Does not yet register
-# anything with EIS.
-sub is_cws_name_available
-{
-    my $self     = shift;
-
-    my $is_available = $self->is_cws_name_available_in_eis();
-    return $is_available;
-}
-
-# Register new child workspace with the EIS database.
-sub register
-{
-    my $self     = shift;
-    my $vcsid    = shift;
-    my $location = shift;
-
-    my $child_id = $self->register_child_with_eis($vcsid, $location);
-    return $child_id;
-}
-
-# Promote a child workspace with status 'planned' to a full CWS
-sub promote
-{
-    my $self     = shift;
-    my $vcsid    = shift;
-    my $location = shift;
-
-    my $rc = $self->promote_child_in_eis($vcsid, $location);
-    return $rc;
-}
-
-# New style add_module method. Takes an additional bool indicating if
-# a module is public or private. Obsoletes add_modules()
-sub add_module
-{
-    my $self   = shift;
-    my $module = shift;
-    my $public = shift;
-
-    my $items_ref =  $self->add_items('modules', $public, $module);
-    if (defined ($items_ref->[0]) &&  ($items_ref->[0] eq $module)) {
-        return 1;  # module has been added
-    }
-    elsif ( defined($items_ref) ) {
-        return 0;  # module was already add
-    }
-    return undef;  # something went wrong
-}
-
-# Add module to modules list.
-sub add_modules
-{
-    my $self   = shift;
-
-    my $items_ref =  $self->add_items('modules', undef, @_);
-    return undef unless defined($items_ref);
-    return wantarray ? @{$items_ref} : $items_ref;
-}
-
-# Add tasksids to taskids list.
-sub add_taskids
-{
-    my $self   = shift;
-    my $vcsid  = shift;
-
-    my $items_ref = $self->add_items('taskids', $vcsid, @_);
-    return undef unless defined($items_ref);
-    return wantarray ? @{$items_ref} : $items_ref;
-}
-
-# Add a file to the files list.
-sub add_file
-{
-    my $self         = shift;
-    my $module       = shift;
-    my $file         = shift;
-    my $revision     = shift;
-    my $authors_ref  = shift;
-    my $taskids_ref  = shift;
-    my $archive_path = shift;
-
-    my $files_ref = $self->files();
-
-    if ( $self->add_file_to_eis($module, $file, $revision,
-            $authors_ref, $taskids_ref, $archive_path) )
-    {
-        push(@{$files_ref}, $file);
-        return 1;
-    }
-    return 0;
-}
-
-# Add a file to the patch file list.
-sub add_patch_file
-{
-    my $self         = shift;
-    my $file         = shift;
-
-    my $patch_files_ref = $self->patch_files();
-
-    foreach (@{$patch_files_ref}) {
-        return 0 if $file eq $_;
-    }
-
-    if ( $self->add_patch_file_to_eis($file) )
-    {
-        push(@{$patch_files_ref}, $file);
-        return 1;
-    }
-    return 0;
-}
-
-#
-# Procedure retrieves the workspace which
-# is based on cvs head (not branch)
-#
-sub get_cvs_head {
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->getCVSHead() };
-    if ( $@ ) {
-        carp("ERROR: get_eis_id(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-};
-
-#### public class methods ####
-
-sub get_master_tag {
-    my ($self, $master, $milestone) = @_;
-    $master = $self->master() if (!defined $master);
-    $milestone = $self->milestone() if (!defined $milestone);
-    return uc($master) . '_' . lc($milestone);
-};
-
-sub get_master_branch_tag {
-    my ($self, $master) = @_;
-    $master = $self->master() if (!defined $master);
-    # check in environment if master is on the the HEAD branch
-    my $cvs_head = get_cvs_head();
-    if ( $master eq $cvs_head ) {
-        return undef;
-    }
-    else {
-        return 'mws_' . lc($master);
-    }
-};
-
-sub get_mws {
-    my $self = shift;
-    my $eis = Cws::eis();
-    my $masters;
-    my $child  = Eis::to_string($self->child());
-    eval { $masters = $eis->getMastersForCWS($child) };
-    if ( $@ ) {
-        carp("ERROR: get_eis_id(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $$masters[0];
-};
-
-# Returns the branch and root tags for child workspace.
-sub get_tags
-{
-    my $self = shift;
-
-    # look up if tags have already been retrieved
-    if ( defined($self->{_CACHED_TAGS}) ) {
-        return @{$self->{_CACHED_TAGS}};
-    }
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $childws = $self->child();
-    # check if child workspace is a clone,
-    if ( $childws =~ /(\w+)_[[:upper:]]{3}\d{3}/ ) {
-        $childws = $1;
-    }
-
-    # check in environment if master is on the the HEAD branch
-    my $cvs_head = get_cvs_head();
-    my $current_master = $self->master();
-    my $creation_master = $self->get_creation_master();
-    if ( !$creation_master ) {
-        carp("ERROR: Can't determine creation MWS.\n");
-        return undef;
-    }
-    my $milestone = $self->milestone();
-
-    my $master_branch_tag
-        = (lc($current_master) eq lc($cvs_head)) ? '' : 'mws_' . lc($current_master);
-    my $cws_branch_tag = 'cws_' . lc($creation_master) . '_' . lc($childws);
-    my $cws_root_tag   = uc($cws_branch_tag) . "_ANCHOR";
-    my $master_milestone_tag = uc($current_master) . "_" . $milestone;
-
-    $self->{_CACHED_TAGS} = [$master_branch_tag, $cws_branch_tag, $cws_root_tag, $master_milestone_tag];
-    return @{$self->{_CACHED_TAGS}};
-}
-
-# Get childworkspace owner
-sub get_owner
-{
-    my $self = shift;
-
-    return $self->get_owner_from_eis();
-}
-
-# get childworkspace qarep
-sub get_qarep
-{
-    my $self = shift;
-
-    return $self->get_qarep_from_eis();
-}
-
-# store an Attachment to a given CWS
-sub save_attachment
-{
-    my $self = shift;
-    my $name = shift;
-    my $mediatype = shift;
-    my $data = shift;
-
-    return $self->save_attachment_in_eis($name, $mediatype, $data);
-}
-
-# Get child workspace approval status,
-# return values can be:
-# 'planned', 'new', 'nominated', 'integrated'
-# and undef in case of error.
-sub get_approval
-{
-    my $self = shift;
-
-    return $self->get_status_from_eis();
-}
-
-# Set child workspace approval status
-# to 'integrated'. Return true if successful
-# or undef in case of error
-sub set_integrated
-{
-    my $self = shift;
-
-    return $self->set_status_in_eis();
-}
-
-# Set child workspace integration milestone
-# Return true if successful or undef in case of error
-sub set_integration_milestone
-{
-    my $self      = shift;
-    my $milestone = shift;
-    my $buildid   = shift;
-
-    return $self->set_integration_milestone_in_eis($milestone, $buildid);
-}
-
-# Get the MWS on which a CWS was created
-sub get_creation_master
-{
-    my $self = shift;
-
-    return $self->get_creation_master_from_eis();
-}
-
-# Get the 'public' flag indicating whether a CWS is visible on OOo
-sub get_public_flag
-{
-    my $self = shift;
-
-    return $self->get_public_flag_from_eis();
-}
-
-
-# Get the 'publicmaster' flag indicating whether a MWS is visible on OOo
-sub get_publicmaster_flag
-{
-    my $self = shift;
-
-    return $self->get_publicmaster_flag_from_eis();
-}
-
-
-sub get_subversion_flag {
-
-    my $self      = shift;
-
-    return $self->get_subversion_flag_from_eis();
-}
-
-sub set_subversion_flag {
-
-    my $self      = shift;
-    my $value     = shift;
-
-    return $self->set_subversion_flag_in_eis($value);
-}
-
-sub get_scm {
-    my $self  = shift;
-
-    return $self->get_scm_from_eis();
-}
-
-sub set_scm {
-    my $self     = shift;
-    my $scm_name = shift;
-
-    return $self->set_scm_in_eis($scm_name);
-}
-
-
-# Check if milestone exists
-sub is_milestone
-{
-    my $self      = shift;
-    my $master    = shift;
-    my $milestone = shift;
-
-    return $self->is_milestone_registered_with_eis($master, $milestone);
-}
-
-# Check if this cws contains new ui
-sub is_uirelevant
-{
-    my $self      = shift;
-
-    return $self->is_uirelevant_from_eis();
-}
-
-# Check if this cws contains new online help
-sub is_helprelevant
-{
-    my $self      = shift;
-
-    return $self->is_helprelevant_from_eis();
-}
-
-# Set the l10n status
-sub set_l10n_status
-{
-    my $self        = shift;
-    my $status      = shift;
-
-    return $self->set_l10n_status_in_eis( $status );
-}
-
-# Get the l10n status
-sub get_l10n_status
-{
-    my $self        = shift;
-
-    return $self->get_l10n_status_from_eis();
-}
-sub set_word_count
-{
-    my $self        = shift;
-    my $language    = shift;
-    my $wordcount   = shift;
-
-    return $self->set_word_count_in_eis( $language , $wordcount );
-}
-
-
-# Get target release for CWS
-sub get_release
-{
-    my $self        = shift;
-
-    return $self->get_release_from_eis();
-}
-
-# Get due date
-sub get_due_date
-{
-    my $self        = shift;
-
-    return $self->get_due_date_from_eis();
-}
-
-# Get due date QA
-sub get_due_date_qa
-{
-    my $self        = shift;
-
-    return $self->get_due_date_qa_from_eis();
-}
-
-# Query master milestone combination for being used by an
-# active CWS
-sub is_milestone_used
-{
-    my $self      = shift;
-    my $master    = shift;
-    my $milestone = shift;
-
-    return $self->get_is_milestone_used_from_eis($master, $milestone);
-}
-
-# Set current milestone for MWS.
-sub set_current_milestone
-{
-    my $self      = shift;
-    my $master    = shift;
-    my $milestone = shift;
-
-    return $self->set_current_milestone_in_eis($master, $milestone);
-}
-
-# Get current milestone for MWS.
-sub get_current_milestone
-{
-    my $self      = shift;
-    my $master    = shift;
-
-    return $self->get_current_milestone_from_eis($master);
-}
-
-sub get_milestone_integrated
-{
-    my $self      = shift;
-
-    return $self->get_milestone_integrated_from_eis();
-}
-
-# Get masters
-sub get_masters
-{
-
-    my $self      = shift;
-
-    return $self->get_masters_from_eis();
-}
-
-# Get milestones for MWS.
-sub get_milestones
-{
-    my $self      = shift;
-    my $master    = shift;
-
-    return $self->get_milestones_from_eis($master);
-}
-# get build string for CWS
-
-sub get_build
-{
-    my $self      = shift;
-    my $master = $self->master();
-    my $milestone = $self->milestone();
-    if ( ! defined($milestone) ) {
-        return undef;
-    }
-    my $bid=$self->get_buildid($master,$milestone);
-    if ( ! defined($bid) ) {
-        return undef;
-    }
-    return $self->expand_buildid($bid);
-}
-
-
-
-# expand build for given cwsname
-sub expand_buildid
-{
-    my $self      = shift;
-    my $bid    = shift;
-    return $self->expand_buildid_in_eis($bid);
-}
-
-
-# Set BuildID of milestone
-sub set_milestone_buildid
-{
-    my $self         = shift;
-    my $master      = shift;
-    my $milestone   = shift;
-    my $buildid     = shift;
-
-    return $self->set_milestone_buildid_in_eis($master, $milestone, $buildid);
-}
-
-# Declare milestone 'removed'
-# This triggers EIS to send emails to all (SO-internal) CWS owners
-# with living CWSs based on that milestone.
-sub milestone_removed
-{
-    my $self      = shift;
-    my $master    = shift;
-    my $milestone = shift;
-
-    return $self->set_milestone_removed_in_eis($master, $milestone);
-}
-
-
-# Get all child workspaces which have been integrated on a
-# given master and milestone.
-sub get_integrated_cws
-{
-    my $self      = shift;
-    my $master    = shift;
-    my $milestone = shift;
-
-    my $childworkspaces_arrref = $self->get_childworkspaces_for_milestone($master, $milestone);
-    if ( !$childworkspaces_arrref ) {
-        $childworkspaces_arrref = [];
-    }
-    return wantarray ? @$childworkspaces_arrref : $childworkspaces_arrref;
-}
-
-
-# Get builid for given master and milestone.
-sub get_buildid
-{
-    my $self      = shift;
-    my $master    = shift;
-    my $milestone = shift;
-
-    return $self->get_buildid_for_milestone($master, $milestone);
-}
-
-#
-# Get all cws' with a status passed
-#
-sub get_cws_with_state
-{
-    my $self = shift;
-    my $mws = shift;
-    my $status = shift;
-
-    return wantarray ? @{$self->get_cws_with_state_from_eis($mws, $status)}
-                    :   $self->get_cws_with_state_from_eis($mws, $status);
-}
-
-sub get_task_prio_cws
-{
-    my $self        = shift;
-    my $ref_taskids = shift;
-    return @{$self->get_task_prios_of_tasks($ref_taskids)};
-}
-
-# Check is CWS is cloneable for specified master
-sub is_cws_cloneable
-{
-    my $self      = shift;
-    my $master    = shift;
-
-    return $self->get_is_cws_cloneable_from_eis($master);
-}
-
-# Clone CWS for specified master
-sub clone_cws
-{
-    my $self      = shift;
-    my $master    = shift;
-
-    return $self->clone_cws_in_eis($master);
-}
-
-sub set_log_entry
-{
-    my $self        = shift;
-    my $commandline = shift;
-    my $vcsid       = shift;
-    my $start       = shift;
-    my $stop        = shift;
-    my $comment     = shift;
-    return $self->set_log_entry_in_eis($commandline, $vcsid, $start, $stop, $comment);
-}
-
-sub set_log_entry_extended
-{
-    my $self        = shift;
-    my $commandname = shift;
-    my $parameter   = shift;
-    my $vcsid       = shift;
-    my $start       = shift;
-    my $stop        = shift;
-    my $comment     = shift;
-    my $mastername  = shift;
-    my $childname   = shift;
-#set_log_entry_extended_in_eis($commandname, $parameter, $vcsid, $start, $stop, $comment, $mastername, $childname);
-    return $self->set_log_entry_extended_in_eis($commandname, $parameter, $vcsid, $start, $stop, $comment, $mastername, $childname);
-}
-
-
-#### private ####
-
-# class data accessor methods
-sub eis
-{
-    shift; # ignore calling class/object
-    $CwsClassData{EIS} = shift if @_;
-    if ( !defined($CwsClassData{EIS}) ) {
-        $CwsClassData{EIS} = init_eis_connector();
-    }
-    return $CwsClassData{EIS};
-}
-
-# generate remaining class data accessor methods
-# if this looks strange see 'perldoc perltootc'
-for my $datum (qw(eis_uri eis_proxy_list net_proxy)) {
-    no strict "refs";
-    *$datum = sub {
-        shift; # ignore calling class/object
-        return $CwsClassData{uc($datum)};
-    }
-}
-
-#### helper methods ####
-
-# instance methods
-
-# Add item to items list,
-# update eis database,
-# returns a list of newly added items,
-# specifying an existing item is not an
-# error, but it want appear in the return list.
-sub add_items
-{
-    my $self          = shift;
-    my $type          = shift;
-    my $optional_data = shift;
-
-    my $items_ref;
-    if ( $type eq 'modules' ) {
-        $items_ref   = $self->modules();
-    }
-    elsif ( $type eq 'taskids' ) {
-        $items_ref   = $self->taskids();
-    }
-    else {
-        # fall through, can't happen
-        carp("ERROR: wrong item type\n");
-        return undef;
-    }
-
-    my $item;
-    my @new_items = ();
-    return undef if !defined($items_ref);
-    # find which items which are not already in items list
-    ITEM: while ( $item = shift ) {
-        foreach ( @{$items_ref} ) {
-            next ITEM if $_ eq $item;
-        }
-        push(@new_items, $item);
-    }
-    if ( $#new_items > -1 ) {
-        # add items to database
-        if ( $self->add_items_to_eis($type, $optional_data, \@new_items) ) {
-            push(@{$items_ref}, @new_items);
-        }
-        else {
-            # something went wrong
-            return undef;
-        }
-    }
-    return \@new_items;
-}
-
-# Get EIS id for workspace from EIS database
-sub get_eis_id
-{
-    my $self = shift;
-    my $eis = Cws::eis();
-
-    # It's not an error if one of these is unset, so don't carp().
-    if ( !$self->master() || !$self->child() ) {
-        return undef;
-    }
-
-    my $master = Eis::to_string($self->master());
-    my $child  = Eis::to_string($self->child());
-
-    my $result;
-    eval { $result = int($eis->getChildWorkspaceId($master, $child)) };
-    if ( $@ ) {
-        carp("ERROR: get_eis_id(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-sub fetch_item_from_eis
-{
-    my $self = shift;
-    my $type = shift;
-
-    my $eis = Cws::eis();
-    my $id = $self->eis_id();
-
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $result;
-    if ( $type eq 'milestone' ) {
-        eval { $result = $eis->getMilestone($id) };
-    }
-    elsif ( $type eq 'master' ) {
-        # master can't be queried from the EIS database,
-        # just return what already in member
-        return $self->{MASTER}
-    }
-    else {
-        # fall through, can't happen
-        carp("ERROR: wrong item type\n");
-        return undef;
-    }
-    if ( $@ ) {
-        carp("ERROR: fetch_item(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-sub set_item_in_eis
-{
-    my $self     = shift;
-    my $type     = shift;
-    my $item     = shift;
-
-    my $eis = Cws::eis();
-    my $id = $self->eis_id();
-
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    # make certain that the item is a string, otherwise
-    # autotyping will occasionally choose the wrong type
-    $item = Eis::to_string($item);
-
-    my $result;
-    if ( $type eq 'milestone' ) {
-        # this operation invalidates the cached tags list
-        $self->{_CACHED_TAGS} = undef;
-        eval { $result = $eis->setMilestone($id, $item) };
-    }
-    elsif ( $type eq 'master' ) {
-        # this operation invalidates the cached tags list
-        $self->{_CACHED_TAGS} = undef;
-        eval { $result = $eis->setMasterWorkspace($id, $item) };
-    }
-    else {
-        # fall through, can't happen
-        carp("ERROR: wrong item type\n");
-        return 0;
-    }
-
-    if ( $@ ) {
-        carp("ERROR: set_item(): EIS database transaction failed. Reason:\n$@\n");
-        return undef;
-    }
-    return 1 if $result;
-    return 0;
-}
-
-sub set_master_and_milestone_in_eis
-{
-    my $self      = shift;
-    my $master    = shift;
-    my $milestone = shift;
-
-    my $eis = Cws::eis();
-    my $id = $self->eis_id();
-
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    # make certain that the item is a string, otherwise
-    # autotyping will occasionally choose the wrong type
-    $master = Eis::to_string($master);
-    $milestone = Eis::to_string($milestone);
-
-    my $result;
-    # this operation invalidates the cached tags list
-    $self->{_CACHED_TAGS} = undef;
-    eval { $result = $eis->setMasterWorkspaceAndMilestone($id, $master, $milestone) };
-
-    if ( $@ ) {
-        carp("ERROR: set_master_and_milestone(): EIS database transaction failed. Reason:\n$@\n");
-        return undef;
-    }
-    return 1 if $result;
-    return 0;
-}
-
-sub fetch_items_from_eis
-{
-    my $self = shift;
-    my $type = shift;
-
-    my $eis = Cws::eis();
-    my $id = $self->eis_id();
-
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $result;
-    if ( $type eq 'modules' ) {
-        eval { $result = $eis->getModules($id) };
-    }
-    elsif ( $type eq 'incompatible_modules' ) {
-        eval { $result = $eis->getIncompatibleModules($id) };
-    }
-    elsif ( $type eq 'new_modules' ) {
-        eval { $result = $eis->getNewModules($id) };
-    }
-    elsif ( $type eq 'new_modules_priv' ) {
-        eval { $result = $eis->getNewModulesPriv($id) };
-    }
-    elsif ( $type eq 'taskids' ) {
-        eval { $result = $eis->getTaskIds($id) };
-    }
-    elsif ( $type eq 'files' ) {
-        eval { $result = $eis->getFiles($id) };
-    }
-    elsif ( $type eq 'patch_files' ) {
-        eval { $result = $eis->getOutputFiles($id) };
-    }
-    else {
-        # fall through, can't happen
-        carp("ERROR: wrong item type\n");
-        return undef;
-    }
-    if ( $@ ) {
-        carp("ERROR: fetch_item(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-sub add_items_to_eis
-{
-    my $self          = shift;
-    my $type          = shift;
-    my $optional_data = shift;
-    my $item_ref      = shift;
-
-    my $eis = Cws::eis();
-    my $id = $self->eis_id();
-
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    # make certain that all items are strings, otherwise
-    # autotyping will occasionally choose the wrong type
-    my @items = ();
-    foreach ( @{$item_ref} ) {
-        push(@items, Eis::to_string($_));
-    }
-
-    my $result;
-    if ( $type eq 'modules' ) {
-        if ( defined($optional_data) ) {
-            # add a module new style, with public attribute
-            eval { $result = $eis->addModule($id, $items[0], $optional_data) };
-        }
-        else {
-            # old style, add a list of modules
-            eval { $result = $eis->addModules($id, \@items) };
-        }
-    }
-    elsif ( $type eq 'taskids' ) {
-        eval { $result = $eis->addTaskIds($id, \@items, $optional_data) };
-    }
-    else {
-        # fall through, can't happen
-        carp("ERROR: wrong item type\n");
-        return 0;
-    }
-
-    if ( $@ ) {
-        carp("ERROR: add_item(): EIS database transaction failed. Reason:\n$@\n");
-        return undef;
-    }
-    return 1 if $result;
-    return 0;
-}
-
-sub add_file_to_eis
-{
-    my $self         = shift;
-    my $module       = shift;
-    my $file         = shift;
-    my $revision     = shift;
-    my $authors_ref  = shift;
-    my $taskids_ref  = shift;
-    my $archive_path = shift;
-
-
-    my $eis = Cws::eis();
-    my $id = $self->eis_id();
-
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    # make certain that all task_ids are strings, otherwise
-    # autotyping will choose the wrong type
-    # Note: I think typing just the first element should suffice, but ...
-    my @taskids = ();
-    foreach ( @{$taskids_ref} ) {
-        push(@taskids, Eis::to_string($_));
-    }
-    # HACK Its possible that we get no valid taskid.
-    # Autotyping will fail for a list without elements;
-    if ( !@taskids ) {
-        push(@taskids, Eis::to_string(''));
-    }
-
-    # same for revision
-    $revision = Eis::to_string($revision);
-
-    if ( !$archive_path ) {
-        $archive_path = Eis::to_string('');
-    }
-
-    my $result;
-    eval {
-        $result = $eis->addFile($id, $module, $file, $archive_path,
-                                $revision, $authors_ref, \@taskids)
-    };
-    if ( $@ ) {
-        carp("ERROR: add_file(): EIS database transaction failed. Reason:\n$@\n");
-        return undef;
-    }
-    return 1 if $result;
-    return 0;
-}
-
-sub add_patch_file_to_eis
-{
-    my $self         = shift;
-    my $file         = shift;
-
-    my $eis = Cws::eis();
-    my $id = $self->eis_id();
-
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $result;
-    eval { $result = $eis->addOutputFile($id, $file) };
-    if ( $@ ) {
-        carp("ERROR: add_patch_file(): EIS database transaction failed. Reason:\n$@\n");
-        return undef;
-    }
-    return $1;# appOutputFile has void as return value ...
-}
-
-sub is_cws_name_available_in_eis
-{
-    my $self     = shift;
-
-    if ( !$self->master() ) {
-        carp("ERROR: master workspace name not set\n");
-        return undef;
-    }
-
-    if ( !$self->child() ) {
-        carp("ERROR: child workspace name not set\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $master    = Eis::to_string($self->master());
-    my $child     = Eis::to_string($self->child());
-
-    my $result;
-    eval { $result = $eis->isChildWorkspaceUnique($master, $child) };
-    if ( $@ ) {
-        carp("ERROR: is_cws_name_available(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-sub register_child_with_eis
-{
-    my $self     = shift;
-    my $vcsid    = shift;
-    my $location = shift;
-
-    if ( !$self->master() ) {
-        carp("ERROR: master workspace name not set\n");
-        return undef;
-    }
-
-    if ( !$self->milestone() ) {
-        carp("ERROR: master milestone not set\n");
-        return undef;
-    }
-
-    if ( !$self->child() ) {
-        carp("ERROR: child workspace name not set\n");
-        return undef;
-    }
-
-    $vcsid    = '' unless $vcsid;
-    $location = '' unless $location;
-
-    my $eis = Cws::eis();
-    my $master    = Eis::to_string($self->master());
-    my $milestone = Eis::to_string($self->milestone());
-    my $child     = Eis::to_string($self->child());
-
-    $vcsid        = Eis::to_string($vcsid);
-    $location     = Eis::to_string($location);
-
-    my $result;
-    eval {
-        $result = $eis->createChildWorkspace($master, $milestone, $child,
-                                                 $vcsid, $location)
-    };
-
-    if ( $@ ) {
-        carp("ERROR: create_child_workspace(): EIS database transaction failed. Reason:\n$@\n");
-        return undef;
-    }
-    # set EIS_ID directly, since $self->eis_id() is not
-    # supposed to take parameters.
-    $self->{EIS_ID} = $result;
-    return $result;
-}
-
-sub promote_child_in_eis
-{
-    my $self     = shift;
-    my $vcsid    = shift;
-    my $location = shift;
-
-    my $eis = Cws::eis();
-    my $id = $self->eis_id();
-
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    if ( !$self->milestone() ) {
-        carp("ERROR: master milestone not set\n");
-        return undef;
-    }
-
-    my $milestone = Eis::to_string($self->milestone());
-
-    $vcsid    = '' unless $vcsid;
-    $location = '' unless $location;
-
-    $vcsid        = Eis::to_string($vcsid);
-    $location     = Eis::to_string($location);
-
-    my $result;
-    eval {
-        $result = $eis->initializeChildWorkspace($id, $milestone, $vcsid, $location)
-    };
-
-    eval { $result = $eis->getStatus($id) };
-    if ( $@ ) {
-        carp("ERROR: promote(): EIS database transaction failed. Reason:\n$@\n");
-        return 0;
-    }
-    return 1;
-}
-
-# Get child workspace owner from EIS,
-# return undef in case of error.
-sub get_owner_from_eis
-{
-    my $self = shift;
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->getOwnerEmail($id) };
-    if ( $@ ) {
-        carp("ERROR: get_OwnerEmail(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-# Get child workspace qarep from EIS,
-# return undef in case of error.
-sub get_qarep_from_eis
-{
-    my $self = shift;
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->getQARepresentativeEmail($id) };
-    if ( $@ ) {
-        carp("ERROR: get_qarep(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-# store an attachment to a given CWS
-# return undef in case of error.
-sub save_attachment_in_eis
-{
-    my $self      = shift;
-    my $name      = shift;
-    my $mediatype = shift;
-    my $text      = shift;
-
-    # check if child workspace is valid
-    my $eisid = $self->eis_id();
-    if ( !$eisid )
-    {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eisname =      Eis::to_string($name);
-    my $eismediatype = Eis::to_string($mediatype);
-    my $eistextstring = Eis::to_string($text);
-
-    my $eis = Cws::eis();
-    my $result;
-
-    eval { $result = $eis->saveAttachment($eisid, $eisname, $eismediatype, $eistextstring ) };
-    if ( $@ ) {
-        carp("ERROR: save_attachment_in_eis(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-# Get child workspace approval status from EIS,
-# return undef in case of error.
-sub get_status_from_eis
-{
-    my $self = shift;
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->getStatus($id) };
-    if ( $@ ) {
-        carp("ERROR: get_status(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-# Get child workspace approval status from EIS,
-# return undef in case of error.
-sub set_status_in_eis
-{
-    my $self = shift;
-    my $status = shift;
-    my $method = 'set';
-    $method .= (defined $status) ? $status : 'Integrated';
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-    my $eis = Cws::eis();
-    my $result;
-    if (defined $status) {
-        eval { $result = $eis->setFixedOnMaster($id) };
-    } else {
-        eval { $result = $eis->setIntegrated($id) };
-    }
-    if ( $@ ) {
-        carp("ERROR: $method(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-# Get child workspace approval status from EIS,
-# return undef in case of error.
-sub set_integration_milestone_in_eis
-{
-    my $self      = shift;
-    my $milestone = shift;
-    my $buildid   = shift;
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-
-    # just in case ...
-    if ( !defined($milestone) ) {
-        $milestone = Eis::to_string('');
-    }
-    # $buildid must be transfered as string
-    if ( !defined($buildid) ) {
-        $buildid = Eis::to_string('');
-    }
-    else {
-        $buildid = Eis::to_string($buildid);
-    }
-
-    my $result;
-    eval { $result = $eis->setIntegrationMilestone($id, $milestone, $buildid) };
-    if ( $@ ) {
-        carp("ERROR: set_integration_milestone(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-sub set_milestone_buildid_in_eis
-{
-    my $self      = shift;
-    my $master    = shift;
-    my $milestone = shift;
-    my $buildid   = shift;
-
-    $master    = Eis::to_string($master);
-    $milestone = Eis::to_string($milestone);
-    $buildid   = Eis::to_string($buildid);
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->setMilestoneBuild( $master, $milestone, $buildid ) };
-    if ( $@ ) {
-        carp("ERROR: set_milestone_buildid(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-sub set_current_milestone_in_eis
-{
-    my $self      = shift;
-    my $master    = shift;
-    my $milestone = shift;
-
-    $master    = Eis::to_string($master);
-    $milestone = Eis::to_string($milestone);
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->setCurrentMilestone( $master, $milestone ) };
-    if ( $@ ) {
-        carp("ERROR: set_current_milestone(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-sub get_current_milestone_from_eis
-{
-    my $self      = shift;
-    my $master    = shift;
-
-    $master    = Eis::to_string($master);
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->getCurrentMilestone( $master ) };
-    if ( $@ ) {
-        carp("ERROR: get_current_milestone(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-sub get_masters_from_eis
-{
-    my $self      = shift;
-
-    my $eis = Cws::eis();
-    my @result;
-    eval { @result = $eis->getMasterWorkspaces() };
-    if ( $@ ) {
-        carp("ERROR: get_masters(): EIS database transaction failed. Reason:\n$@\n");
-    }
-
-    my @result2=();
-    my $i=0;
-    while ( defined($result[0][$i]) ) {
-        push @result2,$result[0][$i];
-        $i++;
-    }
-    return @result2;
-}
-
-
-sub get_milestones_from_eis
-{
-    my $self      = shift;
-    my $master    = shift;
-
-    $master    = Eis::to_string($master);
-
-    my $eis = Cws::eis();
-    my @result;
-    eval { @result = $eis->getMilestones( $master ) };
-    if ( $@ ) {
-        carp("ERROR: get_milestones(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    my @result2=();
-    my $i=0;
-    while ( defined($result[0][$i]) ) {
-        push @result2,$result[0][$i];
-        $i++;
-    }
-    return @result2;
-}
-
-# Get child workspace owner from EIS,
-# return undef in case of error.
-sub expand_buildid_in_eis
-{
-    my $self = shift;
-    my $bid = shift;
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $name = $self->child();
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->expandBuildId($bid, $name) };
-    if ( $@ ) {
-        carp("ERROR: expand_builid(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-sub set_milestone_removed_in_eis
-{
-    my $self      = shift;
-    my $master    = shift;
-    my $milestone = shift;
-
-    $master    = Eis::to_string($master);
-    $milestone = Eis::to_string($milestone);
-
-    my $eis = Cws::eis();
-    eval { $eis->minorRemoved( $master, $milestone ) };
-    if ( $@ ) {
-        carp("ERROR: set_current_milestone(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return;
-}
-
-sub is_milestone_registered_with_eis
-{
-    my $self      = shift;
-    my $master    = shift;
-    my $milestone = shift;
-
-    $master    = Eis::to_string($master);
-    $milestone = Eis::to_string($milestone);
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->isMilestoneValid($master, $milestone) };
-    if ( $@ ) {
-        carp("ERROR: is_milestone(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-sub get_is_milestone_used_from_eis
-{
-    my $self      = shift;
-    my $master    = shift;
-    my $milestone = shift;
-
-    $master    = Eis::to_string($master);
-    $milestone = Eis::to_string($milestone);
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->isMilestoneInUse($master, $milestone) };
-    if ( $@ ) {
-        carp("ERROR: is_milestone_used(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-sub get_buildid_for_milestone
-{
-    my $self      = shift;
-    my $master    = shift;
-    my $milestone = shift;
-
-    $master    = Eis::to_string($master);
-    $milestone = Eis::to_string($milestone);
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->getMilestoneBuild($master, $milestone) };
-    if ( $@ ) {
-        carp("ERROR: get_buildid_for_milestone(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-sub get_childworkspaces_for_milestone
-{
-    my $self      = shift;
-    my $master    = shift;
-    my $milestone = shift;
-
-    $master    = Eis::to_string($master);
-    $milestone = Eis::to_string($milestone);
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->searchChildWorkspacesForMilestone($master, $milestone) };
-    if ( $@ ) {
-        carp("ERROR: get_childworkspaces_for_milestone(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-sub get_cws_with_state_from_eis {
-    my $self = shift;
-    my $mws = shift;
-    my $status = shift;
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->getCWSWithState($mws, $status) };
-    if ( $@ ) {
-        carp("ERROR: get_cws_with_state_from_eis(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-sub get_task_prios_of_tasks
-{
-    my $self        = shift;
-    my $ref_taskids = shift;
-
-    my $eis = Cws::eis();
-    my $result;
-    my @items = ();
-    foreach ( @{$ref_taskids} ) {
-        push(@items, Eis::to_string($_));
-    }
-
-    eval { $result = $eis->getTasksPriorities( \@items ) };
-    if ( $@ ) {
-        carp("ERROR: get_task_prios_of_tasks(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-sub get_creation_master_from_eis
-{
-    my $self      = shift;
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->getCreationMasterWorkspace($id) };
-    if ( $@ ) {
-        carp("ERROR: get_creation_master(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-
-}
-
-sub get_milestone_integrated_from_eis
-{
-    my $self      = shift;
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->getMilestoneIntegrated($id) };
-    if ( $@ ) {
-        carp("ERROR: get_milestone_integrated(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-
-}
-
-# get isPublic flag from eis
-sub get_public_flag_from_eis
-{
-    my $self      = shift;
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->isPublic($id) };
-    if ( $@ ) {
-        carp("ERROR: get_public_flag(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-# get isPublicMaster flag from eis
-sub get_publicmaster_flag_from_eis
-{
-    my $self      = shift;
-
-    # check if child workspace is valid
-    my $master = $self->master();
-    if ( !$master ) {
-        carp("ERROR: MasterWorkspace not defined.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->isPublicMaster($master) };
-    if ( $@ ) {
-        carp("ERROR: get_publicmaster_flag(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-# get isSubVersion flag from eis
-sub get_subversion_flag_from_eis
-{
-    my $self = shift;
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->isSubVersion($id) };
-    if ( $@ ) {
-        carp("ERROR: get_subversion_flag(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-# set isSubVersion flag in eis
-sub set_subversion_flag_in_eis
-{
-    my $self=shift;
-    my $status=shift;
-
-    my $bool_status=SOAP::Data->type(boolean => $status);
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->setSubVersion($id,$bool_status) };
-    if ( $@ ) {
-        carp("ERROR: get_subversion_flag(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-sub get_scm_from_eis
-{
-    my $self = shift;
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->getSCMName($id) };
-    if ( $@ ) {
-        carp("ERROR: get_scm_from_eis(): EIS database transaction failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-sub set_scm_in_eis
-{
-    my $self     = shift;
-    my $scm_name = shift;
-
-    $scm_name = Eis::to_string($scm_name);
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    eval { $eis->setSCMName($id, $scm_name) };
-    if ( $@ ) {
-        carp("ERROR: set_scm_in_eis(): EIS database transaction failed. Reason:\n$@\n");
-        return 0;
-    }
-    return 1;
-}
-
-sub is_uirelevant_from_eis
-{
-    my $self        = shift;
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->isUIRelevant($id) };
-    if ( $@ ) {
-        carp("ERROR: is_uirelevant_from_eis(): EIS database transaction failed. Reason:\n$@\n");
-    }
-
-    return $result;
-}
-
-sub is_helprelevant_from_eis
-{
-    my $self        = shift;
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->isHelpRelevant( $id ) };
-    if ( $@ ) {
-        carp("ERROR: is_helprelevant_from_eis(): EIS database transaction failed. Reason:\n$@\n");
-    }
-
-    return $result;
-}
-sub set_word_count_in_eis
-{
-    my $self        = shift;
-    my $language    = shift;
-    my $wordcount   = shift;
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->setWordCount( $id , $language , $wordcount ) };
-    if ( $@ ) {
-        carp("ERROR: set_word_count_from_eis(): EIS database transaction failed. Reason:\n$@\n");
-    }
-
-    return $result;
-}
-
-
-sub get_l10n_status_from_eis
-{
-    my $self        = shift;
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->getL10n( $id ) };
-    if ( $@ ) {
-        carp("ERROR: get_l10n_status_from_eis(): EIS database transaction failed. Reason:\n$@\n");
-    }
-
-    return $result;
-}
-
-sub set_l10n_status_in_eis
-{
-    my $self        = shift;
-    my $status      = Eis::to_string( shift );
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-
-    eval { $result = $eis->setL10n( $id , $status ) };
-    if ( $@ ) {
-        carp("ERROR: set_l10n_status_in_eis(): EIS database transaction failed. Reason:\n$@\n");
-    }
-
-    return $result;
-}
-
-sub get_is_cws_cloneable_from_eis
-{
-    my $self   = shift;
-    my $master = Eis::to_string( shift );
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-
-    eval { $result = $eis->isClonableForMaster($id, $master) };
-    if ( $@ ) {
-        carp("ERROR:  get_is_cws_cloneable_from_eis(): EIS database transaction failed. Reason:\n$@\n");
-    }
-
-    return $result;
-}
-
-sub clone_cws_in_eis
-{
-    my $self   = shift;
-    my $master = Eis::to_string( shift );
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-
-    eval { $eis->cloneForMaster($id, $master) };
-    if ( $@ ) {
-        carp("ERROR:  clone_cws_in_eis(): EIS database transaction failed. Reason:\n$@\n");
-        return 0;
-    }
-
-    return 1;
-}
-
-sub get_release_from_eis
-{
-    my $self   = shift;
-    my $master = Eis::to_string( shift );
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-
-    eval { $result = $eis->getRelease($id) };
-    if ( $@ ) {
-        carp("ERROR:  get_release_from_eis(): EIS database transaction failed. Reason:\n$@\n");
-    }
-
-    return $result;
-}
-
-sub get_due_date_from_eis
-{
-    my $self   = shift;
-    my $master = Eis::to_string( shift );
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-
-    eval { $result = $eis->getDueDate($id) };
-    if ( $@ ) {
-        carp("ERROR:  get_due_date_from_eis(): EIS database transaction failed. Reason:\n$@\n");
-    }
-
-    return $result;
-}
-
-sub get_due_date_qa_from_eis
-{
-    my $self   = shift;
-    my $master = Eis::to_string( shift );
-
-    # check if child workspace is valid
-    my $id = $self->eis_id();
-    if ( !$id ) {
-        carp("ERROR: Childworkspace not (yet) registered with EIS.\n");
-        return undef;
-    }
-
-    my $eis = Cws::eis();
-    my $result;
-
-    eval { $result = $eis->getDueDateQA($id) };
-    if ( $@ ) {
-        carp("ERROR:  get_due_date_qa_from_eis(): EIS database transaction failed. Reason:\n$@\n");
-    }
-
-    return $result;
-}
-
-
-#logging
-sub set_log_entry_in_eis
-{
-    my $self        = shift;
-    my $commandline = shift;
-    my $vcsid       = shift;
-    my $start       = shift;
-    my $end         = shift;
-    my $comment     = shift;
-
-    $commandline    = SOAP::Data->type(string => $commandline);
-    $comment        = SOAP::Data->type(string => $comment);
-
-    # *format* for  $start and $end = "2003-05-28 12:34:59";
-
-#=====================================================
-    #TO DO:
-    #experimenell f�r saubere schnittstelle
-    #$start = SOAP::Data->type(dateTime => $start);
-    #$end = SOAP::Data->type(dateTime => $end);
-#=====================================================
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->storeCommandLogEntry( $commandline, $vcsid, $start, $end, $comment ) };
-    if ( $@ ) {
-        carp("ERROR: set_log_entry(): Logging failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-#set_log_entry_extended_in_eis($commandname, $parameter, $vcsid, $start, $stop, $comment, $mastername, $childname);
-sub set_log_entry_extended_in_eis
-{
-    my $self        = shift;
-    my $commandname = shift;
-    my $parameter   = shift;
-    my $vcsid       = shift;
-    my $start       = shift;
-    my $end         = shift;
-    my $comment     = shift;
-    my $mastername  = shift;
-    my $childname   = shift;
-
-    $commandname    = SOAP::Data->type(string => $commandname);
-    $parameter      = SOAP::Data->type(string => $parameter);
-    $comment        = SOAP::Data->type(string => $comment);
-    $mastername     = SOAP::Data->type(string => $mastername);
-    $childname      = SOAP::Data->type(string => $childname);
-
-    # *format* for  $start and $end = "2003-05-28 12:34:59";
-
-#=====================================================
-    #TO DO:
-    #experimenell f�r saubere schnittstelle
-    #$start = SOAP::Data->type(dateTime => $start);
-    #$end = SOAP::Data->type(dateTime => $end);
-#=====================================================
-
-    my $eis = Cws::eis();
-    my $result;
-    eval { $result = $eis->storeCommandLogEntry($commandname, $parameter, $vcsid, $start, $end, $comment, $mastername, $childname) };
-    if ( $@ ) {
-        carp("ERROR: set_log_entry_extended(): Logging failed. Reason:\n$@\n");
-    }
-    return $result;
-}
-
-
-#### class methods ####
-
-sub init_eis_connector
-{
-    my $eis = Eis->new( uri => Cws::eis_uri(),
-                        proxy_list => Cws::eis_proxy_list(),
-                        net_proxy => Cws::net_proxy()
-                      );
-    return $eis;
-}
-
-####
-
-1; # needed by "use" or "require"
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/CwsConfig.pm b/solenv/bin/modules/CwsConfig.pm
deleted file mode 100644
index 1ba12fecac1d..000000000000
--- a/solenv/bin/modules/CwsConfig.pm
+++ /dev/null
@@ -1,541 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# CwsConfig.pm - package for read CWS config data
-#
-
-package CwsConfig;
-use strict;
-
-use Carp;
-use URI::Escape;
-
-##### ctor ####
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{_CONFIG_FILE}        = undef;    # config file
-    $self->{_GLOBAL}             = undef;    # is it a global config file?
-    $self->{VCSID}               = undef;    # VCSID
-    $self->{CWS_DB_URL_LIST_REF} = undef;    # list of CWS DB servers
-    $self->{NET_PROXY}           = undef;    # network proxy
-    $self->{CWS_SERVER_ROOT}     = undef;    # cvs server
-    $self->{CWS_MIRROR_ROOT}     = undef;    # mirror of cvs server
-    $self->{CWS_LOCAL_ROOT}      = undef;    # local cvs server
-    $self->{PUBLIC_SVN_SERVER}   = undef;    # public svn server
-    $self->{PRIVATE_SVN_SERVER}  = undef;    # private svn server
-    bless ($self, $class);
-    return $self;
-}
-
-sub vcsid
-{
-    my $self = shift;
-
-    if ( !defined($self->{VCSID}) ) {
-        # environment overrides config file
-        my $vcsid = $ENV{VCSID};
-        if ( !defined($vcsid) ) {
-            # check config file
-            my $config_file = $self->get_config_file();
-            $vcsid = $config_file->{CWS_CONFIG}->{'CVS_ID'};
-            if ( !defined($vcsid) ) {
-                # give up
-                croak("ERROR: no CVS_ID entry found in '\$HOME/.cwsrc'.\n" );
-            }
-        }
-        $self->{VCSID} = $vcsid;
-    }
-    return $self->{VCSID};
-}
-
-sub cws_db_url_list_ref
-{
-    my $self = shift;
-
-    if ( !defined($self->{CWS_DB_URL_LIST_REF}) ) {
-        my $config_file = $self->get_config_file();
-
-        my $i = 1;
-        my @cws_db_servers;
-
-        while ( 1 ) {
-            my $val = $config_file->{CWS_CONFIG}->{"CWS_DB_SERVER_$i"};
-            last if !defined($val);
-            push(@cws_db_servers, $val);
-            $i++;
-        }
-
-        if ( !@cws_db_servers) {
-            croak("ERROR: no CWS_DB_SERVER_* entry found in '\$HOME/.cwsrc'.\n" );
-        }
-
-        if ( $cws_db_servers[0] =~ /^https:\/\// ) {
-            my $id = $self->vcsid();
-            my $password = $config_file->{CWS_CONFIG}->{'CVS_PASSWORD'};
-
-            if ( !defined($password) ) {
-                croak("ERROR: no CVS_PASSWORD entry found in '\$HOME/.cwsrc'.\n" );
-            }
-
-            # *i49473* - do not accept scrambled passwords ending with a space
-            if ( $password =~ / $/) {
-                croak("ERROR: The (scrambled) CVS_PASSWORD ends with a space. This is known to cause problems when connecting to the OpenOffice.org EIS database. Please change your OOo account's password" );
-            }
-
-            # We are going to stuff $id and $password in an URL, do proper escaping.
-            $id = uri_escape($id);
-            $password = uri_escape($password);
-
-            foreach ( @cws_db_servers ) {
-                s/^https:\/\//https:\/\/$id:$password@/;
-            }
-        }
-
-        $self->{CWS_DB_URL_LIST_REF} = \@cws_db_servers;
-    }
-    return $self->{CWS_DB_URL_LIST_REF};
-}
-
-sub net_proxy
-{
-    my $self = shift;
-
-    if ( !defined($self->{NET_PROXY}) ) {
-        my $config_file = $self->get_config_file();
-        my $net_proxy = $config_file->{CWS_CONFIG}->{'PROXY'};
-        if ( !defined($net_proxy) ) {
-            $net_proxy = "";
-        }
-        $self->{NET_PROXY} = $net_proxy;
-    }
-    return $self->{NET_PROXY} ? $self->{NET_PROXY} : undef;
-}
-
-sub cvs_binary
-{
-    my $self = shift;
-
-    if ( !defined($self->{CVS_BINARY}) ) {
-        my $config_file = $self->get_config_file();
-        my $cvs_binary = $config_file->{CWS_CONFIG}->{'CVS_BINARY'};
-        if ( !defined($cvs_binary) ) {
-            # defaults
-            $cvs_binary = ($^O eq 'MSWin32') ? 'cvs.exe' : 'cvs';
-        }
-        # special case, don't ask
-        if ( $self->{_GLOBAL} && $cvs_binary =~ /cvs.clt2/ && $^O eq 'MSWin32' ) {
-            $cvs_binary = 'cvsclt2.exe';
-        }
-        $self->{CVS_BINARY} = $cvs_binary;
-    }
-    return $self->{CVS_BINARY};
-}
-
-sub cvs_server_root
-{
-    my $self = shift;
-
-    if ( !defined($self->{CVS_SERVER_ROOT}) ) {
-        my $config_file = $self->get_config_file();
-        my $cvs_server_root = $config_file->{CWS_CONFIG}->{'CVS_SERVER_ROOT'};
-        if ( !defined($cvs_server_root) ) {
-            # give up, this is a mandatory entry
-            croak("ERROR: can't parse CVS_SERVER_ROOT entry in '\$HOME/.cwsrc'.\n");
-        }
-        if ( $self->{_GLOBAL} ) {
-            # a global config file will almost always have the wrong vcsid in
-            # the cvsroot -> substitute vcsid
-            my $id = $self->vcsid();
-            $cvs_server_root =~ s/:pserver:\w+@/:pserver:$id@/;
-        }
-        $self->{CVS_SERVER_ROOT} = $cvs_server_root;
-    }
-    return $self->{CVS_SERVER_ROOT};
-}
-
-sub cvs_mirror_root
-{
-    my $self = shift;
-
-    if ( !defined($self->{CVS_MIRROR_ROOT}) ) {
-        my $config_file = $self->get_config_file();
-        my $cvs_mirror_root = $config_file->{CWS_CONFIG}->{'CVS_MIRROR_ROOT'};
-        if ( !defined($cvs_mirror_root) ) {
-            $cvs_mirror_root = "";
-        }
-        $self->{CVS_MIRROR_ROOT} = $cvs_mirror_root;
-    }
-    return $self->{CVS_MIRROR_ROOT} ? $self->{CVS_MIRROR_ROOT} : undef;
-}
-
-sub cvs_local_root
-{
-    my $self = shift;
-
-    if ( !defined($self->{CVS_LOCAL_ROOT}) ) {
-        my $config_file = $self->get_config_file();
-        my $cvs_local_root = $config_file->{CWS_CONFIG}->{'CVS_LOCAL_ROOT'};
-        if ( !defined($cvs_local_root) ) {
-            $cvs_local_root = "";
-        }
-        $self->{CVS_LOCAL_ROOT} = $cvs_local_root;
-    }
-    return $self->{CVS_LOCAL_ROOT} ? $self->{CVS_LOCAL_ROOT} : undef;
-}
-
-sub get_cvs_server
-{
-    my $self = shift;
-
-    my ($method, $id, $server, $repository) = CwsConfig::split_root($self->cvs_server_root(), 'SERVER');
-    return $server;
-}
-
-sub get_cvs_mirror
-{
-    my $self = shift;
-
-    my ($method, $id, $server, $repository) = CwsConfig::split_root($self->cvs_mirror_root(), 'MIRROR');
-    return $server;
-}
-
-sub get_cvs_local
-{
-    my $self = shift;
-
-    my ($method, $id, $server, $repository) = CwsConfig::split_root($self->cvs_local_root(), 'LOCAL');
-    return $server;
-}
-
-sub get_cvs_server_method
-{
-    my $self = shift;
-
-    my ($method, $id, $server, $repository) = CwsConfig::split_root($self->cvs_server_root(), 'SERVER');
-    return $method;
-}
-
-sub get_cvs_mirror_method
-{
-    my $self = shift;
-
-    my ($method, $id, $server, $repository) = CwsConfig::split_root($self->cvs_mirror_root(), 'MIRROR');
-    return $method;
-}
-
-sub get_cvs_local_method
-{
-    my $self = shift;
-
-    my ($method, $id, $server, $repository) = CwsConfig::split_root($self->cvs_local_root(), 'LOCAL');
-    return $method;
-}
-
-sub get_cvs_server_repository
-{
-    my $self = shift;
-
-    my ($method, $id, $server, $repository) = CwsConfig::split_root($self->cvs_server_root(), 'SERVER');
-    return $repository;
-}
-
-sub get_cvs_mirror_repository
-{
-    my $self = shift;
-
-    my ($method, $id, $server, $repository) = CwsConfig::split_root($self->cvs_mirror_root(), 'MIRROR');
-    return $repository;
-}
-
-sub get_cvs_local_repository
-{
-    my $self = shift;
-
-    my ($method, $id, $server, $repository) = CwsConfig::split_root($self->cvs_local_root(), 'LOCAL');
-    return $repository;
-}
-
-sub get_cvs_server_id
-{
-    my $self = shift;
-
-    my ($method, $id, $server, $repository) = CwsConfig::split_root($self->cvs_server_root(), 'SERVER');
-    return $id;
-}
-
-sub get_cvs_mirror_id
-{
-    my $self = shift;
-
-    my ($method, $id, $server, $repository) = CwsConfig::split_root($self->cvs_mirror_root(), 'MIRROR');
-    return $id;
-}
-
-sub get_cvs_local_id
-{
-    my $self = shift;
-
-    my ($method, $id, $server, $repository) = CwsConfig::split_root($self->cvs_local_root(), 'LOCAL');
-    return $id;
-}
-
-#### SVN methods ####
-
-sub get_ooo_svn_server
-{
-    my $self = shift;
-
-    if ( !defined($self->{SVN_SERVER}) ) {
-        my $config_file = $self->get_config_file();
-        my $ooo_svn_server = $config_file->{CWS_CONFIG}->{'SVN_SERVER'};
-        if ( !defined($ooo_svn_server) ) {
-            $ooo_svn_server = "";
-        }
-        $self->{SVN_SERVER} = $ooo_svn_server;
-    }
-    return $self->{SVN_SERVER} ? $self->{SVN_SERVER} : undef;
-}
-
-sub get_so_svn_server
-{
-    my $self = shift;
-
-    if ( !defined($self->{SO_SVN_SERVER}) ) {
-        my $config_file = $self->get_config_file();
-        my $so_svn_server = $config_file->{CWS_CONFIG}->{'SO_SVN_SERVER'};
-        if ( !defined($so_svn_server) ) {
-            $so_svn_server = "";
-        }
-        $self->{SO_SVN_SERVER} = $so_svn_server;
-    }
-    return $self->{SO_SVN_SERVER} ? $self->{SO_SVN_SERVER} : undef;
-}
-
-#### HG methods ####
-
-sub _get_hg_source
-{
-    my $self               = shift;
-    my $repository_source  = shift;
-    if ( !defined($self->{$repository_source}) ) {
-        my $config_file = $self->get_config_file();
-        my $source = $config_file->{CWS_CONFIG}->{$repository_source};
-        if ( !defined($source) ) {
-            $source = "";
-        }
-        $self->{$repository_source} = $source;
-    }
-    return $self->{$repository_source} ? $self->{$repository_source} : undef;
-
-}
-
-sub get_hg_source
-{
-    my $self        = shift;
-    my $repository  = shift;
-    my $location    = shift;
-
-    #Special prefix handling, see cwsrc
-    if ($repository eq "OOO")
-    {
-        if ($location eq "LOCAL")
-        {
-            return $self->_get_hg_source('HG_LOCAL_SOURCE');
-        }
-        elsif ($location eq "LAN")
-        {
-            return $self->_get_hg_source('HG_LAN_SOURCE');
-        }
-        elsif ($location eq "REMOTE")
-        {
-            return $self->_get_hg_source('HG_REMOTE_SOURCE');
-        }
-    }
-    else
-    {
-        if ($location eq "LOCAL")
-        {
-            return $self->_get_hg_source($repository.'_HG_LOCAL_SOURCE');
-        }
-        elsif ($location eq "LAN")
-        {
-            return $self->_get_hg_source($repository.'_HG_LAN_SOURCE');
-        }
-        elsif ($location eq "REMOTE")
-        {
-            return $self->_get_hg_source($repository.'_HG_REMOTE_SOURCE');
-        }
-    }
-}
-
-#### Prebuild binaries configuration ####
-
-sub get_prebuild_binaries_location
-{
-    my $self = shift;
-
-    if ( !defined($self->{PREBUILD_BINARIES}) ) {
-        my $config_file = $self->get_config_file();
-        my $pre_build_binaries = $config_file->{CWS_CONFIG}->{'PREBUILD_BINARIES'};
-        if ( !defined($pre_build_binaries) ) {
-            $pre_build_binaries = "";
-        }
-        $self->{PREBUILD_BINARIES} = $pre_build_binaries;
-    }
-    return $self->{PREBUILD_BINARIES} ? $self->{PREBUILD_BINARIES} : undef;
-}
-
-
-
-#### class methods #####
-sub get_config
-{
-    my $config = CwsConfig->new();
-    return $config;
-}
-
-sub split_root
-{
-    my $root = shift;
-    my $type = shift;
-
-    if ( !defined($root) ) {
-        return (undef, undef, undef, undef);
-    }
-
-    my ($dummy, $method, $id_at_host, $repository) = split(/:/, $root);
-    $repository =~ s/^\d*//;
-    my ($id, $server);
-    if ( $id_at_host ) {
-        ($id, $server) = split(/@/, $id_at_host);
-    }
-    if ( !defined($method) || !defined($id) || !defined($server) || !defined($repository) ) {
-        # give up
-        print  "$method, $id, $server, $repository\n";
-        croak("ERROR: can't parse CVS_".$type."_ROOT entry in '\$HOME/.cwsrc'.\n");
-    }
-    return ($method, $id, $server, $repository);
-}
-
-#### private helper methods ####
-
-sub get_config_file
-{
-    my $self = shift;
-
-    if ( !defined $self->{_CONFIG_FILE} ) {
-        $self->parse_config_file();
-    }
-    return $self->{_CONFIG_FILE};
-}
-
-sub read_config
-{
-    my $self = shift;
-    my $fname = shift;
-    my $fhandle;
-    my $section = '';
-    my %config;
-
-    open ($fhandle, $fname) || croak("ERROR: Can't open '$fname': $!");
-    while ( <$fhandle> ) {
-        tr/\r\n//d;   # win32 pain
-        # Issue #i62815#: Scrambled CVS passwords may contain one or more '#'.
-        # Ugly special case needed: still allow in-line (perl style) comments
-        # elsewhere because existing configuration files may depend on them.
-        if ( !/^\s*CVS_PASSWORD/ ) {
-            s/\#.*//; # kill comments
-        }
-        /^\s*$/ && next;
-
-        if (/\[\s*(\S+)\s*\]/) {
-            $section = $1;
-            if (!defined $config{$section}) {
-                $config{$section} = {};
-            }
-        }
-        defined $config{$section} || croak("ERROR: unknown / no section '$section'\n");
-        if ( m/(\w[\w\d]*)=(.*)/ ) {
-            my $var = $1;
-            my $val = $2;
-            # New style value strings may be surrounded by quotes
-            if ( $val =~ s/\s*(['"])(.*)\1\s*$/$2/ ) {
-                my $quote = $1;
-                # If and only if the value string is surrounded by quotes we
-                # can expect that \" or \' are escaped characters. In an unquoted
-                # old style value string they could mean exactly what is standing there
-                #
-                # Actually the RE above works without quoting the quote character
-                # (either " or ') inside the value string but users will probably
-                # expect that they need to be escaped if quotes are used.
-                #
-                # This is still not completly correct for all thinkable situations but
-                # should be good enough for all practical use cases.
-                $val =~ s/\\($quote)/$1/g;
-            }
-            $config{$section}->{$var} = $val;
-            # print "Set '$var' to '$val'\n";
-        }
-    }
-    close ($fhandle) || croak("ERROR: Failed to close: $!");
-
-    $self->{_CONFIG_FILE} = \%config;
-}
-
-sub parse_config_file
-{
-    my $self = shift;
-
-    my $config_file;
-    # check for config files
-    if ( -e "$ENV{HOME}/.cwsrc" ) {
-    $self->read_config("$ENV{HOME}/.cwsrc");
-        $self->{_GLOBAL} = 0;
-    }
-    elsif ( -e "$ENV{COMMON_ENV_TOOLS}/cwsrc" ) {
-        $self->read_config("$ENV{COMMON_ENV_TOOLS}/cwsrc");
-        $self->{_GLOBAL} = 1;
-    }
-    else {
-        croak("ERROR: can't find CWS config file '\$HOME/.cwsrc'.\n");
-    }
-}
-
-sub sointernal
-{
-    my $self = shift;
-    my $config_file = $self->get_config_file();
-    my $val = ($config_file->{CWS_CONFIG}->{"SO_INTERNAL"}) ? 1 : 0;
-    return $val;
-}
-1; # needed by "use" or "require"
diff --git a/solenv/bin/modules/GenInfoParser.pm b/solenv/bin/modules/GenInfoParser.pm
index 2671da13a69d..fdab7e44ff17 100644
--- a/solenv/bin/modules/GenInfoParser.pm
+++ b/solenv/bin/modules/GenInfoParser.pm
@@ -128,10 +128,7 @@ sub parse_list
     return 0 if ! -r $list_file;
 
     open(FILE, "<$list_file") or croak("can't open $list_file: $!");
-    # my $t0 = new Benchmark;
     $self->parse_block(\*FILE, $self->{'DATA'});
-    # my $t1 = new Benchmark;
-    # print STDERR "parsing $list_file took: ", timestr(timediff($t1, $t0)), "\n";
     close(FILE);
 }
 
diff --git a/solenv/bin/modules/RepositoryHelper.pm b/solenv/bin/modules/RepositoryHelper.pm
index 8ea7996f6bc6..a3459c2bb575 100644
--- a/solenv/bin/modules/RepositoryHelper.pm
+++ b/solenv/bin/modules/RepositoryHelper.pm
@@ -118,8 +118,7 @@ sub search_for_hg {
 
 sub search_via_build_lst {
     my $self = shift;
-#    my @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names
-    my @possible_build_lists = ('build.lst'); # build lists names
+    my @possible_build_lists = ('gbuild.lst', 'build.lst'); # build lists names
     my $previous_dir = '';
     my $rep_root_candidate = $self->{INITIAL_DIRECTORY};
     do {
@@ -136,7 +135,7 @@ sub search_via_build_lst {
             };
         };
         $previous_dir = $rep_root_candidate;
-        $rep_root_candidate = File::Basename::dirname(Cwd::realpath($rep_root_candidate));
+        $rep_root_candidate = File::Basename::dirname($rep_root_candidate);
         return 0 if ((!$rep_root_candidate) || ($rep_root_candidate eq $previous_dir));
     }
     while (chdir "$rep_root_candidate");
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index e7b526e2cfca..5ca61b5c2c9f 100755..100644
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -76,8 +76,16 @@ sub new {
             $source_root .= '/..';
         }
     } else {
-        $source_root = $ENV{SOURCE_ROOT_DIR};
+        $source_root = $ENV{SRC_ROOT};
     };
+    if ( defined $ENV{USE_GBUILD} and "$ENV{USE_GBUILD}" ne "" )
+    {
+        $self->{POSSIBLE_BUILD_LIST} = ('gbuild.lst', 'build.lst', 'build.xlist'); # build lists names
+    }
+    else
+    {
+        $self->{POSSIBLE_BUILD_LIST} = ('build.lst', 'build.xlist'); # build lists names
+    }
     $source_root = Cwd::realpath($source_root);
     $self->{SOURCE_ROOT} = $source_root;
     $self->{DEBUG} = 0;
@@ -94,6 +102,7 @@ sub new {
     $self->{REMOVE_REPOSITORIES} = {};
     $self->{NEW_REPOSITORIES} = [];
     $self->{WARNINGS} = [];
+    $self->{GBUILD} = 0;
     $self->{REPORT_MESSAGES} = [];
     $self->{CONFIG_FILE_CONTENT} = [];
     if (defined $self->{USER_SOURCE_ROOT}) {
@@ -173,11 +182,14 @@ sub get_module_build_list {
     if (defined ${$self->{MODULE_BUILD_LIST_PATHS}}{$module}) {
         return ${$self->{MODULE_BUILD_LIST_PATHS}}{$module};
     } else {
-        my @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names
-        foreach (@possible_build_lists) {
-            my $possible_path = ${$self->{MODULE_PATHS}}{$module} . "/prj/$_";
+        my @possible_build_lists = $self->{POSSIBLE_BUILD_LIST}; # build lists names
+        foreach my $build_list (@possible_build_lists) {
+            my $possible_path = ${$self->{MODULE_PATHS}}{$module} . "/prj/$build_list";
             if (-e $possible_path) {
                 ${$self->{MODULE_BUILD_LIST_PATHS}}{$module} = $possible_path;
+                if ( $build_list eq "gbuild.lst" ) {
+                    $self->{GBUILD} = 1;
+                };
                 return $possible_path;
             };
         };
@@ -305,12 +317,6 @@ sub read_config_file {
             if (/\s*(\S+)=active\s*(\s+#)*/) {
                 if ($repository_section) {
                     my $repository_source_path = $self->{SOURCE_ROOT} . "/$1";
-                    if (defined $ENV{UPDMINOREXT}) {
-                        $repository_source_path .= $ENV{UPDMINOREXT};
-                        if (defined ${$self->{REPOSITORIES}}{$1.$ENV{UPDMINOREXT}}) {
-                            delete ${$self->{REPOSITORIES}}{$1.$ENV{UPDMINOREXT}};
-                        };
-                    };
                     ${$self->{REPOSITORIES}}{$1} = $repository_source_path;
                     ${$self->{ACTIVATED_REPOSITORIES}}{$1}++;
                     next;
diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm
index e85903c699aa..af23ed21e3a6 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -36,6 +36,7 @@ use installer::globals;
 use installer::logger;
 use installer::pathanalyzer;
 use installer::systemactions;
+use Cwd;
 
 #################################################################
 # Changing the name for files with flag RENAME_TO_LANGUAGE
@@ -87,7 +88,7 @@ sub get_patch_file_list
     $patchfilestring =~ s/^\s*\///;
     $patchfilestring =~ s/^\s*\\//;
 
-    my $patchfilesarray = installer::converter::convert_stringlist_into_array_without_linebreak_and_quotes(\$patchfilestring, ",");
+    my $patchfilesarray = installer::converter::convert_stringlist_into_array_without_newline(\$patchfilestring, ",");
 
     return $patchfilesarray;
 }
@@ -241,9 +242,6 @@ sub resolving_archive_flag
 
             my $unzipdir;
 
-            # if ($iscommonfile) { $unzipdir = $commonunzipdirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator; }
-            # else { $unzipdir = $platformunzipdirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator; }
-
             $unzipdir = $platformunzipdirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator;
 
             installer::systemactions::create_directory($unzipdir);  # creating language specific subdirectories
@@ -264,10 +262,13 @@ sub resolving_archive_flag
 
             my $counter = 0;
             my $contains_dll = 0;
+            my @dllList = ();
+            my @dirs = ();
             foreach my $member ( $zip->memberNames() )
             {
                 $counter++;
-                if ( $member =~ /.dll\s*$/ ) { $contains_dll = 1; }
+                if ( $member =~ /.dll\s*$/i ) { $contains_dll = 1; push(@dllList, $member); }
+                if ( $member =~ m/\/$/ ) { push(@dirs, $member); }
             }
 
             if (! ( $counter > 0 )) # the zipfile is empty
@@ -284,31 +285,34 @@ sub resolving_archive_flag
 
                     if (( $^O =~ /cygwin/i ) && ( $contains_dll ))
                     {
-                        # Make dll's executable
-                        $systemcall = "cd $unzipdir; find . -name \\*.dll -exec chmod 775 \{\} \\\;";
-                        $returnvalue = system($systemcall);
-                        $infoline = "Systemcall: $systemcall\n";
+                        my $dir = getcwd();
+                        chdir($unzipdir);
+                        my $changed = chmod(0775, @dllList);
+                        $infoline = "Changed mode of $changed files (of ".scalar(@dllList).")\n";
                         push( @installer::globals::logfileinfo, $infoline);
+                        chdir($dir);
 
-                        if ($returnvalue)
+                        if ($changed != scalar(@dllList))
                         {
-                            $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
+                            $infoline = "ERROR: Could not chmod all files!\n";
                             push( @installer::globals::logfileinfo, $infoline);
                         }
                     }
 
-                    if ( ! $installer::globals::iswindowsbuild )
+                    if ( ! $installer::globals::iswindowsbuild && scalar(@dirs) > 0 )
                     {
+                        my $dir = getcwd();
+                        chdir($unzipdir);
                         # Setting unix rights to "775" for all created directories inside the package
+                        my $changed = chmod(0775, @dirs);
+                        $infoline = "Changed mode of : $changed; should be: ".scalar(@dirs)."\n";
+                        chdir($dir);
 
-                        $systemcall = "cd $unzipdir; find . -type d -exec chmod 775 \{\} \\\;";
-                        $returnvalue = system($systemcall);
-                        $infoline = "Systemcall: $systemcall\n";
                         push( @installer::globals::logfileinfo, $infoline);
 
-                        if ($returnvalue)
+                        if ($changed != scalar(@dirs))
                         {
-                            $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
+                            $infoline = "ERROR: Could not chmod all files!\n";
                             push( @installer::globals::logfileinfo, $infoline);
                         }
                     }
@@ -411,13 +415,9 @@ sub resolving_archive_flag
                                 $newfile{'Styles'} =~ s/\,\s*\,/\,/;
                                 $newfile{'Styles'} =~ s/\(\s*\,/\(/;
                                 $newfile{'Styles'} =~ s/\,\s*\)/\)/;
-                                # $infoline = "Removing PATCH flag from: $zipname\n";
-                                # push( @installer::globals::logfileinfo, $infoline);
                             }
                             else
                             {
-                                # $infoline = "Keeping PATCH flag at: $zipname\n";
-                                # push( @installer::globals::logfileinfo, $infoline);
                                 push( @keptpatchflags, $zipname); # collecting all PATCH flags
                             }
                         }
diff --git a/solenv/bin/modules/installer/configuration.pm b/solenv/bin/modules/installer/configuration.pm
index 4aa82d25b5b2..0fb587f68bb6 100644
--- a/solenv/bin/modules/installer/configuration.pm
+++ b/solenv/bin/modules/installer/configuration.pm
@@ -482,7 +482,6 @@ sub insert_into_config_file
     elsif ( $styles =~ /CFG_NUMERIC/ ) { $valuetype = "int"; }
     elsif ( $styles =~ /CFG_BOOLEAN/ ) { $valuetype = "boolean"; }
     elsif ( $styles =~ /CFG_STRINGLIST/ ) { $valuetype = "string-list"; }
-#   elsif ( $styles =~ /CFG_STRINGLIST/ ) { $valuetype = "string-list oor:separator=\"\|\""; }
     else
     {
         installer::exiter::exit_program("ERROR: Unknown configuration value type: $styles", "insert_into_config_file");
@@ -525,8 +524,8 @@ sub insert_into_config_file
 
     if (( $styles =~ /\bCREATE\b/ ) && (!($isbracketnode)))
     {
-        # my $typepart = 'oor:type="xs:VALUETYPE"'; # VALUETYPE can be "string", "boolean", ...
-
+        # $typepart is 'oor:type="xs:VALUETYPE"';
+        # VALUETYPE can be "string", "boolean", ...
         my $localtypepart = $typepart;
         $localtypepart =~ s/VALUETYPE/$valuetype/;
 
@@ -552,8 +551,6 @@ sub insert_into_config_file
 
     # ToDo: Substituting the setup replace variables
 
-    # replace_setting_variables();
-
     $value =~ s/^\s*\<//;
     $value =~ s/\>\s*$//;
 
@@ -577,14 +574,12 @@ sub insert_into_config_file
 
     if (!($oneconfig->{'isisocode'} ))  # this is the simpe case
     {
-        # my $valueline = '<value SEPARATORPART>VALUECONTENT</value>' . "\n";
         $newvalueline = $valueline;
         $newvalueline =~ s/VALUECONTENT/$value/g;
         $newvalueline =~ s/SEPARATORPART/$separatorpart/;
     }
     else
     {
-        # my $langvalueline = '<value xml:lang="SAVEDLANGUAGE">VALUECONTENT</value>' . "\n";
         $newvalueline = $langvalueline;
         $newvalueline =~ s/VALUECONTENT/$value/;
         my $savedlanguage = $oneconfig->{'Key'};
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 20bc2efdcf4f..3f6b43f563fb 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -77,7 +77,6 @@ sub check_system_path
 {
     # The following files have to be found in the environment variable PATH
     # All platforms: zip
-    # Windows only: msvcp70.dll, msvcr70.dll for regcomp.exe
     # Windows only: "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe" for msi database and packaging
 
     my $onefile;
@@ -87,9 +86,14 @@ sub check_system_path
 
     if( $^O =~ /cygwin/i )
     {   # When using cygwin's perl the PATH variable is POSIX style and ...
-        $pathvariable = qx{cygpath -mp "$pathvariable"} ;
+        my $temparrayref = installer::converter::convert_stringlist_into_array_without_newline(\$pathvariable, $local_pathseparator);
+        foreach $i (0..$#$temparrayref) {
+            $$temparrayref[$i] = qx{cygpath -m "$$temparrayref[$i]"};
+            chomp($$temparrayref[$i]);
+        }
         # has to be converted to DOS style for further use.
         $local_pathseparator = ';';
+        $pathvariable = join($local_pathseparator, @$temparrayref);
     }
     my $patharrayref = installer::converter::convert_stringlist_into_array(\$pathvariable, $local_pathseparator);
 
@@ -100,19 +104,6 @@ sub check_system_path
     if (($installer::globals::iswin) && ($installer::globals::iswindowsbuild))
     {
         @needed_files_in_path = ("zip.exe", "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe");
-
-        if ( $installer::globals::compiler eq "wntmsci8" )
-        {
-            push(@needed_files_in_path, "msvcp70.dll");
-            push(@needed_files_in_path, "msvcr70.dll");
-        }
-
-        if ( $installer::globals::compiler eq "wntmsci10" )
-        {
-            push(@needed_files_in_path, "msvcp71.dll");
-            push(@needed_files_in_path, "msvcr71.dll");
-        }
-
     }
     elsif ($installer::globals::iswin)
     {
@@ -341,11 +332,11 @@ sub check_logfile
         # Errors are all errors, but not the Windows installer table "Error.idt"
 
         my $compareline = $line;
-        $compareline =~ s/Error\.idt//g;    # removing all occurences of "Error.idt"
-        $compareline =~ s/Error\.mlf//g;    # removing all occurences of "Error.mlf"
-        $compareline =~ s/Error\.ulf//g;    # removing all occurences of "Error.ulf"
-        $compareline =~ s/Error\.idl//g;    # removing all occurences of "Error.idl"
-        $compareline =~ s/Error\.html//g;   # removing all occurences of "Error.html"
+        $compareline =~ s/Error\.idt//g;    # removing all occurrences of "Error.idt"
+        $compareline =~ s/Error\.mlf//g;    # removing all occurrences of "Error.mlf"
+        $compareline =~ s/Error\.ulf//g;    # removing all occurrences of "Error.ulf"
+        $compareline =~ s/Error\.idl//g;    # removing all occurrences of "Error.idl"
+        $compareline =~ s/Error\.html//g;   # removing all occurrences of "Error.html"
 
         if ( $compareline =~ /\bError\b/i )
         {
@@ -364,7 +355,7 @@ sub check_logfile
     {
         my $line = "\n*********************************************************************\n";
         push(@output, $line);
-        $line = "ERROR: The following errors occured in packaging process:\n\n";
+        $line = "ERROR: The following errors occurred in packaging process:\n\n";
         push(@output, $line);
 
         for ( my $i = 0; $i <= $#errors; $i++ )
@@ -375,7 +366,6 @@ sub check_logfile
 
         $line = "*********************************************************************\n";
         push(@output, $line);
-#       exit(-1);
     }
     else
     {
@@ -440,7 +430,6 @@ sub determine_ship_directory
     {
         my $number_of_languages = installer::systemactions::get_number_of_langs($languagestring);
         chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
-        # $languagestring = $shorter;
         my $id = substr($shorter, 0, 8); # taking only the first 8 digits
         $languagestring = "lang_" . $number_of_languages . "_id_" . $id;
     }
@@ -455,6 +444,7 @@ sub determine_ship_directory
     }
 
     if ( $installer::globals::languagepack ) { $productstring = $productstring . "_languagepack"; }
+    if ( $installer::globals::helppack ) { $productstring = $productstring . "_helppack"; }
     if ( $installer::globals::patch ) { $productstring = $productstring . "_patch"; }
 
     my $destdir = $shipdrive . $installer::globals::separator . $installer::globals::compiler .
@@ -654,11 +644,6 @@ sub read_encodinglist
 
     $installer::globals::msiencoding = \%msiencoding;
     $installer::globals::msilanguage = \%msilanguage;
-
-    # my $key;
-    # foreach $key (keys %{$installer::globals::msiencoding}) { print "A Key: $key : Value: $installer::globals::msiencoding->{$key}\n"; }
-    # foreach $key (keys %{$installer::globals::msilanguage}) { print "B Key: $key : Value: $installer::globals::msilanguage->{$key}\n"; }
-
 }
 
 #############################################################
@@ -720,24 +705,6 @@ sub set_addchildprojects
     push( @installer::globals::globallogfileinfo, $infoline);
 }
 
-####################################################################
-# Setting global variable "$installer::globals::addjavainstaller"
-####################################################################
-
-sub set_addjavainstaller
-{
-    my ($allvariables) = @_;
-
-    if ( $allvariables->{'JAVAINSTALLER'} ) { $installer::globals::addjavainstaller = 1; }
-
-    if ( $installer::globals::patch ) { $installer::globals::addjavainstaller = 0; }
-    if ( $installer::globals::languagepack ) { $installer::globals::addjavainstaller = 0; }
-    if ( $allvariableshashref->{'XPDINSTALLER'} ) { $installer::globals::addjavainstaller = 0; }
-
-    my $infoline = "Value of \$installer::globals::addjavainstaller: $installer::globals::addjavainstaller\n";
-    push( @installer::globals::globallogfileinfo, $infoline);
-}
-
 #######################################################################
 # Setting global variable "$installer::globals::addsystemintegration"
 #######################################################################
@@ -750,6 +717,7 @@ sub set_addsystemintegration
 
     if ( $installer::globals::patch ) { $installer::globals::addsystemintegration = 0; }
     if ( $installer::globals::languagepack ) { $installer::globals::addsystemintegration = 0; }
+    if ( $installer::globals::helppack ) { $installer::globals::addsystemintegration = 0; }
     if (( $installer::globals::packageformat eq "native" ) || ( $installer::globals::packageformat eq "portable" )) { $installer::globals::addsystemintegration = 0; }
 
     my $infoline = "Value of \$installer::globals::addsystemintegration: $installer::globals::addsystemintegration\n";
diff --git a/solenv/bin/modules/installer/converter.pm b/solenv/bin/modules/installer/converter.pm
index beeec52b71ac..53eb1081aa06 100644
--- a/solenv/bin/modules/installer/converter.pm
+++ b/solenv/bin/modules/installer/converter.pm
@@ -39,16 +39,10 @@ sub convert_array_to_hash
 
     my %newhash = ();
 
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
+    for (@{$arrayref})
     {
-        my $line = ${$arrayref}[$i];
-
-        if ( $line =~ /^\s*([\w-]+?)\s+(.*?)\s*$/ )
-        {
-            my $key = $1;
-            my $value = $2;
-            $newhash{$key} = $value;
-        }
+        next unless /^\s*([\w-]+?)\s+(.*?)\s*$/;
+        $newhash{$1} = $2;
     }
 
     return \%newhash;
@@ -58,44 +52,7 @@ sub convert_hash_into_array
 {
     my ($hashref) = @_;
 
-    my @array = ();
-    my $key;
-
-    foreach $key (keys %{$hashref})
-    {
-        my $value = $hashref->{$key};
-        my $input = "$key = $value\n";
-        push(@array ,$input);
-    }
-
-    return \@array
-}
-
-#############################################################################
-# Converting a string list with separator $listseparator
-# into an array
-#############################################################################
-
-sub convert_stringlist_into_array_without_linebreak_and_quotes
-{
-    my ( $includestringref, $listseparator ) = @_;
-
-    my @newarray = ();
-    my $first;
-    my $last = ${$includestringref};
-
-    while ( $last =~ /^\s*(.+?)\Q$listseparator\E(.+)\s*$/) # "$" for minimal matching
-    {
-        $first = $1;
-        $last = $2;
-        $first =~ s/\"//g;
-        push(@newarray, $first);
-    }
-
-    $last =~ s/\"//g;
-    push(@newarray, $last);
-
-    return \@newarray;
+    return [map { "$_ = $hashref->{$_}\n" } keys %{$hashref}];
 }
 
 #############################################################################
@@ -107,22 +64,7 @@ sub convert_stringlist_into_array
 {
     my ( $includestringref, $listseparator ) = @_;
 
-    my @newarray = ();
-    my $first;
-    my $last = ${$includestringref};
-
-    while ( $last =~ /^\s*(.+?)\Q$listseparator\E(.+)\s*$/) # "$" for minimal matching
-    {
-        $first = $1;
-        $last = $2;
-        # Problem with two directly following listseparators. For example a path with two ";;" directly behind each other
-        $first =~ s/^$listseparator//;
-        push(@newarray, "$first\n");
-    }
-
-    push(@newarray, "$last\n");
-
-    return \@newarray;
+    return [map "$_\n", split /\Q$listseparator\E\s*/, ${$includestringref}];
 }
 
 #############################################################################
@@ -134,20 +76,7 @@ sub convert_stringlist_into_array_without_newline
 {
     my ( $includestringref, $listseparator ) = @_;
 
-    my @newarray = ();
-    my $first;
-    my $last = ${$includestringref};
-
-    while ( $last =~ /^\s*(.+?)\Q$listseparator\E(.+)\s*$/) # "$" for minimal matching
-    {
-        $first = $1;
-        $last = $2;
-        push(@newarray, "$first");
-    }
-
-    push(@newarray, "$last");
-
-    return \@newarray;
+    return [split /\Q$listseparator\E\s*/, ${$includestringref}];
 }
 
 #############################################################################
@@ -159,20 +88,7 @@ sub convert_stringlist_into_hash
 {
     my ( $includestringref, $listseparator ) = @_;
 
-    my %newhash = ();
-    my $first;
-    my $last = ${$includestringref};
-
-    while ( $last =~ /^\s*(.+?)\Q$listseparator\E(.+)\s*$/) # "$" for minimal matching
-    {
-        $first = $1;
-        $last = $2;
-        $newhash{$first} = 1;
-    }
-
-    $newhash{$last} = 1;
-
-    return \%newhash;
+    return {map {$_, 1} split /\Q$listseparator\E\s*/, ${$includestringref}};
 }
 
 #############################################################################
@@ -184,20 +100,11 @@ sub convert_whitespace_stringlist_into_array
 {
     my ( $includestringref ) = @_;
 
-    my @newarray = ();
-    my $first;
-    my $last = ${$includestringref};
+    my $tmp = ${$includestringref};
+    $tmp = s/^\s+//;
+    $tmp = s/\s+$//;
 
-    while ( $last =~ /^\s*(\S+?)\s+(\S+)\s*$/)  # "$" for minimal matching
-    {
-        $first = $1;
-        $last = $2;
-        push(@newarray, "$first\n");
-    }
-
-    push(@newarray, "$last\n");
-
-    return \@newarray;
+    return [map "$_\n", split /\s+/, $tmp];
 }
 
 #############################################################################
@@ -208,16 +115,13 @@ sub convert_array_to_comma_separated_string
 {
     my ( $arrayref ) = @_;
 
-    my $newstring = "";
-
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {
-        my $arrayentry = ${$arrayref}[$i];
-        $arrayentry =~ s/\s*$//;
-        $newstring = $newstring . $arrayentry . ",";
+    my $newstring;
+    for (@{$arrayref}) {
+        my $tmp = $_;
+        $tmp =~ s/\s+$//;
+        $newstring .= "$tmp,";
     }
-
-    $newstring =~ s/\,\s*$//;
+    $newstring =~ s/\,$//;
 
     return $newstring;
 }
@@ -230,16 +134,13 @@ sub convert_array_to_space_separated_string
 {
     my ( $arrayref ) = @_;
 
-    my $newstring = "";
-
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {
-        my $arrayentry = ${$arrayref}[$i];
-        $arrayentry =~ s/\s*$//;
-        $newstring = $newstring . $arrayentry . " ";
+    my $newstring;
+    for (@{$arrayref}) {
+        my $tmp = $_;
+        $tmp =~ s/\s+$//;
+        $newstring .= "$tmp ";
     }
-
-    $newstring =~ s/\s*$//;
+    $newstring =~ s/ $//;
 
     return $newstring;
 }
@@ -253,9 +154,8 @@ sub convert_slash_to_backslash
 {
     my ($filesarrayref) = @_;
 
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
+    for my $onefile (@{$filesarrayref})
     {
-        my $onefile = ${$filesarrayref}[$i];
         if ( $onefile->{'Name'} ) { $onefile->{'Name'} =~ s/\//\\/g; }
     }
 }
@@ -269,11 +169,7 @@ sub copy_item_object
 {
     my ($olditemhashref, $newitemhashref) = @_;
 
-    foreach $key (keys %{$olditemhashref})
-    {
-        my $value = $olditemhashref->{$key};
-        $newitemhashref->{$key} = $value;
-    }
+    $newitemhashref = {%{$olditemhashref}};
 }
 
 #################################################################
@@ -286,18 +182,9 @@ sub copy_item_object
 sub make_path_conform
 {
     my ( $path ) = @_;
+    my $s = $installer::globals::separator;
 
-    my $oldpath = $path;
-
-    while ( $path =~ /(^.*)(\Q$installer::globals::separator\E.*?[^\.])(\Q$installer::globals::separator\E\.\.)(\Q$installer::globals::separator\E.*$)/ )
-    {
-        my $part1 = $1;
-        my $part2 = $4;
-
-        # $2 must not end with a "." ! Problem with "..\.."
-
-        $path = $part1 . $part2;
-    }
+    while ($path =~ s/[^\.\Q$s\E]+?\Q$s\E\.\.(?:\Q$s\E|$)//g) {}
 
     return $path;
 }
@@ -309,61 +196,7 @@ sub make_path_conform
 
 sub copy_collector
 {
-    my ( $oldcollector ) = @_;
-
-    my @newcollector = ();
-
-    for ( my $i = 0; $i <= $#{$oldcollector}; $i++ )
-    {
-        my %newhash = ();
-        my $key;
-
-        foreach $key (keys %{${$oldcollector}[$i]})
-        {
-            $newhash{$key} = ${$oldcollector}[$i]->{$key};
-        }
-
-        push(@newcollector, \%newhash);
-    }
-
-    return \@newcollector;
-}
-
-#################################################################
-# Copying an array
-#################################################################
-
-sub copy_array_from_references
-{
-    my ( $arrayref ) = @_;
-
-    my @newarray = ();
-
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {
-        push(@newarray, ${$arrayref}[$i]);
-    }
-
-    return \@newarray;
-}
-
-###########################################################
-# Copying a hash
-###########################################################
-
-sub copy_hash_from_references
-{
-    my ($hashref) = @_;
-
-    my %newhash = ();
-    my $key;
-
-    foreach $key (keys %{$hashref})
-    {
-        $newhash{$key} = $hashref->{$key};
-    }
-
-    return \%newhash;
+    return [map { {%{$_}} } @{$_[0]}];
 }
 
 #################################################################
@@ -376,41 +209,11 @@ sub combine_arrays_from_references_first_win
 
     my $hashref1 = convert_array_to_hash($arrayref1);
     my $hashref2 = convert_array_to_hash($arrayref2);
-    my %commonhash = ();
-    my @newarray = ();
-
-    # starting with second hash
-    foreach my $key ( keys %{$hashref2} ) { $commonhash{$key} = $hashref2->{$key}; }
-    # overwriting with first hash
-    foreach my $key ( keys %{$hashref1} ) { $commonhash{$key} = $hashref1->{$key}; }
-
-    # Creating the new array
-    foreach my $key ( keys %commonhash ) { push(@newarray, "$key $commonhash{$key}\n"); }
-
-    return \@newarray;
-}
 
-#################################################################
-# Combining two arrays
-#################################################################
-
-sub combine_arrays_from_references
-{
-    my ( $arrayref1, $arrayref2 ) = @_;
-
-    my @newarray = ();
-
-    for ( my $i = 0; $i <= $#{$arrayref1}; $i++ )
-    {
-        push(@newarray, ${$arrayref1}[$i]);
-    }
-
-    for ( my $i = 0; $i <= $#{$arrayref2}; $i++ )
-    {
-        push(@newarray, ${$arrayref2}[$i]);
-    }
+    # add key-value pairs from hash1 to hash2 (overwrites existing keys)
+    @{$hashref2}{keys %{$hashref1}} = values %{$hashref1};
 
-    return \@newarray;
+    return [map { "$_ $hashref2->{$_}\n" } keys %{$hashref2}];
 }
 
 #################################################################
@@ -453,9 +256,9 @@ sub resolve_masked_separator
 {
     my ($arrayref, $separator, $replacementstring) = @_;
 
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
+    for (@{$arrayref})
     {
-        ${$arrayref}[$i] =~ s/$replacementstring/$separator/g
+        s/$replacementstring/$separator/g;
     }
 }
 
diff --git a/solenv/bin/modules/installer/copyproject.pm b/solenv/bin/modules/installer/copyproject.pm
index 5db9cf7f8b04..8157db4983f8 100644
--- a/solenv/bin/modules/installer/copyproject.pm
+++ b/solenv/bin/modules/installer/copyproject.pm
@@ -32,7 +32,6 @@ use installer::converter;
 use installer::files;
 use installer::globals;
 use installer::logger;
-use installer::mail;
 use installer::systemactions;
 use installer::worker;
 
@@ -69,17 +68,14 @@ sub copy_project
 
         installer::systemactions::copy_one_file($source, $destination);
 
-        if ( $destination =~ /install\s*$/ )
+        if ( $onefile->{'UnixRights'} )
         {
-            my $localcall = "chmod 775 $destination \>\/dev\/null 2\>\&1";
-            system($localcall);
+            chmod oct($onefile->{'UnixRights'}), $destination;
         }
-
-            if ( $onefile->{'UnixRights'} )
+        elsif ( $destination =~ /install\s*$/ )
         {
-            my $localcall = "chmod $onefile->{'UnixRights'} $destination \>\/dev\/null 2\>\&1";
-            system($localcall);
-            }
+            chmod 0775, $destination;
+        }
     }
 
     # copy ScpActions
@@ -93,16 +89,13 @@ sub copy_project
 
         installer::systemactions::copy_one_file($source, $destination);
 
-        if ( $destination =~ /install\s*$/ )
+        if ( $onefile->{'UnixRights'} )
         {
-            my $localcall = "chmod 775 $destination \>\/dev\/null 2\>\&1";
-            system($localcall);
+            chmod oct($onefile->{'UnixRights'}), $destination;
         }
-
-        if ( $onefile->{'UnixRights'} )
+        elsif ( $destination =~ /install\s*$/ )
         {
-            my $localcall = "chmod $onefile->{'UnixRights'} $destination \>\/dev\/null 2\>\&1";
-            system($localcall);
+            chmod 0775, $destination;
         }
     }
 
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 34f228c791f7..604f7574cc95 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -118,8 +118,7 @@ sub save_script_file
 
     if ( ! $installer::globals::iswindowsbuild )
     {
-        my $localcall = "chmod 775 $newscriptfilename \>\/dev\/null 2\>\&1";
-        system($localcall);
+        chmod 0775, $newscriptfilename;
     }
 
     return $newscriptfilename;
@@ -339,8 +338,7 @@ sub tar_package
         push( @installer::globals::logfileinfo, $infoline);
     }
 
-    my $localcall = "chmod 775 $tarfilename \>\/dev\/null 2\>\&1";
-    $returnvalue = system($localcall);
+    chmod 0775, $tarfilename;
 
     return ( -s $tarfilename );
 }
@@ -422,6 +420,7 @@ sub get_installation_type
     my $type = "";
 
     if ( $installer::globals::languagepack ) { $type = "langpack"; }
+    elsif ( $installer::globals::helppack ) { $type = "helppack"; }
     else { $type = "install"; }
 
     return $type;
@@ -443,14 +442,6 @@ sub get_downloadname_language
         $languages =~ s/_en-US//;
     }
 
-    # en-US is default language and can be removed therefore
-    # for one-language installation sets
-
-    # if ( $languages =~ /^\s*en-US\s*$/ )
-    # {
-    #   $languages = "";
-    # }
-
     if ( length ($languages) > $installer::globals::max_lang_length )
     {
         $languages = 'multi';
@@ -467,25 +458,21 @@ sub get_downloadname_productname
 {
     my ($allvariables) = @_;
 
-    my $start = "OOo";
+    my $start = "LibO";
 
-    if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $start = "OOo"; }
+    if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $start = "LibO"; }
 
-    if ( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) { $start = "OOo-Dev"; }
+    if ( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) { $start = "LibO-Dev"; }
 
-    if (( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "OOo-SDK"; }
+    if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-SDK"; }
 
-    if (( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "OOo-Dev-SDK"; }
+    if (( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-Dev-SDK"; }
 
-    if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "OOo-URE"; }
+    if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "LibO-URE"; }
 
-    if ( $allvariables->{'PRODUCTNAME'} eq "BrOffice.org" ) { $start = "BrOo"; }
+    if ( $allvariables->{'PRODUCTNAME'} eq "OxygenOffice" ) { $start = "OOOP"; }
 
-    if ( $allvariables->{'PRODUCTNAME'} eq "BrOo-dev" ) { $start = "BrOo-Dev"; }
 
-    if (( $allvariables->{'PRODUCTNAME'} eq "BrOffice.org" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "BrOo-SDK"; }
-
-    if (( $allvariables->{'PRODUCTNAME'} eq "BrOo-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "BrOo-Dev-SDK"; }
 
     return $start;
 }
@@ -592,7 +579,6 @@ sub get_download_platformname
     }
     else
     {
-        # $platformname = $installer::globals::packageformat;
         $platformname = $installer::globals::compiler;
     }
 
@@ -657,12 +643,31 @@ sub get_install_type
     {
         $type = "langpack";
 
-        if ( $installer::globals::islinuxrpmbuild )
+        if ( $installer::globals::isrpmbuild )
         {
             $type = $type . "-rpm";
         }
 
-        if ( $installer::globals::islinuxdebbuild )
+        if ( $installer::globals::isdebbuild )
+        {
+            $type = $type . "-deb";
+        }
+
+        if ( $installer::globals::packageformat eq "archive" )
+        {
+            $type = $type . "-arc";
+        }
+    }
+    elsif ( $installer::globals::helppack )
+    {
+        $type = "helppack";
+
+        if ( $installer::globals::isrpmbuild )
+        {
+            $type = $type . "-rpm";
+        }
+
+        if ( $installer::globals::isdebbuild )
         {
             $type = $type . "-deb";
         }
@@ -676,12 +681,12 @@ sub get_install_type
     {
         $type = "install";
 
-        if ( $installer::globals::islinuxrpmbuild )
+        if ( $installer::globals::isrpmbuild )
         {
             $type = $type . "-rpm";
         }
 
-        if ( $installer::globals::islinuxdebbuild )
+        if ( $installer::globals::isdebbuild )
         {
             $type = $type . "-deb";
         }
@@ -709,7 +714,7 @@ sub get_downloadname_addon
 {
     my $addon = "";
 
-    if ( $installer::globals::islinuxdebbuild ) { $addon = $addon . "_deb"; }
+    if ( $installer::globals::isdebbuild ) { $addon = $addon . "_deb"; }
 
     if ( $installer::globals::product =~ /_wJRE\s*$/ ) { $addon = "_wJRE"; }
 
@@ -753,7 +758,6 @@ sub get_current_version
     my $infoline = "";
     my $versionstring = "";
     my $filename = "version.info";
-    # $filename = $installer::globals::ooouploaddir . $installer::globals::separator . $filename;
 
     if ( -f $filename )
     {
@@ -778,9 +782,7 @@ sub get_current_version
 ###############################################################################################
 # Setting the download file name
 # Syntax:
-# (PRODUCTNAME)_(VERSION)_(TIMESTAMP)_(OS)_(ARCH)_(INSTALLTYPE)_(LANGUAGE).(FILEEXTENSION)
-# Rules:
-# Timestamp only for Beta and Release Candidate
+# (PRODUCTNAME)_(VERSION)_(OS)_(ARCH)_(INSTALLTYPE)_(LANGUAGE).(FILEEXTENSION)
 ###############################################################################################
 
 sub set_download_filename
@@ -789,7 +791,6 @@ sub set_download_filename
 
     my $start = get_downloadname_productname($allvariables);
     my $versionstring = get_download_version($allvariables);
-    my $date = set_date_string($allvariables);
     my $platform = get_download_platformname();
     my $architecture = get_download_architecture();
     my $type = get_install_type($allvariables);
@@ -797,7 +798,7 @@ sub set_download_filename
 
     # Setting the extension happens automatically
 
-    my $filename = $start . "_" . $versionstring . "_" . $date . "_" . $platform . "_" . $architecture . "_" . $type . "_" . $language;
+    my $filename = $start . "_" . $versionstring . "_" . "_" . $platform . "_" . $architecture . "_" . $type . "_" . $language;
 
     $filename =~ s/\_\_/\_/g;   # necessary, if $versionstring or $platform or $language are empty
     $filename =~ s/\_\s*$//;    # necessary, if $language and $addon are empty
@@ -986,16 +987,16 @@ sub put_windows_productname_into_template
 }
 
 ##################################################################
-# Windows: Including the path to the banner.bmp into nsi template
+# Windows: Substituting the path to a file into the nsi template
 ##################################################################
 
-sub put_banner_bmp_into_template
+sub substitute_path_into_template
 {
-    my ($templatefile, $includepatharrayref, $allvariables) = @_;
+    my ($templatefile, $includepatharrayref, $allvariables, $var, $subst) = @_;
 
-    # my $filename = "downloadbanner.bmp";
-    if ( ! $allvariables->{'DOWNLOADBANNER'} ) { installer::exiter::exit_program("ERROR: DOWNLOADBANNER not defined in product definition!", "put_banner_bmp_into_template"); }
-    my $filename = $allvariables->{'DOWNLOADBANNER'};
+    if ( ! $allvariables->{$var} ) { $var =~ s/_.*$//; } # _BR suffix ?
+    if ( ! $allvariables->{$var} ) { installer::exiter::exit_program("ERROR: $var not defined in product definition!", "substitute_path_into_template"); }
+    my $filename = $allvariables->{$var};
 
     my $completefilenameref = "";
 
@@ -1008,125 +1009,24 @@ sub put_banner_bmp_into_template
         $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$filename, $includepatharrayref, 0);
     }
 
-    if ($$completefilenameref eq "") { installer::exiter::exit_program("ERROR: Could not find download file $filename!", "put_banner_bmp_into_template"); }
+    if ($$completefilenameref eq "") { installer::exiter::exit_program("ERROR: Could not find download file $filename!", "substitute_path_into_template"); }
 
     if ( $^O =~ /cygwin/i ) { $$completefilenameref =~ s/\//\\/g; }
 
-    replace_one_variable($templatefile, "BANNERBMPPLACEHOLDER", $$completefilenameref);
+    replace_one_variable($templatefile, $subst, $$completefilenameref);
 }
 
 ##################################################################
-# Windows: Including the path to the welcome.bmp into nsi template
+# Windows: substitute a variable into the nsi template
 ##################################################################
-
-sub put_welcome_bmp_into_template
+sub substitute_variable_into_template($$$$)
 {
-    my ($templatefile, $includepatharrayref, $allvariables) = @_;
-
-    # my $filename = "downloadbitmap.bmp";
-    if ( ! $allvariables->{'DOWNLOADBITMAP'} ) { installer::exiter::exit_program("ERROR: DOWNLOADBITMAP not defined in product definition!", "put_welcome_bmp_into_template"); }
-    my $filename = $allvariables->{'DOWNLOADBITMAP'};
-
-    my $completefilenameref = "";
-
-    if ( $installer::globals::include_pathes_read )
-    {
-        $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 0);
-    }
-    else
-    {
-        $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$filename, $includepatharrayref, 0);
-    }
+    my ($templatefile, $variableshashref, $varname, $subst) = @_;
 
-    if ($$completefilenameref eq "") { installer::exiter::exit_program("ERROR: Could not find download file $filename!", "put_welcome_bmp_into_template"); }
+    my $var = "";
+    if ( $variableshashref->{$varname} ) { $var = $variableshashref->{$varname}; }
 
-    if ( $^O =~ /cygwin/i ) { $$completefilenameref =~ s/\//\\/g; }
-
-    replace_one_variable($templatefile, "WELCOMEBMPPLACEHOLDER", $$completefilenameref);
-}
-
-##################################################################
-# Windows: Including the path to the setup.ico into nsi template
-##################################################################
-
-sub put_setup_ico_into_template
-{
-    my ($templatefile, $includepatharrayref, $allvariables) = @_;
-
-    # my $filename = "downloadsetup.ico";
-    if ( ! $allvariables->{'DOWNLOADSETUPICO'} ) { installer::exiter::exit_program("ERROR: DOWNLOADSETUPICO not defined in product definition!", "put_setup_ico_into_template"); }
-    my $filename = $allvariables->{'DOWNLOADSETUPICO'};
-
-    my $completefilenameref = "";
-
-    if ( $installer::globals::include_pathes_read )
-    {
-        $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 0);
-    }
-    else
-    {
-        $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$filename, $includepatharrayref, 0);
-    }
-
-    if ($$completefilenameref eq "") { installer::exiter::exit_program("ERROR: Could not find download file $filename!", "put_setup_ico_into_template"); }
-
-    if ( $^O =~ /cygwin/i ) { $$completefilenameref =~ s/\//\\/g; }
-
-    replace_one_variable($templatefile, "SETUPICOPLACEHOLDER", $$completefilenameref);
-}
-
-##################################################################
-# Windows: Including the publisher into nsi template
-##################################################################
-
-sub put_publisher_into_template
-{
-    my ($templatefile) = @_;
-
-    my $publisher = "Sun Microsystems, Inc.";
-
-    replace_one_variable($templatefile, "PUBLISHERPLACEHOLDER", $publisher);
-}
-
-##################################################################
-# Windows: Including the web site into nsi template
-##################################################################
-
-sub put_website_into_template
-{
-    my ($templatefile) = @_;
-
-    my $website = "http\:\/\/www\.sun\.com\/staroffice";
-
-    replace_one_variable($templatefile, "WEBSITEPLACEHOLDER", $website);
-}
-
-##################################################################
-# Windows: Including the Java file name into nsi template
-##################################################################
-
-sub put_javafilename_into_template
-{
-    my ($templatefile, $variableshashref) = @_;
-
-    my $javaversion = "";
-
-    if ( $variableshashref->{'WINDOWSJAVAFILENAME'} ) { $javaversion = $variableshashref->{'WINDOWSJAVAFILENAME'}; }
-
-    replace_one_variable($templatefile, "WINDOWSJAVAFILENAMEPLACEHOLDER", $javaversion);
-}
-
-##################################################################
-# Windows: Including the product version into nsi template
-##################################################################
-
-sub put_windows_productversion_into_template
-{
-    my ($templatefile, $variableshashref) = @_;
-
-    my $productversion = $variableshashref->{'PRODUCTVERSION'};
-
-    replace_one_variable($templatefile, "PRODUCTVERSIONPLACEHOLDER", $productversion);
+    replace_one_variable($templatefile, $subst, $var);
 }
 
 ##################################################################
@@ -1139,13 +1039,9 @@ sub put_windows_productpath_into_template
 
     my $productpath = $variableshashref->{'PROPERTYTABLEPRODUCTNAME'};
 
-    my $locallangs = $$languagestringref;
-    $locallangs =~ s/_/ /g;
     if (length($locallangs) > $installer::globals::max_lang_length) { $locallangs = "multi lingual"; }
 
-    if ( ! $installer::globals::languagepack ) { $productpath = $productpath . " (" . $locallangs . ")"; }
-
-    # if (( $installer::globals::languagepack ) && ( $installer::globals::unicodensis )) { $productpath = convert_textstring_to_utf16($productpath, $localnsisdir, "stringhelper.txt"); }
+    if ( ! $installer::globals::languagepack || ! $installer::globals::helppack ) { $productpath = $productpath . " (" . sprintf('%x', time()) . ")"; }
 
     replace_one_variable($templatefile, "PRODUCTPATHPLACEHOLDER", $productpath);
 }
@@ -1295,14 +1191,12 @@ sub nsis_language_converter
     elsif ( $language eq "ja" ) { $nsislanguage = "Japanese"; }
     elsif ( $language eq "ko" ) { $nsislanguage = "Korean"; }
     elsif ( $language eq "th" ) { $nsislanguage = "Thai"; }
-    elsif ( $language eq "vi" ) { $nsislanguage = "Vietnamese"; }
     elsif ( $language eq "zh-CN" ) { $nsislanguage = "SimpChinese"; }
     elsif ( $language eq "zh-TW" ) { $nsislanguage = "TradChinese"; }
     else {
         my $infoline = "NSIS language_converter : Could not find nsis language for $language!\n";
         push( @installer::globals::logfileinfo, $infoline);
         $nsislanguage = "English";
-        # installer::exiter::exit_program("ERROR: Could not find nsis language for $language!", "nsis_language_converter");
     }
 
     return $nsislanguage;
@@ -1442,7 +1336,7 @@ sub get_language_string_from_language_block
 ##################################################################
 # Windows: Replacing strings in NSIS nsh file
 # nsh file syntax:
-# !define MUI_TEXT_DIRECTORY_TITLE "Zielverzeichnis ausw�hlen"
+# !define MUI_TEXT_DIRECTORY_TITLE "Zielverzeichnis ausw�hlen"
 ##################################################################
 
 sub replace_identifier_in_nshfile
@@ -1531,8 +1425,6 @@ sub convert_utf16_to_utf8
     my $savfilename = $filename . "_before.utf16";
     installer::systemactions::copy_one_file($filename, $savfilename);
 
-#   open( IN, "<:utf16", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_utf16_to_utf8");
-#   open( IN, "<:para:crlf:uni", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_utf16_to_utf8");
     open( IN, "<:encoding(UTF16-LE)", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_utf16_to_utf8");
     while ( $line = <IN> ) {
         push @localfile, $line;
@@ -1757,12 +1649,6 @@ sub get_path_to_nsis_sdk
         $nsispath = $ENV{'NSISSDK_SOURCE'}; # overriding the NSIS SDK with NSISSDK_SOURCE
     }
 
-#   if( ($^O =~ /cygwin/i) and $nsispath =~ /\\/ ) {
-#       # We need a POSIX path for W32-4nt-cygwin-perl
-#       $nsispath =~ s/\\/\\\\/g;
-#       chomp( $nsispath = qx{cygpath -u "$nsispath"} );
-#   }
-
     if ( $nsispath eq "" )
     {
         installer::logger::print_message( "... no Environment variable \"SOLARROOT\", \"NSIS_PATH\" or \"NSISSDK_SOURCE\" found and NSIS not found in path!", "get_path_to_nsis_sdk");
@@ -1788,7 +1674,7 @@ sub call_nsis
 
     if( $^O =~ /cygwin/i ) { $nsifile =~ s/\\/\//g; }
 
-    my $systemcall = "$makensisexe $nsifile |";
+    my $systemcall = "$makensisexe /V4 /DMUI_VERBOSE=4 $nsifile |";
 
     my $infoline = "Systemcall: $systemcall\n";
     push( @installer::globals::logfileinfo, $infoline);
@@ -1838,7 +1724,8 @@ sub replace_variables
 {
     my ($translationfile, $variableshashref) = @_;
 
-    foreach $key (keys %{$variableshashref})
+    # we want to substitute FOO_BR before FOO to avoid floating _BR suffixes
+    foreach $key (sort { length ($b) <=> length ($a) } keys %{$variableshashref})
     {
         my $value = $variableshashref->{$key};
 
@@ -1877,9 +1764,6 @@ sub remove_english_for_nsis_installer
 {
     my ($languagestringref, $languagesarrayref) = @_;
 
-    # $$languagestringref =~ s/en-US_//;
-    # shift(@{$languagesarrayref});
-
     @{$languagesarrayref} = ("en-US");  # only english for NSIS installer!
 }
 
@@ -1891,7 +1775,7 @@ sub create_link_tree
 {
     my ($sourcedownloadfile, $destfilename, $versionstring) = @_;
 
-    if ( ! $installer::globals::ooouploaddir ) { installer::exiter::exit_program("ERROR: Directory for OOo upload not defined!", "create_link_tree"); }
+    if ( ! $installer::globals::ooouploaddir ) { installer::exiter::exit_program("ERROR: Directory for LO upload not defined!", "create_link_tree"); }
     my $versiondir = $installer::globals::ooouploaddir . $installer::globals::separator . $versionstring;
     my $infoline = "Directory for the link: $versiondir\n";
     push(@installer::globals::logfileinfo, $infoline);
@@ -1910,7 +1794,7 @@ sub create_link_tree
 }
 
 #######################################################
-# Setting supported platform for Sun OpenOffice.org
+# Setting supported platform for LibreOffice
 # builds
 #######################################################
 
@@ -1918,7 +1802,7 @@ sub is_supported_platform
 {
     my $is_supported = 0;
 
-    if (( $installer::globals::islinuxrpmbuild ) ||
+    if (( $installer::globals::isrpmbuild ) ||
         ( $installer::globals::issolarissparcbuild ) ||
         ( $installer::globals::issolarisx86build ) ||
         ( $installer::globals::iswindowsbuild ))
@@ -1955,7 +1839,7 @@ sub create_download_sets
     my $lastdir = $installationdir;
     installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$lastdir);
 
-    if ( $lastdir =~ /\./ ) { $lastdir =~ s/\./_download_inprogress\./ }
+    if ( $installer::globals::iswindowsbuild && $lastdir =~ /\./ ) { $lastdir =~ s/\./_download_inprogress\./ }
     else { $lastdir = $lastdir . "_download_inprogress"; }
 
     # removing existing directory "_native_packed_inprogress" and "_native_packed_witherror" and "_native_packed"
@@ -2081,13 +1965,27 @@ sub create_download_sets
 
         # add product name into script template
         put_windows_productname_into_template($templatefile, $allvariableshashref);
-        put_banner_bmp_into_template($templatefile, $includepatharrayref, $allvariableshashref);
-        put_welcome_bmp_into_template($templatefile, $includepatharrayref, $allvariableshashref);
-        put_setup_ico_into_template($templatefile, $includepatharrayref, $allvariableshashref);
-        put_publisher_into_template($templatefile);
-        put_website_into_template($templatefile);
-        put_javafilename_into_template($templatefile, $allvariableshashref);
-        put_windows_productversion_into_template($templatefile, $allvariableshashref);
+        @path_substs = (
+            'DOWNLOADBANNER' => 'BANNERBMPPLACEHOLDER',
+            'DOWNLOADBITMAP' => 'WELCOMEBMPPLACEHOLDER',
+            'DOWNLOADSETUPICO' => 'SETUPICOPLACEHOLDER'
+        );
+        while (@path_substs) {
+            my $var= shift @path_substs;
+            my $val = shift @path_substs;
+            substitute_path_into_template($templatefile, $includepatharrayref,
+                                          $allvariableshashref, $var, $val);
+        }
+        %var_substs = (
+            'OOOVENDOR' => 'PUBLISHERPLACEHOLDER',
+            'STARTCENTER_INFO_URL' => 'WEBSITEPLACEHOLDER',
+            'WINDOWSJAVAFILENAME' => 'WINDOWSJAVAFILENAMEPLACEHOLDER',
+            'PRODUCTVERSION' => 'PRODUCTVERSIONPLACEHOLDER'
+        );
+        for $var (keys %var_substs) {
+            substitute_variable_into_template($templatefile, $allvariableshashref,
+                                              $var, $var_substs{$var});
+        }
         put_windows_productpath_into_template($templatefile, $allvariableshashref, $languagestringref, $localnsisdir);
         put_outputfilename_into_template($templatefile, $downloadname);
         put_filelist_into_template($templatefile, $installationdir);
@@ -2108,7 +2006,7 @@ sub create_download_sets
 }
 
 ####################################################
-# Creating OOo upload tree
+# Creating LO upload tree
 ####################################################
 
 sub create_download_link_tree
@@ -2157,9 +2055,6 @@ sub create_download_link_tree
                 push( @installer::globals::logfileinfo, $infoline);
 
                 create_link_tree($sourcedownloadfile, $destdownloadfilename, $versionstring);
-                # my $md5sumoutput = call_md5sum($downloadfile);
-                # my $md5sum = get_md5sum($md5sumoutput);
-
             }
         }
         else
diff --git a/solenv/bin/modules/installer/downloadsigner.pm b/solenv/bin/modules/installer/downloadsigner.pm
index aa3bbb25a484..8a63242e0685 100644
--- a/solenv/bin/modules/installer/downloadsigner.pm
+++ b/solenv/bin/modules/installer/downloadsigner.pm
@@ -91,8 +91,6 @@ Ende
 
 sub getparameter
 {
-    # installer::logger::print_message("Checking parameter");
-
     while ( $#ARGV >= 0 )
     {
         my $param = shift(@ARGV);
@@ -347,7 +345,6 @@ sub check_cws_build
     my $iscws = 1;
 
     if ( $filename =~ /follow_me_\d+_/ ) { $iscws = 0; }
-    # if ( $filename =~ /log_\d+_/ ) { $iscws = 0; }
 
     return $iscws;
 }
@@ -414,6 +411,11 @@ sub filter_all_files_with_correct_settings
     my $workstamp = "";
 
     if ( $ENV{'WORK_STAMP'} ) { $workstamp = $ENV{'WORK_STAMP'}; }
+
+    # This is broken, we don't want to support any UPDMINOR
+    # complexities in LibreOffice. (Or do we?) This needs updating if
+    # we want to actually use this file for signing.
+
     if ( $ENV{'UPDMINOR'} ) { $minor = $ENV{'UPDMINOR'}; }
 
     if ( $minor eq "" ) { installer::exiter::exit_program("ERROR: Environment variable \"UPDMINOR\" not set!", "filter_all_files_with_correct_settings"); }
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index c0d166081032..c80d8375f3c2 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -47,7 +47,6 @@ sub create_pathvariables
     $variables{'solarpath'} = $solarpath;
 
     my $solarcommonpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . "common" . $installer::globals::productextension;
-    # my $solarcommonpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . $environment->{'COMMON_OUTDIR'} . $installer::globals::productextension;
     $variables{'solarcommonpath'} = $solarcommonpath;
 
     my $osdef = lc($environment->{'GUI'});
@@ -110,10 +109,8 @@ sub set_global_environment_variables
     my ( $environment ) = @_;
 
     $installer::globals::build = $environment->{'WORK_STAMP'};
-    # $installer::globals::minor = $environment->{'UPDMINOR'};
     $installer::globals::compiler = $environment->{'OUTPATH'};
 
-    if ( $ENV{'UPDMINOR'} ) { $installer::globals::minor = $ENV{'UPDMINOR'}; }
     if ( $ENV{'LAST_MINOR'} ) { $installer::globals::lastminor = $ENV{'LAST_MINOR'}; }
 
     if ( $ENV{'PROEXT'} ) { $installer::globals::pro = 1; }
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 119eb95e0b7c..682967ed0647 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -228,14 +228,10 @@ sub put_directories_into_epmfile
 
         if ( $onedir->{'Dir'} ) { $dir = $onedir->{'Dir'}; }
 
-        # if (!($dir =~ /\bPREDEFINED_/ ))
         if ((!($dir =~ /\bPREDEFINED_/ )) || ( $dir =~ /\bPREDEFINED_PROGDIR\b/ ))
         {
             my $hostname = $onedir->{'HostName'};
 
-            # not including simple directory "/opt"
-            # if (( $allvariables->{'SETSTATICPATH'} ) && ( $hostname eq $packagerootpath )) { next; }
-
             my $line = "d 755 root $group $hostname -\n";
 
             push(@{$epmfileref}, $line)
@@ -322,7 +318,7 @@ sub create_epm_header
 
     my @epmheader = ();
 
-    my ($licensefilename, $readmefilename);
+    my ($licensefilename, $readmefilename, $readmefilenameen);
 
     my $foundlicensefile = 0;
     my $foundreadmefile = 0;
@@ -330,11 +326,11 @@ sub create_epm_header
     my $line = "";
     my $infoline = "";
 
-    # %product OpenOffice.org Software
+    # %product LibreOffice Software
     # %version 2.0
     # %description A really great software
     # %copyright 1999-2003 by OOo
-    # %vendor OpenOffice.org
+    # %vendor LibreOffice
     # %license /test/replace/01/LICENSE01
     # %readme /test/replace/01/README01
     # %requires foo
@@ -356,7 +352,6 @@ sub create_epm_header
     # Determining the release version
     # This release version has to be listed in the line %version : %version versionnumber releasenumber
 
-    # if ( $variableshashref->{'PACKAGEVERSION'} ) { $installer::globals::packageversion = $variableshashref->{'PACKAGEVERSION'}; }
     if ( ! $onepackage->{'packageversion'} ) { installer::exiter::exit_program("ERROR: No packageversion defined for package: $onepackage->{'module'}!", "create_epm_header"); }
     $installer::globals::packageversion = $onepackage->{'packageversion'};
     installer::packagelist::resolve_packagevariables(\$installer::globals::packageversion, $variableshashref, 0);
@@ -366,7 +361,7 @@ sub create_epm_header
     push(@epmheader, $line);
 
     $line = "%release" . " " . $installer::globals::packagerevision . "\n";
-    if ( $installer::globals::islinuxrpmbuild ) { $line = "%release" . " " . $installer::globals::buildid . "\n"; }
+    if ( $installer::globals::isrpmbuild ) { $line = "%release" . " " . $installer::globals::buildid . "\n"; }
     push(@epmheader, $line);
 
     # Description, Copyright and Vendor are multilingual and are defined in
@@ -393,24 +388,27 @@ sub create_epm_header
     {
         $licensefilename = "license.txt";
         $readmefilename = "readme.txt";
+        $readmefilenameen = "readme_en-US.txt";
     }
     else
     {
         $licensefilename = "LICENSE";
         $readmefilename = "README";
+        $readmefilenameen = "README_en-US";
     }
 
-    if (( $installer::globals::languagepack )   # in language packs the files LICENSE and README are removed, because they are not language specific
+    if (( $installer::globals::languagepack )   # in language packs and help packs the files LICENSE and README are removed, because they are not language specific
+        || ( $installer::globals::helppack )
         || ( $variableshashref->{'NO_README_IN_ROOTDIR'} ))
     {
         if ( $installer::globals::iswindowsbuild )
         {
-            $licensefilename = "license_$searchlanguage.txt";
+            $licensefilename = "license.txt"; # _$searchlanguage.txt";
             $readmefilename = "readme_$searchlanguage.txt";
         }
         else
         {
-            $licensefilename = "LICENSE_$searchlanguage";
+            $licensefilename = "LICENSE"; # _$searchlanguage";
             $readmefilename = "README_$searchlanguage";
         }
     }
@@ -437,18 +435,41 @@ sub create_epm_header
             $license_in_package_defined = 1;
         }
     }
-    # searching for and readme file
 
-    for ( my $i = 0; $i <= $#{$filesinproduct}; $i++ )
+    # searching for and readme file;
+    # URE uses special README; others use README_en-US
+    # it does not matter which one is passed for epm if both are packaged
+    foreach my $possiblereadmefilename ($readmefilenameen, $readmefilename)
+    {
+        last if ($foundreadmefile);
+        for ( my $i = 0; $i <= $#{$filesinproduct}; $i++ )
+        {
+            my $onefile = ${$filesinproduct}[$i];
+            my $filename = $onefile->{'Name'};
+            if ( $filename eq $possiblereadmefilename )
+            {
+                $foundreadmefile = 1;
+                $line = "%readme" . " " . $onefile->{'sourcepath'} . "\n";
+                push(@epmheader, $line);
+                last;
+            }
+        }
+    }
+
+    # the readme file need not be packaged more times in the help content
+    # it needs to be installed in parallel with the main package anyway
+    # try to find the README file between all available files (not only between the packaged)
+    if (!($foundreadmefile) && $installer::globals::helppack)
     {
-        my $onefile = ${$filesinproduct}[$i];
-        my $filename = $onefile->{'Name'};
-        if ( $filename eq $readmefilename )
+        my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$readmefilenameen, "" , 0);
+        if($$fileref ne "" )
         {
+            $infoline = "Fallback to readme file: \"$$fileref\"!\n";
+            push(@installer::globals::logfileinfo, $infoline);
+
             $foundreadmefile = 1;
-            $line = "%readme" . " " . $onefile->{'sourcepath'} . "\n";
+            $line = "%readme" . " " . $$fileref . "\n";
             push(@epmheader, $line);
-            last;
         }
     }
 
@@ -507,6 +528,23 @@ sub create_epm_header
                 last;
             }
         }
+
+        # the license file need not be packaged more times in the langpacks
+        # they need to be installed in parallel with the main package anyway
+        # try to find the LICENSE file between all available files (not only between the packaged)
+        if (!($foundlicensefile) && ($installer::globals::languagepack || $installer::globals::helppack))
+        {
+            my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, "" , 0);
+            if($$fileref ne "" )
+            {
+                $infoline = "Fallback to license file: \"$$fileref\"!\n";
+                push(@installer::globals::logfileinfo, $infoline);
+
+                $foundlicensefile = 1;
+                $line = "%license" . " " . $$fileref . "\n";
+                push(@epmheader, $line);
+            }
+        }
     }
 
     if (!($foundlicensefile))
@@ -560,11 +598,11 @@ sub create_epm_header
                 }
             }
 
-            if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'openoffice.org' )
+            if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'libreoffice' )
             {
-                $line = "%provides" . " openoffice.org-unbundled\n";
+                $line = "%provides" . " libreoffice-unbundled\n";
                 push(@epmheader, $line);
-                $line = "%incompat" . " openoffice.org-bundled\n";
+                $line = "%incompat" . " libreoffice-bundled\n";
                 push(@epmheader, $line);
             }
         }
@@ -585,7 +623,7 @@ sub create_epm_header
         $provides = "freebsdprovides";   # the name in the packagelist
         $requires = "freebsdrequires";   # the name in the packagelist
     }
-    elsif (( $installer::globals::islinuxrpmbuild ) &&
+    elsif (( $installer::globals::isrpmbuild ) &&
             ( $installer::globals::patch ) &&
             ( exists($onepackage->{'linuxpatchrequires'}) ))
     {
@@ -598,15 +636,9 @@ sub create_epm_header
         $requires = "requires";         # the name in the packagelist
     }
 
-    # if ( $installer::globals::patch )
-    # {
-    #   $onepackage->{$provides} = "";
         my $isdict = 0;
         if ( $onepackage->{'packagename'} =~ /-dict-/ ) { $isdict = 1;  }
 
-    #   $onepackage->{$requires} = "";
-    # }
-
     if ( $onepackage->{$provides} )
     {
         my $providesstring = $onepackage->{$provides};
@@ -649,19 +681,6 @@ sub create_epm_header
             $onerequires =~ s/\s*$//;
             installer::packagelist::resolve_packagevariables2(\$onerequires, $variableshashref, 0, $isdict);
 
-            # Special handling for Solaris. In depend files, the names of the packages are required, not
-            # only the abbreviation. Therefore there is a special syntax for names in packagelist:
-            # solarisrequires = "SUNWcar (Name="Package name of SUNWcar"),SUNWkvm (Name="Package name of SUNWcar"), ...
-            # if ( $installer::globals::issolarispkgbuild )
-            # {
-            #   if ( $onerequires =~ /^\s*(.*?)\s+\(\s*Name\s*=\s*\"(.*?)\"\s*\)\s*$/ )
-            #   {
-            #       $onerequires = $1;
-            #       $packagename = $2;
-            #       $installer::globals::dependfilenames{$onerequires} = $packagename;
-            #   }
-            # }
-
             $line = "%requires" . " " . $onerequires . "\n";
             push(@epmheader, $line);
         }
@@ -683,19 +702,6 @@ sub create_epm_header
                 $onerequires =~ s/\s*$//;
                 installer::packagelist::resolve_packagevariables(\$onerequires, $variableshashref, 0);
 
-                # Special handling for Solaris. In depend files, the names of the packages are required, not
-                # only the abbreviation. Therefore there is a special syntax for names in packagelist:
-                # solarisrequires = "SUNWcar (Name="Package name of SUNWcar"),SUNWkvm (Name="Package name of SUNWcar"), ...
-                # if ( $installer::globals::issolarispkgbuild )
-                # {
-                #   if ( $onerequires =~ /^\s*(.*?)\s+\(\s*Name\s*=\s*\"(.*?)\"\s*\)\s*$/ )
-                #   {
-                #       $onerequires = $1;
-                #       $packagename = $2;
-                #       $installer::globals::dependfilenames{$onerequires} = $packagename;
-                #   }
-                # }
-
                 $line = "%requires" . " " . $onerequires . "\n";
                 push(@epmheader, $line);
             }
@@ -762,8 +768,6 @@ sub replace_many_variables_in_shellscripts
     foreach $key (keys %{$variableshashref})
     {
         my $value = $variableshashref->{$key};
-        # $value = lc($value);  # lowercase !
-        # if ( $installer::globals::issolarisbuild) { $value =~ s/\.org/org/g; }    # openofficeorg instead of openoffice.org
         replace_variable_in_shellscripts($scriptref, $value, $key);
     }
 }
@@ -776,8 +780,6 @@ sub adding_shellscripts_to_epm_file
 {
     my ($epmfileref, $shellscriptsfilename, $localrootpath, $allvariableshashref, $filesinpackage) = @_;
 
-    # $installer::globals::shellscriptsfilename
-
     push( @{$epmfileref}, "\n\n" );
 
     my $shellscriptsfileref = installer::files::read_file($shellscriptsfilename);
@@ -880,7 +882,7 @@ sub set_patch_state
         push( @installer::globals::logfileinfo, $infoline);
     }
 
-    if ( ( $installer::globals::is_special_epm ) && (($installer::globals::islinuxrpmbuild) || ($installer::globals::issolarispkgbuild)) )
+    if ( ( $installer::globals::is_special_epm ) && (($installer::globals::isrpmbuild) || ($installer::globals::issolarispkgbuild)) )
     {
         # Special postprocess handling only for Linux RPM and Solaris packages
         $installer::globals::postprocess_specialepm = 1;
@@ -994,7 +996,7 @@ sub add_one_line_into_file
         push(@{$file}, $insertline);        # simply adding at the end of pkginfo file
     }
 
-    if ( $installer::globals::islinuxrpmbuild )
+    if ( $installer::globals::isrpmbuild )
     {
         # Adding behind the line beginning with: Group:
 
@@ -1080,8 +1082,6 @@ sub set_revision_in_pkginfo
                 my $finalminor = $minor;
                 my $finalmicro = 0;
 
-                # if (( $packagename =~ /-ure\s*$/ ) && ( $finalmajor == 1 )) { $finalminor = 4; }
-
                 $version = "$finalmajor.$finalminor.$finalmicro";
             }
 
@@ -1326,7 +1326,6 @@ sub set_topdir_in_specfile
 {
     my ($changefile, $filename, $newepmdir) = @_;
 
-    # $newepmdir =~ s/^\s*\.//; # removing leading "."
     $newepmdir = cwd() . $installer::globals::separator . $newepmdir; # only absolute path allowed
 
     # removing "%define _topdir", if existing
@@ -1695,7 +1694,7 @@ sub set_tab_into_datafile
         $newclassesstring = installer::converter::convert_array_to_space_separated_string(\@newclasses);
     }
 
-    if ( $installer::globals::islinuxrpmbuild )
+    if ( $installer::globals::isrpmbuild )
     {
         for ( my $i = 0; $i <= $#{$filesref}; $i++ )
         {
@@ -1927,11 +1926,6 @@ sub include_patchinfos_into_pkginfo
     }
     $newline = "SUNW_PATCH_PROPERTIES=\n";
     add_one_line_into_file($changefile, $newline, $filename);
-    # $newline = "SUNW_PKGTYPE=usr\n";
-    # add_one_line_into_file($changefile, $newline, $filename);
-
-    # $newline = "SUNW_PKGVERS=1.0\n";
-    # add_one_line_into_file($changefile, $newline, $filename);
 }
 
 ############################################################
@@ -2019,7 +2013,7 @@ sub collect_patch_files
     {
         my $line = ${$file}[$i];
 
-        if ( $installer::globals::islinuxrpmbuild )
+        if ( $installer::globals::isrpmbuild )
         {
             # %attr(0444,root,root) "/opt/openofficeorg20/program/about.bmp"
 
@@ -2109,9 +2103,8 @@ sub prepare_packages
         $newline = "BASEDIR\=" . $localrelocatablepath . "\n";
     }
 
-    if ( $installer::globals::islinuxrpmbuild )
+    if ( $installer::globals::isrpmbuild )
     {
-        # if ( $localrelocatablepath =~ /^\s*$/ ) { $localrelocatablepath = "/"; }; # at least the "/"
         $filename =  $packagename . ".spec";
         $newline = "Prefix\:\ " . $localrelocatablepath . "\n";
     }
@@ -2126,12 +2119,9 @@ sub prepare_packages
         installer::files::save_file($completefilename, $changefile);
     }
 
-    # my $newepmdir = $completefilename;
-    # installer::pathanalyzer::get_path_from_fullqualifiedname(\$newepmdir);
-
     # adding new "topdir" and removing old "topdir" in specfile
 
-    if ( $installer::globals::islinuxrpmbuild )
+    if ( $installer::globals::isrpmbuild )
     {
         set_topdir_in_specfile($changefile, $filename, $newepmdir);
         set_autoprovreq_in_specfile($changefile, $onepackage->{'findrequires'}, "$installer::globals::unpackpath" . "/bin");
@@ -2139,7 +2129,6 @@ sub prepare_packages
         if ( is_extension_package($changefile) ) { set_prereq_in_specfile($changefile); }
         set_license_in_specfile($changefile, $variableshashref);
         set_tab_into_datafile($changefile, $filesref);
-        # check_requirements_in_specfile($changefile);
         installer::files::save_file($completefilename, $changefile);
         if ( $installer::globals::patch ) { collect_patch_files($changefile, $packagename, $localrelocatablepath); }
     }
@@ -2253,7 +2242,6 @@ sub determine_rpm_version
     my $rpmout = "";
     my $systemcall = "";
 
-    # my $systemcall = "rpm --version |";
     # "rpm --version" has problems since LD_LIBRARY_PATH was removed. Therefore the content of $RPM has to be called.
     # "rpm --version" and "rpmbuild --version" have the same output. Therefore $RPM can be used. Its value
     # is saved in $installer::globals::rpm
@@ -2362,7 +2350,6 @@ sub create_packages_without_epm
         installer::pathanalyzer::get_path_from_fullqualifiedname(\$destinationdir);
         $destinationdir =~ s/\/\s*$//;  # removing ending slashes
 
-        # my $systemcall = "pkgmk -o -f $prototypefile -d $destinationdir \> /dev/null 2\>\&1";
         my $systemcall = "pkgmk -l 1073741824 -o -f $prototypefile -d $destinationdir 2\>\&1 |";
         installer::logger::print_message( "... $systemcall ...\n" );
 
@@ -2429,7 +2416,7 @@ sub create_packages_without_epm
                 # Setting unix rights to "775" for all created directories inside the package,
                 # that is saved in temp directory
 
-                $systemcall = "cd $packagestempdir; find $packagename -type d -exec chmod 775 \{\} \\\;";
+                $systemcall = "cd $packagestempdir; find $packagename -type d | xargs -i chmod 775 \{\} \;";
                 installer::logger::print_message( "... $systemcall ...\n" );
 
                 $returnvalue = system($systemcall);
@@ -2492,7 +2479,7 @@ sub create_packages_without_epm
 
         # Setting unix rights to "775" for all created directories inside the package
 
-        $systemcall = "cd $destinationdir; find $packagename -type d -exec chmod 775 \{\} \\\;";
+        $systemcall = "cd $destinationdir; find $packagename -type d | xargs -i chmod 775 \{\} \;";
         installer::logger::print_message( "... $systemcall ...\n" );
 
         $returnvalue = system($systemcall);
@@ -2511,6 +2498,7 @@ sub create_packages_without_epm
             push( @installer::globals::logfileinfo, $infoline);
         }
 
+
         ######################
         # making pkg files
         ######################
@@ -2526,13 +2514,13 @@ sub create_packages_without_epm
 
         # if ($returnvalue)
         # {
-        #   $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        #   push( @installer::globals::logfileinfo, $infoline);
+        # $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
+        # push( @installer::globals::logfileinfo, $infoline);
         # }
         # else
         # {
-        #   $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        #   push( @installer::globals::logfileinfo, $infoline);
+        # $infoline = "Success: Executed \"$systemcall\" successfully!\n";
+        # push( @installer::globals::logfileinfo, $infoline);
         # }
 
         #########################
@@ -2550,35 +2538,34 @@ sub create_packages_without_epm
 
         # if ($returnvalue)
         # {
-        #   $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        #   push( @installer::globals::logfileinfo, $infoline);
+        # $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
+        # push( @installer::globals::logfileinfo, $infoline);
         # }
         # else
         # {
-        #   $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        #   push( @installer::globals::logfileinfo, $infoline);
+        # $infoline = "Success: Executed \"$systemcall\" successfully!\n";
+        # push( @installer::globals::logfileinfo, $infoline);
         # }
+
     }
 
     # Linux: rpm -bb so8m35.spec    ( -> dependency check abklemmen? )
 
-    if ( $installer::globals::islinuxrpmbuild )
+    if ( $installer::globals::isrpmbuild )
     {
         my $specfilename = $epmdir . $packagename . ".spec";
         if (! -f $specfilename) { installer::exiter::exit_program("ERROR: Did not find file: $specfilename", "create_packages_without_epm"); }
 
-        # my $rpmcommand = "rpm";
         my $rpmcommand = $installer::globals::rpm;
         my $rpmversion = determine_rpm_version();
 
-        # if ( $rpmversion >= 4 ) { $rpmcommand = "rpmbuild"; }
-
         # saving globally for later usage
         $installer::globals::rpmcommand = $rpmcommand;
         $installer::globals::rpmquerycommand = "rpm";
 
         my $target = "";
         if ( $installer::globals::compiler =~ /unxlngi/) { $target = "i586"; }
+        elsif ( $installer::globals::compiler =~ /unxaigppc/) { $target = "ppc"; }
         elsif ( $installer::globals::compiler =~ /unxlng/) {$target = (POSIX::uname())[4]; }
 
         # rpm 4.6 ignores buildroot tag in spec file
@@ -2621,7 +2608,6 @@ sub create_packages_without_epm
 
             for ( my $j = 0; $j <= $#rpmoutput; $j++ )
             {
-                # if ( $i < $maxrpmcalls ) { $rpmoutput[$j] =~ s/\bERROR\b/PROBLEM/ig; }
                 $rpmoutput[$j] =~ s/\bERROR\b/PROBLEM/ig;
                 push( @installer::globals::logfileinfo, "$rpmoutput[$j]");
             }
@@ -2724,39 +2710,13 @@ sub remove_temporary_epm_files
             $infoline = "Systemcall: $systemcall\n";
             push( @installer::globals::logfileinfo, $infoline);
         }
-
-        # removing the package
-
-#       my $removedir = $epmdir . $packagename;
-#
-#       my $systemcall = "rm -rf $removedir";
-#
-#       print "... $systemcall ...\n";
-#
-#       my $returnvalue = system($systemcall);
-#
-#       my $infoline = "Systemcall: $systemcall\n";
-#       push( @installer::globals::logfileinfo, $infoline);
-#
-#       if ($returnvalue)
-#       {
-#           $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-#           push( @installer::globals::logfileinfo, $infoline);
-#       }
-#       else
-#       {
-#           $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-#           push( @installer::globals::logfileinfo, $infoline);
-#       }
     }
 
-    if ( $installer::globals::islinuxrpmbuild )
+    if ( $installer::globals::isrpmbuild )
     {
         my $removefile = $epmdir . $packagename . ".spec";
         my $destfile = $loggingdir . $packagename . ".spec.log";
 
-         # if (! -f $removefile) { next; }
-
         my $systemcall = "mv -f $removefile $destfile";
         system($systemcall);     # ignoring the return value
         $infoline = "Systemcall: $systemcall\n";
@@ -2832,13 +2792,17 @@ sub create_new_directory_structure
 
     my $newdir = $installer::globals::epmoutpath;
 
-    if ( $installer::globals::islinuxrpmbuild )
+    if ( $installer::globals::isrpmbuild )
     {
         my $rpmdir;
                 my $machine = "";
         if ( $installer::globals::compiler =~ /unxlngi/) {
                     $rpmdir = "$installer::globals::epmoutpath/RPMS/i586";
                 }
+        elsif ( $installer::globals::compiler =~ /unxaigppc/) {
+                    $machine = "ppc";
+                    $rpmdir = "$installer::globals::epmoutpath/RPMS/$machine";
+                }
         elsif ( $installer::globals::compiler =~ /unxlng/) {
                     $machine = (POSIX::uname())[4];
                     $rpmdir = "$installer::globals::epmoutpath/RPMS/$machine";
@@ -2869,6 +2833,7 @@ sub create_new_directory_structure
         {
             installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/$machine");
         }
+        installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/powerpc");
         installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/x86_64");
         installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i586");
         installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i386");
@@ -2877,23 +2842,7 @@ sub create_new_directory_structure
     }
 
     # Setting unix rights to "775" for $newdir ("RPMS" or "packages")
-
-    my $localcall = "chmod 775 $newdir \>\/dev\/null 2\>\&1";
-    my $callreturnvalue = system($localcall);
-
-    my $callinfoline = "Systemcall: $localcall\n";
-    push( @installer::globals::logfileinfo, $callinfoline);
-
-    if ($callreturnvalue)
-    {
-        $callinfoline = "ERROR: Could not execute \"$localcall\"!\n";
-        push( @installer::globals::logfileinfo, $callinfoline);
-    }
-    else
-    {
-        $callinfoline = "Success: Executed \"$localcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $callinfoline);
-    }
+    chmod 0775, $newdir;
 }
 
 ######################################################
@@ -3195,40 +3144,6 @@ sub analyze_rootpath
     $rootpath =~ s/\/\s*$//;    # removing ending slash
 
     ##############################################################
-    # Version 1: "/opt" is variable and "openofficeorg20" fixed
-    ##############################################################
-
-    # my $staticpath = $rootpath;
-    # installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$staticpath);
-    # $$staticpathref = $staticpath;                # will be "openofficeorg20"
-
-    # my $relocatablepath = $rootpath;
-    # installer::pathanalyzer::get_path_from_fullqualifiedname(\$relocatablepath);
-    # $$relocatablepathref = $relocatablepath;      # will be "/opt/"
-
-    ##############################################################
-    # Version 2: "/opt/openofficeorg20" is variable and "" fixed
-    ##############################################################
-
-    # if ( $$relocatablepathref eq "" ) # relocatablepath is not defined in package list
-    # {
-    #   $$staticpathref = "";   # will be ""
-    #   $$relocatablepathref = $rootpath . "\/"; # relocatable path must end with "/", will be "/opt/openofficeorg20/"
-    #   # setting the static path to the hostname of the directory with style OFFICEDIRECTORY
-    #   if ( $allvariables->{'SETSTATICPATH'} ) { $$staticpathref = $installer::globals::officedirhostname; }
-    #
-    # }
-    # else  # relocatablepath is defined in package list
-    # {
-    #   $$relocatablepathref =~ s/\/\s*$//;         # removing ending slash
-    #   $$relocatablepathref = $$relocatablepathref . "\/"; # relocatable path must end with "/"
-    #   my $staticpath = $rootpath;
-    #   $staticpath =~ s/\Q$$relocatablepathref\E//;
-    #   $staticpath =~ s/\/\s*$//;
-    #   $$staticpathref = $staticpath;
-    # }
-
-    ##############################################################
     # Version 3: "/" is variable and "/opt/openofficeorg20" fixed
     ##############################################################
 
@@ -3238,17 +3153,16 @@ sub analyze_rootpath
     # For RPM version 3.x it is required, that Prefix is not "/" in spec file. In this case --relocate will not work,
     # because RPM 3.x says, that the package is not relocatable. Therefore we have to use Prefix=/opt and for
     # all usages of --relocate this path has to be on both sides of the "=": --relocate /opt=<myselectdir>/opt .
-    if ( $installer::globals::islinuxrpmbuild )
+    if ( $installer::globals::isrpmbuild )
     {
         $$relocatablepathref = $rootpath . "\/"; # relocatable path must end with "/", will be "/opt/"
         $$staticpathref = $installer::globals::officedirhostname; # to be used as replacement in shell scripts
     }
 
-    if ( $installer::globals::islinuxdebbuild )
+    if ( $installer::globals::isdebbuild )
     {
         $$relocatablepathref = "";
         # $$staticpathref is already "/opt/openoffice.org3", no additional $rootpath required.
-        # $$staticpathref = $rootpath . $installer::globals::separator . $$staticpathref;  # no relocatibility for Debian
     }
 
 }
@@ -3270,8 +3184,7 @@ sub put_installsetfiles_into_installset
         my $onefile = $installer::globals::installsetfiles[$i];
         my $sourcefile = $onefile->{'sourcepath'};
         my $destfile = "";
-        if ( $installer::globals::addjavainstaller ) { $destfile = $onefile->{'Name'}; }
-        else { $destfile = $destdir . $installer::globals::separator . $onefile->{'Name'}; }
+        $destfile = $destdir . $installer::globals::separator . $onefile->{'Name'};
         installer::systemactions::copy_one_file($sourcefile, $destfile);
 
         my $infoline = "Adding to installation set \"$destfile\" from source \"$sourcefile\".\n";
@@ -3399,20 +3312,6 @@ sub finalize_linux_patch
     if ( ! ( $#{$rpmfiles} > -1 )) { installer::exiter::exit_program("ERROR: Could not find rpm in directory $newepmdir!", "finalize_linux_patch"); }
     for ( my $i = 0; $i <= $#{$rpmfiles}; $i++ ) { installer::pathanalyzer::make_absolute_filename_to_relative_filename(\${$rpmfiles}[$i]); }
 
-#   my $installline = "";
-#
-#   for ( my $i = 0; $i <= $#{$rpmfiles}; $i++ )
-#   {
-#       $installline = $installline . "  rpm --prefix \$PRODUCTINSTALLLOCATION -U $newepmdir/${$rpmfiles}[$i]\n";
-#   }
-#
-#   $installline =~ s/\s*$//;
-#
-#   for ( my $j = 0; $j <= $#{$scriptfile}; $j++ )
-#   {
-#       ${$scriptfile}[$j] =~ s/INSTALLLINES/$installline/;
-#   }
-
     # Searching packagename containing -core01
     my $found_package = 0;
     my $searchpackagename = "";
@@ -3439,7 +3338,6 @@ sub finalize_linux_patch
     my $productname = $allvariables->{'PRODUCTNAME'};
     $productname = lc($productname);
     $productname =~ s/ /_/g;    # abc office -> abc_office
-#   $productname =~ s/\.//g;    # openoffice.org -> openofficeorg
 
     $infoline = "Adding productname $productname into Linux patch script\n";
     push( @installer::globals::logfileinfo, $infoline);
@@ -3448,15 +3346,14 @@ sub finalize_linux_patch
 
     # Saving the file
 
-    my $newscriptfilename = "setup"; # $newepmdir . $installer::globals::separator . "setup";
+    my $newscriptfilename = "setup";
     installer::files::save_file($newscriptfilename, $scriptfile);
 
     $infoline = "Saved Linux patch setup $newscriptfilename \n";
     push( @installer::globals::logfileinfo, $infoline);
 
     # Setting unix rights 755
-    my $localcall = "chmod 775 $newscriptfilename \>\/dev\/null 2\>\&1";
-    system($localcall);
+    chmod 0755, $newscriptfilename;
 }
 
 1;
diff --git a/solenv/bin/modules/installer/followme.pm b/solenv/bin/modules/installer/followme.pm
index 1abc035d5615..535ac31588ff 100644
--- a/solenv/bin/modules/installer/followme.pm
+++ b/solenv/bin/modules/installer/followme.pm
@@ -70,11 +70,11 @@ sub save_followme_info
     push(@filecontent, "globals:issolarisx86build: $installer::globals::issolarisx86build\n");
     push(@filecontent, "globals:isfreebsdpkgbuild: $installer::globals::isfreebsdpkgbuild\n");
     push(@filecontent, "globals:islinuxbuild: $installer::globals::islinuxbuild\n");
-    push(@filecontent, "globals:islinuxrpmbuild: $installer::globals::islinuxrpmbuild\n");
+    push(@filecontent, "globals:isrpmbuild: $installer::globals::isrpmbuild\n");
     push(@filecontent, "globals:islinuxintelrpmbuild: $installer::globals::islinuxintelrpmbuild\n");
     push(@filecontent, "globals:islinuxppcrpmbuild: $installer::globals::islinuxppcrpmbuild\n");
     push(@filecontent, "globals:islinuxx86_64rpmbuild: $installer::globals::islinuxx86_64rpmbuild\n");
-    push(@filecontent, "globals:islinuxdebbuild: $installer::globals::islinuxdebbuild\n");
+    push(@filecontent, "globals:isdebbuild: $installer::globals::isdebbuild\n");
     push(@filecontent, "globals:islinuxinteldebbuild: $installer::globals::islinuxinteldebbuild\n");
     push(@filecontent, "globals:islinuxppcdebbuild: $installer::globals::islinuxppcdebbuild\n");
     push(@filecontent, "globals:islinuxx86_64debbuild: $installer::globals::islinuxx86_64debbuild\n");
@@ -87,6 +87,7 @@ sub save_followme_info
     push(@filecontent, "globals:product: $installer::globals::product\n");
     push(@filecontent, "globals:patch: $installer::globals::patch\n");
     push(@filecontent, "globals:languagepack: $installer::globals::languagepack\n");
+    push(@filecontent, "globals:helppack: $installer::globals::helppack\n");
     push(@filecontent, "globals:installertypedir: $installer::globals::installertypedir\n");
     push(@filecontent, "globals:max_lang_length: $installer::globals::max_lang_length\n");
     push(@filecontent, "globals:compiler: $installer::globals::compiler\n");
@@ -169,11 +170,11 @@ sub read_followme_info
             if ( $name eq "issolarisx86build" ) { $installer::globals::issolarisx86build = $value; }
             if ( $name eq "isfreebsdpkgbuild" ) { $installer::globals::isfreebsdpkgbuild = $value; }
             if ( $name eq "islinuxbuild" ) { $installer::globals::islinuxbuild = $value; }
-            if ( $name eq "islinuxrpmbuild" ) { $installer::globals::islinuxrpmbuild = $value; }
+            if ( $name eq "isrpmbuild" ) { $installer::globals::isrpmbuild = $value; }
             if ( $name eq "islinuxintelrpmbuild" ) { $installer::globals::islinuxintelrpmbuild = $value; }
             if ( $name eq "islinuxppcrpmbuild" ) { $installer::globals::islinuxppcrpmbuild = $value; }
             if ( $name eq "islinuxx86_64rpmbuild" ) { $installer::globals::islinuxx86_64rpmbuild = $value; }
-            if ( $name eq "islinuxdebbuild" ) { $installer::globals::islinuxdebbuild = $value; }
+            if ( $name eq "isdebbuild" ) { $installer::globals::isdebbuild = $value; }
             if ( $name eq "islinuxinteldebbuild" ) { $installer::globals::islinuxinteldebbuild = $value; }
             if ( $name eq "islinuxppcdebbuild" ) { $installer::globals::islinuxppcdebbuild = $value; }
             if ( $name eq "islinuxx86_64debbuild" ) { $installer::globals::islinuxx86_64debbuild = $value; }
@@ -189,6 +190,7 @@ sub read_followme_info
             if ( $name eq "product" ) { $installer::globals::product = $value; }
             if ( $name eq "patch" ) { $installer::globals::patch = $value; }
             if ( $name eq "languagepack" ) { $installer::globals::languagepack = $value; }
+            if ( $name eq "helppack" ) { $installer::globals::helppack = $value; }
             if ( $name eq "installertypedir" ) { $installer::globals::installertypedir = $value; }
             if ( $name eq "max_lang_length" ) { $installer::globals::max_lang_length = $value; }
             if ( $name eq "compiler" ) { $installer::globals::compiler = $value; }
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 066e13dcf6d4..ace634a3ac5e 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -131,8 +131,8 @@ BEGIN
     $ismacosx = 0;
     $iswindowsbuild = 0;
     $islinuxbuild = 0;
-    $islinuxrpmbuild = 0;
-    $islinuxdebbuild = 0;
+    $isrpmbuild = 0;
+    $isdebbuild = 0;
     $islinuxintelrpmbuild = 0;
     $islinuxppcrpmbuild = 0;
     $islinuxinteldebbuild = 0;
@@ -196,7 +196,7 @@ BEGIN
     %alllangmodules = ();
     $englishlicenseset = 0;
     $englishlicense = "";
-    $englishsolarislicensename = "LICENSE_en-US";
+    $englishsolarislicensename = "LICENSE"; # _en-US";
     $solarisdontcompress = 0;
     $patharray = "";
 
@@ -310,7 +310,6 @@ BEGIN
     $productxpdfile = "setup.xpd";
     $xpd_files_prepared = 0;
     $defaultlanguage = "";
-    # @emptyxpdparents = ();
     @createdxpdfiles = ();
     @allxpdfiles = ();
     $isxpdplatform = 0;
@@ -318,7 +317,6 @@ BEGIN
     $javasettozero = 0;
     $addlicensefile = 1;
     $addsystemintegration = 0;
-    $addjavainstaller = 0;
     $added_directories = 0;
     $makedownload = 1;
     $makejds = 1;
@@ -329,6 +327,7 @@ BEGIN
     @binarytableonlyfiles = ();
     @allscpactions = ();
     $languagepackaddon = "LanguagePack";
+    $helppackaddon = "HelpPack";
     $patchaddon = "Patch";
     $ooodownloadfilename = "";
     $downloadfilename = "";
@@ -346,6 +345,7 @@ BEGIN
     $patch_user_dir = 0;
     $addchildprojects = 0;
     $languagepack = 0;
+    $helppack = 0;
     $tab = 0;
     $patch = 0;
     $patchincludepath = "";
@@ -424,7 +424,7 @@ BEGIN
     $one_cab_file = 0;
     $fix_number_of_cab_files = 1;
     $cab_file_per_component = 0;
-    $cabfilecompressionlevel = 2;
+    $cabfilecompressionlevel = 21; # Using LZX compression, possible values are: 15 | 16 | ... | 21 (best compression)
     $number_of_cabfiles = 1;    # only for $fix_number_of_cab_files = 1
     $include_cab_in_msi = 0;
     $use_packages_for_cabs = 0;
@@ -464,6 +464,7 @@ BEGIN
     @environmentvariables = ( "SOLARVERSION", "GUI", "WORK_STAMP", "OUTPATH", "LOCAL_OUT", "LOCAL_COMMON_OUT" );
     @packagelistitems = ("module", "solarispackagename", "packagename", "copyright", "vendor", "description" );
     @languagepackfeature =();
+    @helppackfeature =();
     @featurecollector =();
     $msiassemblyfiles = "";
     $nsisfilename = "Nsis";
@@ -536,9 +537,6 @@ BEGIN
         $isunix = 1;
         $iswin = 0;
     }
-    # WRAPCMD is gone - remove this and all related
-    # $installer::globals::wrapcmd entries
-    $wrapcmd = "";
 
     if ( $plat =~ /linux/i ) { $islinux = 1; }
     if ( $plat =~ /kfreebsd/i ) { $islinux = 1; }
diff --git a/solenv/bin/modules/installer/helppack.pm b/solenv/bin/modules/installer/helppack.pm
new file mode 100644
index 000000000000..e5b674c93f8c
--- /dev/null
+++ b/solenv/bin/modules/installer/helppack.pm
@@ -0,0 +1,537 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+package installer::helppack;
+
+use installer::converter;
+use installer::existence;
+use installer::files;
+use installer::globals;
+use installer::logger;
+use installer::pathanalyzer;
+use installer::scpzipfiles;
+use installer::scriptitems;
+use installer::systemactions;
+use installer::worker;
+
+sub select_help_items
+{
+    my ( $itemsref, $languagesarrayref, $itemname ) = @_;
+
+    installer::logger::include_header_into_logfile("Selecting items for help pack. Item: $itemname");
+
+    my @itemsarray = ();
+
+    for ( my $i = 0; $i <= $#{$itemsref}; $i++ )
+    {
+        my $oneitem = ${$itemsref}[$i];
+
+        my $styles = "";
+        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
+
+        if (( $styles =~ /\bHELPPACK\b/ ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
+        {
+            # Files with style "HELPPACK" and "FORCEHELPPACK" also have to be included into the help pack.
+            # Files with style "HELPPACK" are only included into help packs.
+            # Files with style "FORCEHELPPACK" are included into help packs and non help packs. They are
+            # forced, because otherwise they not not be included into helppacks.
+
+            my $ismultilingual = $oneitem->{'ismultilingual'};
+
+            if ($ismultilingual)
+            {
+                my $specificlanguage = "";
+                if ( $oneitem->{'specificlanguage'} ) { $specificlanguage = $oneitem->{'specificlanguage'}; }
+
+            for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ )   # iterating over all languages
+                {
+                    my $onelanguage = ${$languagesarrayref}[$j];
+                    my $locallang = $onelanguage;
+                    $locallang =~ s/-/_/;
+
+                    if ( $specificlanguage eq $onelanguage )
+                    {
+                    push(@itemsarray, $oneitem);
+                    }
+                }
+            }
+            else
+            {
+                push(@itemsarray, $oneitem);
+            }
+        }
+    }
+
+    return \@itemsarray;
+}
+
+sub replace_languagestring_variable
+{
+    my ($onepackageref, $languagestringref) = @_;
+
+    my $key;
+
+    foreach $key (keys %{$onepackageref})
+    {
+        my $value = $onepackageref->{$key};
+        $value =~ s/\%LANGUAGESTRING/$$languagestringref/g;
+        $onepackageref->{$key} = $value;
+    }
+}
+
+#########################################################
+# Including the license text into the script template
+#########################################################
+
+sub put_license_file_into_script
+{
+    my ($scriptfile, $licensefile) = @_;
+
+    my $infoline = "Adding licensefile into help pack script\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    my $includestring = "";
+
+    for ( my $i = 0; $i <= $#{$licensefile}; $i++ )
+    {
+        $includestring = $includestring . ${$licensefile}[$i];
+    }
+
+    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
+    {
+        ${$scriptfile}[$i] =~ s/LICENSEFILEPLACEHOLDER/$includestring/;
+    }
+}
+
+#########################################################
+# Creating a tar.gz file from a Solaris package
+#########################################################
+
+sub create_tar_gz_file
+{
+    my ($installdir, $packagename, $packagestring) = @_;
+
+    $packagename =~ s/\.rpm\s*$//;
+    my $targzname = $packagename . ".tar.gz";
+    $systemcall = "cd $installdir; tar -cf - $packagestring | gzip > $targzname";
+    installer::logger::print_message( "... $systemcall ...\n" );
+
+    my $returnvalue = system($systemcall);
+
+    my $infoline = "Systemcall: $systemcall\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    if ($returnvalue)
+    {
+        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+    else
+    {
+        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+
+    return $targzname;
+}
+
+#########################################################
+# Determining the name of the package file
+#########################################################
+
+sub get_packagename_from_packagelist
+{
+    my ( $alldirs, $allvariables, $languagestringref ) = @_;
+
+    # my $packagename = "";
+
+    # for ( my $i = 0; $i <= $#{$alldirs}; $i++ )
+    # {
+    #   if ( ${$alldirs}[$i] =~ /-fonts/ ) { next; }
+    #   if ( ${$alldirs}[$i] =~ /-help/ ) { next; }
+    #   if ( ${$alldirs}[$i] =~ /-res/ ) { next; }
+    #
+    #   $packagename = ${$alldirs}[$i];
+    #   last;
+    # }
+
+    # if ( $packagename eq "" ) { installer::exiter::exit_program("ERROR: Could not find base package in directory $installdir!", "get_packagename_from_packagelist"); }
+
+    my $localproductname = $allvariables->{'PRODUCTNAME'};
+    $localproductname = lc($localproductname);
+    $localproductname =~ s/ //g;
+    $localproductname =~ s/-/_/g;
+
+    my $packagename = $localproductname . "_" . $$languagestringref;
+
+    return $packagename;
+}
+
+#########################################################
+# Determining the name of the package file or the rpm
+# in the installation directory. For help packs
+# there is only one file in this directory
+#########################################################
+
+sub determine_packagename
+{
+    my ( $installdir, $allvariables, $languagestringref ) = @_;
+
+    my $packagename = "";
+    my $allnames = "";
+
+    if ( $installer::globals::isrpmbuild )
+    {
+        # determining the rpm file in directory $installdir
+
+        my $fileextension = "rpm";
+        my $rpmfiles = installer::systemactions::find_file_with_file_extension($fileextension, $installdir);
+        if ( ! ( $#{$rpmfiles} > -1 )) { installer::exiter::exit_program("ERROR: Could not find package in directory $installdir!", "determine_packagename"); }
+        my $rpmsav = [@{$rpmfiles}];
+        for ( my $i = 0; $i <= $#{$rpmfiles}; $i++ ) { installer::pathanalyzer::make_absolute_filename_to_relative_filename(\${$rpmfiles}[$i]); }
+
+        $packagename = get_packagename_from_packagelist($rpmfiles, $allvariables, $languagestringref);
+
+        my $packagestring = installer::converter::convert_array_to_space_separated_string($rpmfiles);
+        $packagename = create_tar_gz_file($installdir, $packagename, $packagestring);   # only one file
+        for ( my $i = 0; $i <= $#{$rpmsav}; $i++ )
+        {
+            my $onefile = $installdir . $installer::globals::separator . ${$rpmsav}[$i];
+            unlink($onefile);
+        }
+
+        $allnames = $rpmfiles;
+    }
+
+    if ( $installer::globals::issolarisbuild )
+    {
+        # determining the Solaris package file in directory $installdir
+        my $alldirs = installer::systemactions::get_all_directories($installdir);
+
+        if ( ! ( $#{$alldirs} > -1 )) { installer::exiter::exit_program("ERROR: Could not find package in directory $installdir!", "determine_packagename"); }
+        my $alldirssav = [@{$alldirs}];
+        for ( my $i = 0; $i <= $#{$alldirs}; $i++ ) { installer::pathanalyzer::make_absolute_filename_to_relative_filename(\${$alldirs}[$i]); }
+
+        $packagename = get_packagename_from_packagelist($alldirs, $allvariables, $languagestringref);
+        my $packagestring = installer::converter::convert_array_to_space_separated_string($alldirs);
+        $packagename = create_tar_gz_file($installdir, $packagename, $packagestring);   # only a file (not a directory) can be included into the shell script
+        for ( my $i = 0; $i <= $#{$alldirssav}; $i++ ) { installer::systemactions::remove_complete_directory(${$alldirssav}[$i], 1); }
+        $allnames = $alldirs;
+    }
+
+    my $infoline = "Found package in installation directory $installdir : $packagename\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    return ( $packagename, $allnames);
+}
+
+#########################################################
+# Including the name of the package file or the rpm
+# into the script template
+#########################################################
+
+sub put_packagename_into_script
+{
+    my ($scriptfile, $packagename, $allnames) = @_;
+
+    my $localpackagename = $packagename;
+    $localpackagename =~ s/\.tar\.gz//; # making "OOOopenoffice-it-ea.tar.gz" to "OOOopenoffice-it-ea"
+    my $infoline = "Adding packagename $localpackagename into help pack script\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    my $installline = "";
+
+    if ( $installer::globals::issolarisbuild ) { $installline = "  /usr/sbin/pkgadd -d \$outdir -a \$adminfile"; }
+
+    if ( $installer::globals::isrpmbuild ) { $installline = "  rpm --prefix \$PRODUCTINSTALLLOCATION --replacepkgs -i"; }
+
+    for ( my $i = 0; $i <= $#{$allnames}; $i++ )
+    {
+        if ( $installer::globals::issolarisbuild ) { $installline = $installline . " ${$allnames}[$i]"; }
+
+        if ( $installer::globals::isrpmbuild ) { $installline = $installline . " \$outdir/${$allnames}[$i]"; }
+    }
+
+    for ( my $j = 0; $j <= $#{$scriptfile}; $j++ )
+    {
+        ${$scriptfile}[$j] =~ s/INSTALLLINES/$installline/;
+    }
+}
+
+##################################################################
+# Including the lowercase product name into the script template
+##################################################################
+
+sub put_productname_into_script
+{
+    my ($scriptfile, $variableshashref) = @_;
+
+    my $productname = $variableshashref->{'PRODUCTNAME'};
+    $productname = lc($productname);
+    $productname =~ s/\.//g;    # openoffice.org -> openofficeorg
+
+    my $infoline = "Adding productname $productname into help pack script\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
+    {
+        ${$scriptfile}[$i] =~ s/PRODUCTNAMEPLACEHOLDER/$productname/;
+    }
+}
+
+##################################################################
+# Including the full product name into the script template
+# (name and version)
+##################################################################
+
+sub put_fullproductname_into_script
+{
+    my ($scriptfile, $variableshashref) = @_;
+
+    my $productname = $variableshashref->{'PRODUCTNAME'};
+    my $productversion = "";
+    if ( $variableshashref->{'PRODUCTVERSION'} ) { $productversion = $variableshashref->{'PRODUCTVERSION'}; };
+    my $fullproductname = $productname . " " . $productversion;
+
+    my $infoline = "Adding full productname \"$fullproductname\" into help pack script\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
+    {
+        ${$scriptfile}[$i] =~ s/FULLPRODUCTNAMELONGPLACEHOLDER/$fullproductname/;
+    }
+}
+
+##################################################################
+# Including the name of the search package (-core01)
+# into the script template
+##################################################################
+
+sub put_searchpackage_into_script
+{
+    my ($scriptfile, $variableshashref) = @_;
+
+    my $basispackageprefix = $variableshashref->{'BASISPACKAGEPREFIX'};
+    my $basispackageversion = $variableshashref->{'OOOBASEVERSION'};
+
+    if ( $installer::globals::issolarisbuild ) { $basispackageversion =~ s/\.//g; } # "3.0" -> "30"
+
+    my $infoline = "Adding basis package prefix $basispackageprefix into help pack script\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    $infoline = "Adding basis package version $basispackageversion into help pack script\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
+    {
+        ${$scriptfile}[$i] =~ s/BASISPACKAGEPREFIXPLACEHOLDER/$basispackageprefix/;
+        ${$scriptfile}[$i] =~ s/OOOBASEVERSIONPLACEHOLDER/$basispackageversion/;
+    }
+
+}
+
+#########################################################
+# Including the linenumber into the script template
+#########################################################
+
+sub put_linenumber_into_script
+{
+    my ( $scriptfile, $licensefile, $allnames ) = @_;
+
+    my $linenumber =  $#{$scriptfile} + $#{$licensefile} + 3;   # also adding the content of the license file!
+
+    my $infoline = "Adding linenumber $linenumber into help pack script\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
+    {
+        ${$scriptfile}[$i] =~ s/LINENUMBERPLACEHOLDER/$linenumber/;
+    }
+}
+
+#########################################################
+# Determining the name of the new scriptfile
+#########################################################
+
+sub determine_scriptfile_name
+{
+    my ( $packagename ) = @_;
+
+    my $scriptfilename = $packagename;
+
+#   if ( $installer::globals::isrpmbuild ) { $scriptfilename =~ s/\.rpm\s*$/\.sh/; }
+#   if ( $installer::globals::issolarisbuild ) { $scriptfilename =~ s/\.tar\.gz\s*$/\.sh/; }
+
+    $scriptfilename =~ s/\.tar\.gz\s*$/\.sh/;
+
+    my $infoline = "Setting help pack script file name to $scriptfilename\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    return $scriptfilename;
+}
+
+#########################################################
+# Saving the script file in the installation directory
+#########################################################
+
+sub save_script_file
+{
+    my ($installdir, $newscriptfilename, $scriptfile) = @_;
+
+    $newscriptfilename = $installdir . $installer::globals::separator . $newscriptfilename;
+    installer::files::save_file($newscriptfilename, $scriptfile);
+
+    my $infoline = "Saving script file $newscriptfilename\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    return $newscriptfilename;
+}
+
+#########################################################
+# Including the binary package into the script
+#########################################################
+
+sub include_package_into_script
+{
+    my ( $scriptfilename, $installdir, $packagename ) = @_;
+
+    my $longpackagename = $installdir . $installer::globals::separator . $packagename;
+    my $systemcall = "cat $longpackagename >>$scriptfilename";
+
+    my $returnvalue = system($systemcall);
+
+    my $infoline = "Systemcall: $systemcall\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    if ($returnvalue)
+    {
+        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+    else
+    {
+        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+
+    my $localcall = "chmod 775 $scriptfilename \>\/dev\/null 2\>\&1";
+    system($localcall);
+
+}
+
+#########################################################
+# Removing the binary package
+#########################################################
+
+sub remove_package
+{
+    my ( $installdir, $packagename ) = @_;
+
+    my $remove_package = 1;
+
+    if ( $ENV{'DONT_REMOVE_PACKAGE'} ) { $remove_package = 0; }
+
+    if ( $remove_package )
+    {
+        my $longpackagename = $installdir . $installer::globals::separator . $packagename;
+        unlink $longpackagename;
+
+        my $infoline = "Removing package: $longpackagename \n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+}
+
+####################################################
+# Unix help packs, that are not part of
+# multilingual installation sets, need a
+# shell script installer
+####################################################
+
+sub build_installer_for_helppack
+{
+    my ($installdir, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref) = @_;
+
+    installer::logger::print_message( "... creating shell script installer ...\n" );
+
+    installer::logger::include_header_into_logfile("Creating shell script installer:");
+
+    # find and read setup script template
+
+    my $scriptfilename = "langpackscript.sh";
+    my $scriptref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptfilename, $includepatharrayref, 0);
+    if ($$scriptref eq "") { installer::exiter::exit_program("ERROR: Could not find script file $scriptfilename!", "build_installer_for_helppack"); }
+    my $scriptfile = installer::files::read_file($$scriptref);
+
+    my $infoline = "Found  script file $scriptfilename: $$scriptref \n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    # find and read english license file
+    my $licenselanguage = "en-US";                  # always english !
+    my $licensefilename = "LICENSE"; # _" . $licenselanguage;
+    my $licenseincludepatharrayref = installer::worker::get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
+
+    my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0);
+    if ($$licenseref eq "") { installer::exiter::exit_program("ERROR: Could not find License file $licensefilename!", "build_installer_for_helppack"); }
+    my $licensefile = installer::files::read_file($$licenseref);
+
+    $infoline = "Found licensefile $licensefilename: $$licenseref \n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    # including variables into license file
+    installer::scpzipfiles::replace_all_ziplistvariables_in_file($licensefile, $allvariableshashref);
+
+    # add license text into script template
+    put_license_file_into_script($scriptfile, $licensefile);
+
+    # add rpm or package file name into script template
+    my ( $packagename, $allnames) = determine_packagename($installdir, $allvariableshashref, $languagestringref);
+    put_packagename_into_script($scriptfile, $packagename, $allnames);
+
+    # add product name into script template
+    put_productname_into_script($scriptfile, $allvariableshashref);
+
+    # add product name into script template
+    put_fullproductname_into_script($scriptfile, $allvariableshashref);
+
+    # add product name into script template
+    put_searchpackage_into_script($scriptfile, $allvariableshashref);
+
+    # replace linenumber in script template
+    put_linenumber_into_script($scriptfile, $licensefile, $allnames);
+
+    # saving the script file
+    my $newscriptfilename = determine_scriptfile_name($packagename);
+    $newscriptfilename = save_script_file($installdir, $newscriptfilename, $scriptfile);
+
+    # include rpm or package into script
+    include_package_into_script($newscriptfilename, $installdir, $packagename);
+
+    # remove rpm or package
+    remove_package($installdir, $packagename);
+}
+
+1;
diff --git a/solenv/bin/modules/installer/javainstaller.pm b/solenv/bin/modules/installer/javainstaller.pm
deleted file mode 100644
index f68346bdcce2..000000000000
--- a/solenv/bin/modules/installer/javainstaller.pm
+++ /dev/null
@@ -1,1885 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-package installer::javainstaller;
-
-use Cwd;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::languages;
-use installer::pathanalyzer;
-use installer::scriptitems;
-use installer::systemactions;
-use installer::worker;
-use installer::logger;
-
-##############################################################
-# Returning a specific language string from the block
-# of all translations
-##############################################################
-
-sub get_language_string_from_language_block
-{
-    my ($language_block, $language, $oldstring) = @_;
-
-    my $newstring = "";
-
-    for ( my $i = 0; $i <= $#{$language_block}; $i++ )
-    {
-        if ( ${$language_block}[$i] =~ /^\s*$language\s*\=\s*\"(.*)\"\s*$/ )
-        {
-            $newstring = $1;
-            last;
-        }
-    }
-
-    if ( $newstring eq "" )
-    {
-        $language = "en-US";    # defaulting to english
-
-        for ( my $i = 0; $i <= $#{$language_block}; $i++ )
-        {
-            if ( ${$language_block}[$i] =~ /^\s*$language\s*\=\s*\"(.*)\"\s*$/ )
-            {
-                $newstring = $1;
-                last;
-            }
-        }
-    }
-
-    return $newstring;
-}
-
-##############################################################
-# Returning the complete block in all languages
-# for a specified string
-##############################################################
-
-sub get_language_block_from_language_file
-{
-    my ($searchstring, $languagefile) = @_;
-
-    my @language_block = ();
-
-    for ( my $i = 0; $i <= $#{$languagefile}; $i++ )
-    {
-        if ( ${$languagefile}[$i] =~ /^\s*\[\s*$searchstring\s*\]\s*$/ )
-        {
-            my $counter = $i;
-
-            push(@language_block, ${$languagefile}[$counter]);
-            $counter++;
-
-            while (( $counter <= $#{$languagefile} ) && (!( ${$languagefile}[$counter] =~ /^\s*\[/ )))
-            {
-                push(@language_block, ${$languagefile}[$counter]);
-                $counter++;
-            }
-
-            last;
-        }
-    }
-
-    return \@language_block;
-}
-
-#######################################################
-# Searching for the module name and description in the
-# modules collector
-#######################################################
-
-sub get_module_name_description
-{
-    my ($modulesarrayref, $onelanguage, $gid, $type) = @_;
-
-    my $found = 0;
-
-    my $newstring = "";
-
-    for ( my $i = 0; $i <= $#{$modulesarrayref}; $i++ )
-    {
-        my $onemodule = ${$modulesarrayref}[$i];
-
-        if ( $onemodule->{'gid'} eq $gid )
-        {
-            my $typestring = $type . " " . "(" . $onelanguage . ")";
-            if ( $onemodule->{$typestring} ) { $newstring = $onemodule->{$typestring}; }
-            $found = 1;
-        }
-
-        if ( $found ) { last; }
-    }
-
-    # defaulting to english
-
-    if ( ! $found )
-    {
-        my $defaultlanguage = "en-US";
-
-        for ( my $i = 0; $i <= $#{$modulesarrayref}; $i++ )
-        {
-            my $onemodule = ${$modulesarrayref}[$i];
-
-            if ( $onemodule->{'gid'} eq $gid )
-            {
-                my $typestring = $type . " " . "(" . $defaultlanguage . ")";
-                if ( $onemodule->{$typestring} ) { $newstring = $onemodule->{$typestring}; }
-                $found = 1;
-            }
-
-            if ( $found ) { last; }
-        }
-    }
-
-    return $newstring;
-}
-
-#######################################################
-# Setting the productname and productversion
-#######################################################
-
-sub set_productname_and_productversion
-{
-    my ($templatefile, $variableshashref) = @_;
-
-    my $infoline = "\nSetting product name and product version in Java template file\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $productname = $variableshashref->{'PRODUCTNAME'};
-    my $productversion = $variableshashref->{'PRODUCTVERSION'};
-
-    for ( my $i = 0; $i <= $#{$templatefile}; $i++ )
-    {
-        ${$templatefile}[$i] =~ s/\{PRODUCTNAME\}/$productname/g;
-        ${$templatefile}[$i] =~ s/\{PRODUCTVERSION\}/$productversion/g;
-    }
-
-    $infoline = "End of: Setting product name and product version in Java template file\n\n";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-#######################################################
-# Setting the localized Module name and description
-#######################################################
-
-sub set_component_name_and_description
-{
-    my ($templatefile, $modulesarrayref, $onelanguage) = @_;
-
-    my $infoline = "\nSetting component names and description in Java template file\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    for ( my $i = 0; $i <= $#{$templatefile}; $i++ )
-    {
-        # OOO_gid_Module_Prg_Wrt_Name
-        # OOO_gid_Module_Prg_Wrt_Description
-
-        my $oneline = ${$templatefile}[$i];
-        my $oldstring = "";
-        my $gid = "";
-        my $type = "";
-
-        if ( $oneline =~ /\b(OOO_gid_\w+)\b/ )
-        {
-            $oldstring = $1;
-
-            $infoline = "Found: $oldstring\n";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            if ( $oldstring =~ /^\s*OOO_(gid_\w+)_(\w+?)\s*$/ )
-            {
-                $gid = $1;
-                $type = $2;
-            }
-
-            my $newstring = get_module_name_description($modulesarrayref, $onelanguage, $gid, $type);
-
-            $infoline = "\tReplacing (language $onelanguage): OLDSTRING: $oldstring NEWSTRING $newstring\n";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            ${$templatefile}[$i] =~ s/$oldstring/$newstring/;   # always substitute, even if $newstring eq ""
-        }
-    }
-
-    $infoline = "End of: Setting component names and description in Java template file\n\n";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-#######################################################
-# Translating the Java file
-#######################################################
-
-sub translate_javafile
-{
-    my ($templatefile, $languagefile, $onelanguage) = @_;
-
-    for ( my $i = 0; $i <= $#{$templatefile}; $i++ )
-    {
-        my @allstrings = ();
-
-        my $oneline = ${$templatefile}[$i];
-
-        while ( $oneline =~ /\b(OOO_\w+)\b/ )
-        {
-            my $replacestring = $1;
-            push(@allstrings, $replacestring);
-            $oneline =~ s/$replacestring//;
-        }
-
-        my $oldstring;
-
-        foreach $oldstring (@allstrings)
-        {
-            my $language_block = get_language_block_from_language_file($oldstring, $languagefile);
-            my $newstring = get_language_string_from_language_block($language_block, $onelanguage, $oldstring);
-
-            $newstring =~ s/\"/\\\"/g;  # masquerading the "
-            $newstring =~ s/\\\\\"/\\\"/g;  # unmasquerading if \" was converted to \\" (because " was already masked)
-
-            # if (!( $newstring eq "" )) { ${$idtfile}[$i] =~ s/$oldstring/$newstring/; }
-            ${$templatefile}[$i] =~ s/$oldstring/$newstring/;   # always substitute, even if $newstring eq ""
-        }
-    }
-}
-
-###########################################################
-# Returning the license file name for a defined language
-###########################################################
-
-sub get_licensefilesource
-{
-    my ($language, $includepatharrayref) = @_;
-
-    my $licensefilename = "LICENSE_" . $language;
-
-    my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $includepatharrayref, 0);
-    if ($$licenseref eq "") { installer::exiter::exit_program("ERROR: Could not find License file $licensefilename!", "get_licensefilesource"); }
-
-    my $infoline = "Found licensefile $licensefilename: $$licenseref \n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    return $$licenseref;
-}
-
-#######################################################
-# Converting the license string into the
-# Java specific encoding.
-#######################################################
-
-sub convert_licenstring
-{
-    my ($licensefile, $includepatharrayref, $javadir, $onelanguage) = @_;
-
-    my $licensedir = $javadir . $installer::globals::separator . "license";
-    installer::systemactions::create_directory($licensedir);
-
-    # saving the original license file
-
-    my $licensefilename = $licensedir . $installer::globals::separator . "licensefile.txt";
-    installer::files::save_file($licensefilename, $licensefile);
-
-    # creating the ulf file from the license file
-
-    $licensefilename = $licensedir . $installer::globals::separator . "licensefile.ulf";
-    my @licensearray = ();
-
-    my $section = "\[TRANSLATE\]\n";
-    push(@licensearray, $section);
-
-    for ( my $i = 0; $i <= $#{$licensefile}; $i++ )
-    {
-        my $oneline = ${$licensefile}[$i];
-
-        if ($i == 0) { $oneline =~ s/^\s*\�\�\�//; }
-
-        $oneline =~ s/\s*$//;
-        $oneline =~ s/\"/\\\"/g;    # masquerading the "
-        $oneline =~ s/\'/\\\'/g;    # masquerading the '
-
-        $oneline =~ s/\$\{/\{/g;    # replacement of variables, only {PRODUCTNAME}, not ${PRODUCTNAME}
-
-        my $ulfstring = $onelanguage . " = " . "\"" . $oneline . "\"\n";
-        push(@licensearray, $ulfstring);
-    }
-
-    installer::files::save_file($licensefilename, \@licensearray);
-
-    # converting the ulf file to the jlf file with ulfconv
-
-    @licensearray = ();
-
-    my $converter = "ulfconv";
-
-    my $converterref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$converter, $includepatharrayref, 0);
-    if ($$converterref eq "") { installer::exiter::exit_program("ERROR: Could not find converter $converter!", "convert_licenstring"); }
-
-    my $infoline = "Found converter file $converter: $$converterref \n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $systemcall = "$$converterref $licensefilename |";
-    open (CONV, "$systemcall");
-    @licensearray = <CONV>;
-    close (CONV);
-
-    $licensefilename = $licensedir . $installer::globals::separator . "licensefile.jlf";
-    installer::files::save_file($licensefilename, \@licensearray);
-
-    # creating the license string from the jlf file
-
-    $licensestring = "";
-
-    for ( my $i = 1; $i <= $#licensearray; $i++ )   # not the first line!
-    {
-        my $oneline = $licensearray[$i];
-        $oneline =~ s/^\s*$onelanguage\s*\=\s*\"//;
-        $oneline =~ s/\"\s*$//;
-        $licensestring = $licensestring . $oneline . "\\n";
-    }
-
-    $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ( $licensestring eq "" )
-    {
-        $infoline = "ERROR: Could not convert $licensefilename !\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    return $licensestring;
-}
-
-#######################################################
-# Adding the license file into the java file
-# In the template java file there are two
-# occurences of INSTALLSDK_GUI_LICENSE
-# and INSTALLSDK_CONSOLE_LICENSE
-#######################################################
-
-sub add_license_file_into_javafile
-{
-    my ( $templatefile, $licensefile, $includepatharrayref, $javadir, $onelanguage ) = @_;
-
-    my $licensestring = convert_licenstring($licensefile, $includepatharrayref, $javadir, $onelanguage);
-
-    # saving the licensestring in an ulf file
-    # converting the file using "ulfconv license.ulf"
-    # including the new string into the java file
-
-    for ( my $i = 0; $i <= $#{$templatefile}; $i++ )
-    {
-        ${$templatefile}[$i] =~ s/INSTALLSDK_GUI_LICENSE/$licensestring/;
-        ${$templatefile}[$i] =~ s/INSTALLSDK_CONSOLE_LICENSE/$licensestring/;
-    }
-}
-
-#######################################################
-# Executing one system call
-#######################################################
-
-sub make_systemcall
-{
-    my ( $systemcall, $logreturn ) = @_;
-
-    my @returns = ();
-
-    installer::logger::print_message( "... $systemcall ...\n" );
-
-    open (REG, "$systemcall");
-    while (<REG>) {push(@returns, $_); }
-    close (REG);
-
-    my $returnvalue = $?;   # $? contains the return value of the systemcall
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ( $logreturn )
-    {
-        for ( my $j = 0; $j <= $#returns; $j++ ) { push( @installer::globals::logfileinfo, "$returns[$j]"); }
-    }
-
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        $error_occured = 1;
-    }
-    else
-    {
-        $infoline = "SUCCESS: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    return \@returns;
-}
-
-#######################################################
-# Setting the class path for the Installer SDK
-#######################################################
-
-sub set_classpath_for_install_sdk
-{
-    my ( $directory ) = @_;
-
-    my $installsdk = "";
-    my $solarVersion = "";
-    my $inPath = "";
-    my $updMinorExt = "";
-
-    if ( defined( $ENV{ 'SOLARVERSION' } ) ) { $solarVersion =  $ENV{'SOLARVERSION'}; }
-    else { installer::exiter::exit_program("ERROR: Environment variable \"SOLARVERSION\" not set!", "set_classpath_for_install_sdk"); }
-
-    if ( defined( $ENV{ 'INPATH' } ) ) { $inPath =  $ENV{'INPATH'}; }
-    else { installer::exiter::exit_program("ERROR: Environment variable \"INPATH\" not set!", "set_classpath_for_install_sdk"); }
-
-    if ( defined( $ENV{ 'UPDMINOREXT' } ) ) { $updMinorExt =  $ENV{'UPDMINOREXT'}; }
-
-    $installsdk = $solarVersion .  $installer::globals::separator . $inPath . $installer::globals::separator . "bin" . $updMinorExt;
-    $installsdk = $installsdk . $installer::globals::separator . "javainstaller";
-
-    if ( $ENV{'INSTALLSDK_SOURCE'} ) { $installsdk = $ENV{'INSTALLSDK_SOURCE'}; }   # overriding the Install SDK with INSTALLSDK_SOURCE
-
-    # The variable CLASSPATH has to contain:
-    # $installsdk/classes:$installsdk/classes/setupsdk.jar:
-    # $installsdk/classes/parser.jar:$installsdk/classes/jaxp.jar:
-    # $installsdk/classes/ldapjdk.jar:$directory
-
-    my @additional_classpath = ();
-    push(@additional_classpath, "$installsdk\/classes");
-    push(@additional_classpath, "$installsdk\/installsdk.jar");
-    push(@additional_classpath, "$installsdk\/classes\/parser.jar");
-    push(@additional_classpath, "$installsdk\/classes\/jaxp.jar");
-    push(@additional_classpath, "$directory");
-
-    my $newclasspathstring = "";
-    my $oldclasspathstring = "";
-    if ( $ENV{'CLASSPATH'} ) { $oldclasspathstring = $ENV{'CLASSPATH'}; }
-    else { $oldclasspathstring = "\."; }
-
-    for ( my $i = 0; $i <= $#additional_classpath; $i++ )
-    {
-        $newclasspathstring = $newclasspathstring . $additional_classpath[$i] . ":";
-    }
-
-    $newclasspathstring = $newclasspathstring . $oldclasspathstring;
-
-    $ENV{'CLASSPATH'} = $newclasspathstring;
-
-    my $infoline = "Setting CLASSPATH to $ENV{'CLASSPATH'}\n";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-#######################################################
-# Setting the class file name in the Java locale file
-#######################################################
-
-sub set_classfilename
-{
-    my ($templatefile, $classfilename, $searchstring) = @_;
-
-    for ( my $j = 0; $j <= $#{$templatefile}; $j++ )
-    {
-        if ( ${$templatefile}[$j] =~ /\Q$searchstring\E/ )
-        {
-            ${$templatefile}[$j] =~ s/$searchstring/$classfilename/;
-            last;
-        }
-    }
-}
-
-#######################################################
-# Substituting one variable in the xml file
-#######################################################
-
-sub replace_one_variable
-{
-    my ($xmlfile, $variable, $searchstring) = @_;
-
-    for ( my $i = 0; $i <= $#{$xmlfile}; $i++ )
-    {
-        ${$xmlfile}[$i] =~ s/\$\{$searchstring\}/$variable/g;
-    }
-}
-
-#######################################################
-# Substituting the variables in the xml file
-#######################################################
-
-sub substitute_variables
-{
-    my ($xmlfile, $variableshashref) = @_;
-
-    my $key;
-
-    foreach $key (keys %{$variableshashref})
-    {
-        my $value = $variableshashref->{$key};
-        replace_one_variable($xmlfile, $value, $key);
-    }
-}
-
-##########################################################
-# Finding the line number in xml file of a special
-# component
-##########################################################
-
-sub find_component_line
-{
-    my ($xmlfile, $componentname) = @_;
-
-    my $linenumber = 0;
-
-    for ( my $i = 0; $i <= $#{$xmlfile}; $i++ )
-    {
-        if ( ${$xmlfile}[$i] =~ /name\s*\=\'\s*$componentname/ )
-        {
-            $linenumber = $i;
-            last;
-        }
-    }
-
-    return $linenumber;
-}
-
-##########################################################
-# Removing one package from the xml file
-##########################################################
-
-sub remove_package
-{
-    my ($xmlfile, $packagename) = @_;
-
-    my $searchstring = $packagename;
-    if ( $searchstring =~ /\-(\S+?)\s*$/ ) { $searchstring = $1; } # "SUNW%PRODUCTNAME-mailcap" -> "mailcap"
-
-    my $packagestring = "";
-    my $namestring = "";
-    my $infoline = "";
-
-    if ( $installer::globals::issolarispkgbuild )
-    {
-        $packagestring = "\<pkgunit";
-        $namestring = "pkgName";
-    }
-    elsif ( $installer::globals::islinuxrpmbuild )
-    {
-        $packagestring = "\<rpmunit";
-        $namestring = "rpmUniqueName";
-    }
-
-    my $removed_packge = 0;
-
-    for ( my $i = 0; $i <= $#{$xmlfile}; $i++ )
-    {
-        if ( ${$xmlfile}[$i] =~ /^\s*\Q$packagestring\E/ )
-        {
-            # this is a package, but is it the correct one?
-
-            my $do_delete = 0;
-            my $linecounter = 1;
-            my $startline = $i+1;
-            my $line = ${$xmlfile}[$startline];
-            if (($line =~ /^\s*\Q$namestring\E\s*\=/) && ($line =~ /\-\Q$searchstring\E/)) { $do_delete = 1; }
-
-            # but not deleting fonts package in language packs
-            if ( $line =~ /-ONELANGUAGE-/ ) { $do_delete = 0; }
-
-            my $endcounter = 0;
-
-            while ((!( $line =~ /\/\>/ )) && ( $startline <= $#{$xmlfile} ))
-            {
-                $linecounter++;
-                $startline++;
-                $line = ${$xmlfile}[$startline];
-                if (($line =~ /^\s*\Q$namestring\E\s*\=/) && ($line =~ /\-\Q$searchstring\E/)) { $do_delete = 1; }
-            }
-
-            $linecounter = $linecounter + 1;
-
-            if ( $do_delete )
-            {
-                my $infoline = "\tReally removing package $packagename from xml file.\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                splice(@{$xmlfile},$i, $linecounter);   # removing $linecounter lines, beginning in line $i
-                $removed_packge = 1;
-                last;
-            }
-        }
-    }
-
-    if ( $removed_packge )
-    {
-        $infoline = "Package $packagename successfully removed from xml file.\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Did not find package $packagename in xml file.\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-}
-
-##########################################################
-# Removing one component from the xml file
-##########################################################
-
-sub remove_component
-{
-    my ($xmlfile, $componentname) = @_;
-
-    my @removed_lines = ();
-
-    push(@removed_lines, "\n");
-
-    for ( my $i = 0; $i <= $#{$xmlfile}; $i++ )
-    {
-        if ( ${$xmlfile}[$i] =~ /name\s*\=\'\s*$componentname/ )
-        {
-            # Counting the lines till the second "</component>"
-
-            push(@removed_lines, ${$xmlfile}[$i]);
-            my $linecounter = 1;
-            my $startline = $i+1;
-            my $line = ${$xmlfile}[$startline];
-            push(@removed_lines, $line);
-            my $endcounter = 0;
-
-            while ((!( $line =~ /^\s*\<\/component\>\s*$/ )) && ( $startline <= $#{$xmlfile} ))
-            {
-                $linecounter++;
-                $startline++;
-                $line = ${$xmlfile}[$startline];
-                push(@removed_lines, $line);
-            }
-
-            $linecounter = $linecounter + 2;     # last line and following empty line
-
-            splice(@{$xmlfile},$i, $linecounter);   # removing $linecounter lines, beginning in line $i
-            last;
-        }
-    }
-
-    return \@removed_lines;
-}
-
-##########################################################
-# If this is an installation set without language packs
-# the language pack module can be removed
-##########################################################
-
-sub remove_languagepack_from_xmlfile
-{
-    my ($xmlfile) = @_;
-
-    # Component begins with "<component selected="true" name='module_languagepacks' componentVersion="${PRODUCTVERSION}">"
-    # and ends with "</component>" (the second "</component>" !)
-
-    remove_component($xmlfile, "languagepack_DEFAULT");
-    remove_component($xmlfile, "languagepack_ONELANGUAGE");
-    remove_component($xmlfile, "module_languagepacks");
-}
-
-##########################################################
-# Duplicating a component
-##########################################################
-
-sub duplicate_component
-{
-    my ( $arrayref ) = @_;
-
-    @newarray = ();
-
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {
-        push(@newarray, ${$arrayref}[$i]);
-    }
-
-    return \@newarray;
-}
-
-##########################################################
-# Including a component into the xml file
-# at a specified line
-##########################################################
-
-sub include_component_at_specific_line
-{
-    my ($xmlfile, $unit, $line) = @_;
-
-    splice(@{$xmlfile},$line, 0, @{$unit});
-}
-
-##########################################################
-# Font packages do not exist for all languages.
-##########################################################
-
-sub remove_font_package_from_unit
-{
-    my ( $unitcopy, $onelanguage ) = @_;
-
-    my $searchstring = "-fonts";
-
-    my $packagestring = "";
-    my $namestring = "";
-
-    if ( $installer::globals::issolarispkgbuild )
-    {
-        $packagestring = "\<pkgunit";
-        $namestring = "pkgName";
-    }
-    elsif ( $installer::globals::islinuxrpmbuild )
-    {
-        $packagestring = "\<rpmunit";
-        $namestring = "rpmUniqueName";
-    }
-
-    for ( my $i = 0; $i <= $#{$unitcopy}; $i++ )
-    {
-        if ( ${$unitcopy}[$i] =~ /^\s*\Q$packagestring\E/ )
-        {
-            # this is a package, but is it the correct one?
-
-            my $do_delete = 0;
-            my $linecounter = 1;
-            my $startline = $i+1;
-            my $line = ${$unitcopy}[$startline];
-            if (($line =~ /^\s*\Q$namestring\E\s*\=/) && ($line =~ /\Q$searchstring\E/)) { $do_delete = 1; }
-
-            my $endcounter = 0;
-
-            while ((!( $line =~ /\/\>/ )) && ( $startline <= $#{$unitcopy} ))
-            {
-                $linecounter++;
-                $startline++;
-                $line = ${$unitcopy}[$startline];
-                if (($line =~ /^\s*\Q$namestring\E\s*\=/) && ($line =~ /\Q$searchstring\E/)) { $do_delete = 1; }
-            }
-
-            $linecounter = $linecounter + 1;
-
-            if ( $do_delete )
-            {
-                splice(@{$unitcopy},$i, $linecounter);  # removing $linecounter lines, beginning in line $i
-                last;
-            }
-        }
-    }
-}
-
-##########################################################
-# If this is an installation set with language packs,
-# modules for each language pack have to be created
-# dynamically
-##########################################################
-
-sub duplicate_languagepack_in_xmlfile
-{
-    my ($xmlfile, $languagesarrayref) = @_;
-
-    my $unit = remove_component($xmlfile, "languagepack_ONELANGUAGE");
-    my $startline = find_component_line($xmlfile, "module_languagepacks");
-    my $infoline = "";
-    $startline = $startline + 1;
-
-    for ( my $i = 0; $i <= $#{$languagesarrayref}; $i++ )
-    {
-        my $onelanguage = ${$languagesarrayref}[$i];
-        my $unitcopy = duplicate_component($unit);
-
-        # replacing string ONELANGUAGE in the unit copy
-        for ( my $j = 0; $j <= $#{$unitcopy}; $j++ ) { ${$unitcopy}[$j] =~ s/ONELANGUAGE/$onelanguage/g; }
-
-        # including the unitcopy into the xml file
-        include_component_at_specific_line($xmlfile, $unitcopy, $startline);
-        $startline = $startline + $#{$unitcopy} + 1;
-    }
-
-    # adding the default language as language pack, too
-    $unit = remove_component($xmlfile, "languagepack_DEFAULT");
-    $startline = find_component_line($xmlfile, "module_languagepacks");
-    $startline = $startline + 1;
-
-    $onelanguage = ${$languagesarrayref}[0];
-    $unitcopy = duplicate_component($unit);
-
-    # replacing string DEFAULT in the unit copy
-    for ( my $j = 0; $j <= $#{$unitcopy}; $j++ ) { ${$unitcopy}[$j] =~ s/DEFAULT/$onelanguage/g; }
-
-    # including the unitcopy into the xml file
-    include_component_at_specific_line($xmlfile, $unitcopy, $startline);
-    $startline = $startline + $#{$unitcopy} + 1;
-}
-
-#######################################################
-# Removing empty packages from xml file. The names
-# are stored in @installer::globals::emptypackages
-#######################################################
-
-sub remove_empty_packages_in_xmlfile
-{
-    my ($xmlfile) = @_;
-
-    for ( my $i = 0; $i <= $#installer::globals::emptypackages; $i++ )
-    {
-        my $packagename = $installer::globals::emptypackages[$i];
-        my $infoline = "Try to remove package $packagename from xml file.\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        remove_package($xmlfile, $packagename);
-    }
-}
-
-#######################################################
-# Preparing the language packs in the xml file
-#######################################################
-
-sub prepare_language_pack_in_xmlfile
-{
-    my ($xmlfile, $languagesarrayref) = @_;
-
-    # if ( ! $installer::globals::is_unix_multi )
-    # {
-    #   remove_languagepack_from_xmlfile($xmlfile);
-    # }
-    # else
-    # {
-        duplicate_languagepack_in_xmlfile($xmlfile, $languagesarrayref);
-    # }
-
-}
-
-#######################################################
-# Returning a rpm unit from a xml file
-#######################################################
-
-sub get_rpm_unit_from_xmlfile
-{
-    my ($rpmname, $xmlfile) = @_;
-
-    my $infoline = "Searching for $rpmname in xml file.\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my @rpmunit = ();
-    my $includeline = 0;
-    my $record = 0;
-    my $foundrpm = 0;
-
-    for ( my $i = 0; $i <= $#{$xmlfile}; $i++ )
-    {
-        my $oneline = ${$xmlfile}[$i];
-
-        if ( $oneline =~ /^\s*\<rpmunit/ ) { $record = 1; }
-
-        if ( $record ) { push(@rpmunit, $oneline); }
-
-        if ( $oneline =~ /^\s*rpmUniqueName\s*=\s*\"\Q$rpmname\E\"\s*$/ ) { $foundrpm = 1; }
-
-        if (( $record ) && ( $oneline =~ /\/\>\s*$/ )) { $record = 0; }
-
-        if (( ! $foundrpm ) && ( ! $record )) { @rpmunit = (); }
-
-        if (( $foundrpm ) && ( ! $record )) { $includeline = $i + 1; }
-
-        if (( $foundrpm ) && ( ! $record )) { last; }
-    }
-
-    if ( ! $foundrpm ) { installer::exiter::exit_program("ERROR: Did not find rpmunit $rpmname in xml file!", "get_rpm_unit_from_xmlfile"); }
-
-    $infoline = "Found $rpmname in xml file. Returning block lines: $#rpmunit + 1. Includeline: $includeline \n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    return (\@rpmunit, $includeline);
-}
-
-#######################################################
-# Exchanging package names in xml file
-#######################################################
-
-sub exchange_name_in_rpmunit
-{
-    my ($rpmunit, $oldpackagename, $newpackagename) = @_;
-
-    for ( my $i = 0; $i <= $#{$rpmunit}; $i++ )
-    {
-        ${$rpmunit}[$i] =~ s/$oldpackagename/$newpackagename/;
-    }
-}
-
-#######################################################
-# Preparing link RPMs in the xml file
-#######################################################
-
-sub prepare_linkrpm_in_xmlfile
-{
-    my ($xmlfile, $rpmlist) = @_;
-
-    for ( my $i = 0; $i <= $#{$rpmlist}; $i++ )
-    {
-        my $oldpackagename = "";
-        my $newpackagename = "";
-
-        my $rpmline = ${$rpmlist}[$i];
-
-        my $infoline = "Preparing link/patch RPM: $rpmline\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        if ( $rpmline =~ /^\s*(\S.*?\S)\s+(\S.*?\S)\s*$/ )
-        {
-            $oldpackagename = $1;
-            $newpackagename = $2;
-        }
-
-        my ($rpmunit, $includeline) = get_rpm_unit_from_xmlfile($oldpackagename, $xmlfile);
-        exchange_name_in_rpmunit($rpmunit, $oldpackagename, $newpackagename);
-        include_component_at_specific_line($xmlfile, $rpmunit, $includeline);
-    }
-}
-
-#######################################################################
-# Removing w4w filter module from xml file for Solaris x86 and Linux
-#######################################################################
-
-sub remove_w4w_from_xmlfile
-{
-    my ($xmlfile) = @_;
-
-    # Component begins with "<component selected='true' name='gid_Module_Prg_Wrt_Flt_W4w' componentVersion="8">"
-    # and ends with "</component>"
-
-    for ( my $i = 0; $i <= $#{$xmlfile}; $i++ )
-    {
-        if ( ${$xmlfile}[$i] =~ /name\s*\=\'\s*gid_Module_Prg_Wrt_Flt_W4w/ )
-        {
-            # Counting the lines till "</component>"
-
-            my $linecounter = 1;
-            my $startline = $i+1;
-            my $line = ${$xmlfile}[$startline];
-
-            while ((!( $line =~ /^\s*\<\/component\>\s*$/ )) && ( $startline <= $#{$xmlfile} ))
-            {
-                $linecounter++;
-                $startline++;
-                $line = ${$xmlfile}[$startline];
-            }
-
-            $linecounter = $linecounter + 2;     # last line and following empty line
-
-            splice(@{$xmlfile},$i, $linecounter);   # removing $linecounter lines, beginning in line $i
-            last;
-        }
-    }
-}
-
-#######################################################################
-# Removing module from xml file, if not defined in scp
-#######################################################################
-
-sub remove_scpgid_from_xmlfile
-{
-    my ($xmlfile, $scpgid) = @_;
-
-    # Component begins with "<component selected='true' name='$scpgid' componentVersion="8">"
-    # and ends with "</component>"
-
-    my $successfully_removed = 0;
-
-    for ( my $i = 0; $i <= $#{$xmlfile}; $i++ )
-    {
-        if ( ${$xmlfile}[$i] =~ /name\s*\=\'\s*\Q$scpgid\E/ )
-        {
-            # Counting the lines till "</component>"
-
-            my $linecounter = 1;
-            my $startline = $i+1;
-            my $line = ${$xmlfile}[$startline];
-
-            while ((!( $line =~ /^\s*\<\/component\>\s*$/ )) && ( $startline <= $#{$xmlfile} ))
-            {
-                $linecounter++;
-                $startline++;
-                $line = ${$xmlfile}[$startline];
-            }
-
-            $linecounter = $linecounter + 2;     # last line and following empty line
-
-            splice(@{$xmlfile},$i, $linecounter);   # removing $linecounter lines, beginning in line $i
-            $successfully_removed = 1;
-            last;
-        }
-    }
-
-    my $infoline = "";
-    if ($successfully_removed)
-    {
-        $infoline = "Module $scpgid successfully removed from xml file.\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Module $scpgid not found in xml file (no problem).\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-#######################################################################
-# Special mechanism for removing modules for xml file, if they are
-# not defined in scp (introduced for onlineupdate module).
-#######################################################################
-
-sub remove_module_if_not_defined
-{
-    my ($xmlfile, $modulesarrayref, $scpgid) = @_;
-
-    my $infoline = "Checking existence of $scpgid in scp definition\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $found = 0;
-
-    for ( my $i = 0; $i <= $#{$modulesarrayref}; $i++ )
-    {
-        my $onemodule = ${$modulesarrayref}[$i];
-        if ( $onemodule->{'gid'} eq $scpgid ) { $found = 1; }
-        if ( $found ) { last; }
-    }
-
-    if ( ! $found )
-    {
-        $infoline = "Module $scpgid not found -> Removing from xml file.\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        remove_scpgid_from_xmlfile($xmlfile, $scpgid);
-    }
-}
-
-###########################################################
-# Preparing the package subdirectory
-###########################################################
-
-sub create_empty_packages
-{
-    my ( $xmlfile ) = @_;
-
-    if ( $installer::globals::issolarispkgbuild )
-    {
-        my $path = "";
-
-        for ( my $i = 0; $i <= $#{$xmlfile}; $i++ )
-        {
-            if ( ${$xmlfile}[$i] =~ /pkgRelativePath\s*\=\s*\'(.*?)\'\s*$/ )
-            {
-                $path = $1;
-                installer::systemactions::create_directory_structure($path);
-                last;   # only creating one path
-            }
-        }
-
-        for ( my $i = 0; $i <= $#{$xmlfile}; $i++ )
-        {
-            if ( ${$xmlfile}[$i] =~ /pkgName\s*\=\s*\'(.*?)\'\s*$/ )
-            {
-                my $pkgname = $1;
-                if ( $path ne "" ) { $pkgname = $path . $installer::globals::separator . $pkgname; }
-                installer::systemactions::create_directory_structure($pkgname);
-            }
-        }
-    }
-
-    # "-novalidate" does not work for Linux RPMs
-
-    if ( $installer::globals::islinuxrpmbuild )
-    {
-        for ( my $i = 0; $i <= $#{$xmlfile}; $i++ )
-        {
-            if ( ${$xmlfile}[$i] =~ /rpmPath\s*\=\s*\"(.*?)\"\s*$/ )
-            {
-                my $rpmpath = $1;
-                my $path = "";
-
-                if ( $rpmpath =~ /^\s*(.*)\/(.*?)\s*$/ )
-                {
-                    $path = $1;
-                }
-
-                if ( $path ne "" ) { installer::systemactions::create_directory_structure($path); }
-
-                my $systemcall = "touch $rpmpath";  # creating empty rpm
-                system($systemcall);
-            }
-        }
-    }
-}
-
-###########################################################
-# Reading the archive file name from the xml file
-###########################################################
-
-sub get_archivefilename
-{
-    my ( $xmlfile ) = @_;
-
-    my $archivefilename = "";
-
-    for ( my $j = 0; $j <= $#{$xmlfile}; $j++ )
-    {
-        if ( ${$xmlfile}[$j] =~ /archiveFileName\s*=\s*\'(.*?)\'/ )
-        {
-            $archivefilename = $1;
-            last;
-        }
-    }
-
-    return $archivefilename;
-}
-
-#######################################################
-# Copying the loader locally
-#######################################################
-
-sub copy_setup_locally
-{
-    my ($includepatharrayref, $loadername, $newname) = @_;
-
-    my $loadernameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$loadername, $includepatharrayref, 0);
-
-    if ($$loadernameref eq "") { installer::exiter::exit_program("ERROR: Could not find Java loader $loadername!", "copy_setup_locally"); }
-
-    installer::systemactions::copy_one_file($$loadernameref, $newname);
-    my $localcall = "chmod 775 $newname \>\/dev\/null 2\>\&1";
-    system($localcall);
-}
-
-
-#######################################################
-# Copying the loader into the installation set
-#######################################################
-
-sub put_loader_into_installset
-{
-    my ($installdir, $filename) = @_;
-
-    my $installname = $installdir . $installer::globals::separator . $filename;
-
-    installer::systemactions::copy_one_file($filename, $installname);
-
-    my $localcall = "chmod 775 $installname \>\/dev\/null 2\>\&1";
-    system($localcall);
-}
-
-#################################################################
-# Setting for Solaris the package names in the Java translation
-# file. The name is used for the
-# This name is displayed tools like prodreg.
-# Unfortunately this name in the component is also used
-# in the translation template file for the module name
-# and module description translations.
-#################################################################
-
-sub replace_component_name_in_java_file
-{
-    my ($alljavafiles, $oldname, $newname) = @_;
-
-    # The new name must not contain white spaces
-
-    $newname =~ s/ /\_/g;
-
-    for ( my $i = 0; $i <= $#{$alljavafiles}; $i++ )
-    {
-        my $javafilename = ${$alljavafiles}[$i];
-        my $javafile = installer::files::read_file($javafilename);
-
-        my $oldstring = "ComponentDescription-" . $oldname;
-        my $newstring = "ComponentDescription-" . $newname;
-
-        for ( my $j = 0; $j <= $#{$javafile}; $j++ ) { ${$javafile}[$j] =~ s/\b$oldstring\b/$newstring/; }
-
-        $oldstring = $oldname . "-install-DisplayName";
-        $newstring = $newname . "-install-DisplayName";
-
-        for ( my $j = 0; $j <= $#{$javafile}; $j++ ) { ${$javafile}[$j] =~ s/\b$oldstring\b/$newstring/; }
-
-        $oldstring = $oldname . "-uninstall-DisplayName";
-        $newstring = $newname . "-uninstall-DisplayName";
-
-        for ( my $j = 0; $j <= $#{$javafile}; $j++ ) { ${$javafile}[$j] =~ s/\b$oldstring\b/$newstring/; }
-
-        installer::files::save_file($javafilename, $javafile);
-        $infoline = "Changes in Java file: $javafilename : $oldname \-\> $newname\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-#################################################################
-# Some module names are not defined in the scp project.
-# The names for this modules are searched in the base Java
-# translation file.
-#################################################################
-
-sub get_module_name_from_basejavafile
-{
-    my ($componentname, $javatemplateorigfile, $ulffile) = @_;
-
-    my $searchname = $componentname . "-install-DisplayName";
-    my $modulename = "";
-    my $replacename = "";
-
-    # line content: { "coremodule-install-DisplayName", "OOO_INSTALLSDK_117" },
-
-    for ( my $i = 0; $i <= $#{$javatemplateorigfile}; $i++ )
-    {
-        if ( ${$javatemplateorigfile}[$i] =~ /\"\s*\Q$searchname\E\s*\"\s*\,\s*\"\s*(.*?)\s*\"\s*\}\s*\,\s*$/ )
-        {
-            $replacename = $1;
-            last;
-        }
-    }
-
-    if ( $replacename ne "" )
-    {
-        my $language_block = get_language_block_from_language_file($replacename, $ulffile);
-        $modulename = get_language_string_from_language_block($language_block, "en-US", $replacename);
-    }
-
-    return $modulename;
-}
-
-#################################################################
-# Setting for Solaris the package names in the xml file.
-# This name is displayed tools like prodreg.
-# Unfortunately this name in the component is also used
-# in the translation template file for the module name
-# and module description translations.
-#################################################################
-
-sub replace_component_names
-{
-    my ($xmlfile, $templatefilename, $modulesarrayref, $javatemplateorigfile, $ulffile) = @_;
-
-    # path in which all java languages files are located
-
-    my $javafilesdir = $templatefilename;
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$javafilesdir);
-    my $alljavafiles = installer::systemactions::find_file_with_file_extension("java", $javafilesdir);
-    for ( my $i = 0; $i <= $#{$alljavafiles}; $i++ ) { ${$alljavafiles}[$i] = $javafilesdir . ${$alljavafiles}[$i]; }
-
-    # analyzing the xml file
-
-    for ( my $i = 0; $i <= $#{$xmlfile}; $i++ )
-    {
-        my $newstring = "";
-        my $componentname = "";
-
-        if ( ${$xmlfile}[$i] =~ /\bcomponent\b.*\bname\s*\=\'\s*(.*?)\s*\'/ )
-        {
-            $componentname = $1;
-
-            # Getting module name from the scp files in $modulesarrayref
-
-            my $onelanguage = "en-US";
-            my $gid = $componentname;
-            my $type = "Name";
-
-            my $modulename = "";
-            $modulename = get_module_name_description($modulesarrayref, $onelanguage, $gid, $type);
-
-            if ( $modulename eq "" )
-            {
-                $infoline = "Info: Modulename for $gid not defined in modules collector. Looking in Java ulf file.\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            }
-
-            if ( $modulename eq "" ) # the modulename can also be set in the Java ulf file
-            {
-                $modulename = get_module_name_from_basejavafile($componentname, $javatemplateorigfile, $ulffile);
-            }
-
-            if ( $modulename ne "" )    # only do something, if the modulename was found
-            {
-                ${$xmlfile}[$i] =~ s/$componentname/$modulename/;
-
-                $infoline = "Replacement in xml file (Solaris): $componentname \-\> $modulename\n";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                # Replacement has to be done in all Java language files
-                replace_component_name_in_java_file($alljavafiles, $componentname, $modulename);
-            }
-
-            if ( $modulename eq "" ) # the modulename can also be set in the Java ulf file
-            {
-                $infoline = "WARNING: No replacement in xml file for component: $componentname\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            }
-        }
-    }
-}
-
-#############################################################################
-# Collecting all packages or rpms located in the installation directory
-#############################################################################
-
-sub get_all_packages_in_installdir
-{
-    my ($installdir, $subdir) = @_;
-
-    my $infoline = "";
-
-    my @allrpms = ();   # not needed for Solaris at the moment
-    my $allrpms = \@allrpms;
-
-    $installdir =~ s/\Q$installer::globals::separator\E\s*$//;
-    my $directory = $installdir . $installer::globals::separator . $subdir;
-    $directory =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    if ( $installer::globals::islinuxrpmbuild )
-    {
-        $allrpms = installer::systemactions::find_file_with_file_extension("rpm", $directory);
-
-        # collecting rpms with the complete path
-
-        for ( my $i = 0; $i <= $#{$allrpms}; $i++ )
-        {
-            ${$allrpms}[$i] = $directory . $installer::globals::separator . ${$allrpms}[$i];
-            $infoline = "Found RPM: ${$allrpms}[$i]\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }
-
-    return $allrpms;
-}
-
-#######################################################
-# Adding the values of the array
-#######################################################
-
-sub do_sum
-{
-    my ( $allnumbers ) = @_;
-
-    my $sum = 0;
-
-    for ( my $i = 0; $i <= $#{$allnumbers}; $i++ )
-    {
-        $sum = $sum + ${$allnumbers}[$i];
-    }
-
-    return $sum;
-}
-
-#######################################################
-# Setting the filesize for the RPMs in the xml file
-#######################################################
-
-sub set_filesize_in_xmlfile
-{
-    my ($filesize, $rpmname, $xmlfile) = @_;
-
-    my $infoline = "";
-    my $foundrpm = 0;
-    my $filesizeset = 0;
-
-    for ( my $i = 0; $i <= $#{$xmlfile}; $i++ )
-    {
-        my $line = ${$xmlfile}[$i];
-
-        # searching for "rpmPath="RPMS/${UNIXPRODUCTNAME}-core01-${PACKAGEVERSION}-${PACKAGEREVISION}.i586.rpm""
-
-        if (( $line =~ /rpmPath\s*=/ ) && ( $line =~ /\Q$rpmname\E\"\s*$/ ))
-        {
-            $foundrpm = 1;
-
-            my $number = $i;
-            $number++;
-
-            while ( ! ( ${$xmlfile}[$number] =~ /\/\>\s*$/ ))
-            {
-                if ( ${$xmlfile}[$number] =~ /FILESIZEPLACEHOLDER/ )
-                {
-                    ${$xmlfile}[$number] =~ s/FILESIZEPLACEHOLDER/$filesize/;
-                    $filesizeset = 1;
-                    $infoline = "Setting filesize for $rpmname : $filesize\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                    last;
-                }
-
-                $number++;
-            }
-
-            last;
-        }
-    }
-
-    if ( ! $foundrpm )
-    {
-        $infoline = "ERROR: Did not find $rpmname in xml file !\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    if ( ! $filesizeset )
-    {
-        $infoline = "ERROR: Did not set filesize for $rpmname in xml file !\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-############################################################
-# Collecting all rpmUniqueName in xml file.
-############################################################
-
-sub collect_uniquenames_in_xmlfile
-{
-    my ($xmlfile) = @_;
-
-    my @rpmuniquenames = ();
-
-    for ( my $i = 0; $i <= $#{$xmlfile}; $i++ )
-    {
-        my $oneline = ${$xmlfile}[$i];
-
-        if ( $oneline =~ /^\s*rpmUniqueName\s*\=\s*\"(.*)\"\s*$/ )
-        {
-            my $rpmuniquename = $1;
-            push(@rpmuniquenames, $rpmuniquename)
-        }
-    }
-
-    return \@rpmuniquenames;
-}
-
-############################################################
-# Searching for the corresponding rpm, that fits to
-# the unique rpm name.
-# Simple mechanism: The name of the rpm starts with the
-# unique rpm name followed by a "-".
-############################################################
-
-sub find_rpmname_to_uniquename
-{
-    my ($uniquename, $listofpackages) = @_;
-
-    my @all_correct_rpms = ();
-    my $infoline = "";
-
-    # special handling for java RPMs, which have a very strange naming schema
-    my $localuniquename = $uniquename;
-    if ( $uniquename =~ /^\s*jre\-/ ) { $localuniquename = "jre"; }
-
-    for ( my $i = 0; $i <= $#{$listofpackages}; $i++ )
-    {
-        my $completerpmname = ${$listofpackages}[$i];
-        my $rpmname = $completerpmname;
-        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$rpmname);
-
-        if ( $rpmname =~ /^\s*\Q$localuniquename\E\-\d/ ) { push(@all_correct_rpms, $rpmname); }
-    }
-
-    # @all_correct_rpms has to contain exactly one value
-
-    if ( $#all_correct_rpms > 0 )
-    {
-        my $number = $#all_correct_rpms + 1;
-        $infoline = "There are $number RPMs for the unique name \"$uniquename\" :\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        my $allrpmstring = "";
-        for ( my $i = 0; $i <= $#all_correct_rpms; $i++ ) { $allrpmstring = $allrpmstring . $all_correct_rpms[$i] . "\n"; }
-        push( @installer::globals::logfileinfo, $allrpmstring);
-        installer::exiter::exit_program("ERROR: Found $number RPMs that start with unique name \"$uniquename\". Only one allowed!", "find_rpmname_to_uniquename");
-    }
-
-    if ( $#all_correct_rpms < 0 )
-    {
-        $infoline = "There is no rpm for the unique name \"$uniquename\"\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        installer::exiter::exit_program("ERROR: There is no RPM that start with unique name \"$uniquename\"!", "find_rpmname_to_uniquename");
-    }
-
-    if ( $#all_correct_rpms == 0 )
-    {
-        $infoline = "Found one rpm for the unique name \"$uniquename\" : $all_correct_rpms[0]\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    return $all_correct_rpms[0];
-}
-
-#######################################################
-# Including the complete RPM name into the xml file
-#######################################################
-
-sub set_rpmname_into_xmlfile
-{
-    my ($rpmname, $uniquename, $xmlfile) = @_;
-
-    my $foundrpm = 0;
-    my $rpmnameset = 0;
-
-    for ( my $i = 0; $i <= $#{$xmlfile}; $i++ )
-    {
-        my $oneline = ${$xmlfile}[$i];
-
-        if ( $oneline =~ /^\s*rpmUniqueName\s*\=\s*\"\Q$uniquename\E\"\s*$/ )
-        {
-            $foundrpm = 1;
-
-            my $number = $i;
-            $number++;
-
-            while ( ! ( ${$xmlfile}[$number] =~ /\/\>\s*$/ ))
-            {
-                if ( ${$xmlfile}[$number] =~ /RPMFILENAMEPLACEHOLDER/ )
-                {
-                    ${$xmlfile}[$number] =~ s/RPMFILENAMEPLACEHOLDER/$rpmname/;
-                    $rpmnameset = 1;
-                    $infoline = "Setting RPM name for $uniquename : $rpmname\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                    last;
-                }
-
-                $number++;
-            }
-
-            last;
-        }
-    }
-
-    if ( ! $foundrpm )
-    {
-        $infoline = "ERROR: Did not find $rpmname in xml file !\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    if ( ! $rpmnameset )
-    {
-        $infoline = "ERROR: Did not set rpm name for $uniquename in xml file !\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-}
-
-############################################################
-# Including the rpm path dynamically into the xml file.
-# This is introduced, because system integration has
-# variable PackageVersion and PackageRevision in xml file.
-############################################################
-
-sub put_rpmpath_into_xmlfile
-{
-    my ($xmlfile, $listofpackages) = @_;
-
-    my $infoline = "";
-
-    my $alluniquenames = collect_uniquenames_in_xmlfile($xmlfile);
-
-    my $number = $#{$listofpackages} + 1;
-    $infoline = "Number of packages in installation set: $number\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $number = $#{$alluniquenames} + 1;
-    $infoline = "Number of unique RPM names in xml file: $number\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    $infoline = "\nPackages in installation set:\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    for ( my $i = 0; $i <= $#{$listofpackages}; $i++ )
-    {
-        $infoline = "${$listofpackages}[$i]\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    $infoline = "\nUnique RPM names in xml file:\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    for ( my $i = 0; $i <= $#{$alluniquenames}; $i++ )
-    {
-        $infoline = "${$alluniquenames}[$i]\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    if ( $#{$alluniquenames} != $#{$listofpackages} ) { installer::exiter::exit_program("ERROR: xml file contains $#{$alluniquenames} unique names, but there are $#{$listofpackages} packages in installation set!", "put_rpmpath_into_xmlfile"); }
-
-    for ( my $i = 0; $i <= $#{$alluniquenames}; $i++ )
-    {
-        my $uniquename = ${$alluniquenames}[$i];
-        my $rpmname = find_rpmname_to_uniquename($uniquename, $listofpackages);
-        set_rpmname_into_xmlfile($rpmname, $uniquename, $xmlfile);
-    }
-}
-
-#######################################################
-# Including the file size of the rpms into the
-# xml file
-#######################################################
-
-sub put_filesize_into_xmlfile
-{
-    my ($xmlfile, $listofpackages) = @_;
-
-    my $infoline = "";
-
-    for ( my $i = 0; $i <= $#{$listofpackages}; $i++ )
-    {
-        my $completerpmname = ${$listofpackages}[$i];
-        my $rpmname = $completerpmname;
-        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$rpmname);
-
-        if ( ! $installer::globals::rpmquerycommand ) { installer::exiter::exit_program("ERROR: rpm not found for querying packages!", "put_filesize_into_xmlfile"); }
-        my $systemcall = "$installer::globals::rpmquerycommand -qp --queryformat \"\[\%\{FILESIZES\}\\n\]\" $completerpmname 2\>\&1 |";
-        my $rpmout = make_systemcall($systemcall, 0);
-        my $filesize = do_sum($rpmout);
-
-        $infoline = "Filesize $rpmname : $filesize\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        set_filesize_in_xmlfile($filesize, $rpmname, $xmlfile);
-    }
-}
-
-#######################################################
-# Creating the java installer class file dynamically
-#######################################################
-
-sub create_java_installer
-{
-    my ( $installdir, $newdir, $languagestringref, $languagesarrayref, $allvariableshashref, $includepatharrayref, $modulesarrayref ) = @_;
-
-    installer::logger::include_header_into_logfile("Creating Java installer:");
-
-    my $infoline = "";
-
-    # collecting all packages or rpms located in the installation directory
-    my $listofpackages = get_all_packages_in_installdir($installdir, $newdir);
-
-    # creating the directory
-    my $javadir = installer::systemactions::create_directories("javainstaller", $languagestringref);
-    $javadir =~ s/\/\s*$//;
-#   push(@installer::globals::removedirs, $javadir);
-
-    # copying the content from directory install_sdk into the java directory
-
-    my $projectroot = "";
-    if ( $ENV{'PRJ'} ) { $projectroot = $ENV{'PRJ'}; }
-    else { installer::exiter::exit_program("ERROR: Environment variable PRJ not set", "create_java_installer"); }
-
-    $projectroot =~ s/\/\s*$//;
-    my $sourcedir = "$projectroot/inc_global/unix/install_sdk";
-    installer::systemactions::copy_complete_directory_without_cvs($sourcedir, $javadir);
-
-    # determining the java template file
-
-    my $templatefilename = $javadir . $installer::globals::separator . "locale/resources/MyResources_template.java";
-
-    # Saving the content of the template file. It is used in the xml files
-
-    my $javatemplateorigfile = installer::files::read_file($templatefilename);
-
-    # determining the ulf language file
-
-    # my $ulffilename = "installsdk.ulf";
-    my $ulffilename = "installsdk.jlf";
-    $ulffilename = $installer::globals::javalanguagepath . $installer::globals::separator . $ulffilename;
-    my $ulffile = installer::files::read_file($ulffilename);
-
-    $infoline = "\nReading ulf file: $ulffilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    $infoline = "Translating the Java template file\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    for ( my $i = 0; $i <= $#{$languagesarrayref}; $i++ )
-    {
-        my $onelanguage = ${$languagesarrayref}[$i];
-
-        # replacing all strings in the Java file with content of ulf files
-
-        my $templatefile = installer::files::read_file($templatefilename);
-
-        set_component_name_and_description($templatefile, $modulesarrayref, $onelanguage);
-        translate_javafile($templatefile, $ulffile, $onelanguage);
-
-        # adding the license file into the Java file
-
-        my $licensefilesource = get_licensefilesource($onelanguage, $includepatharrayref);
-        my $licensefile = installer::files::read_file($licensefilesource);
-        add_license_file_into_javafile($templatefile, $licensefile, $includepatharrayref, $javadir, $onelanguage);
-
-        # setting productname and productversion
-
-        set_productname_and_productversion($templatefile, $allvariableshashref);
-
-        # setting the class name in the java file ( "MyResources_TEMPLATE" -> "MyResources_en" )
-
-        # if ( $onelanguage =~ /^\s*(\w+)\-(\w+)\s*$/ ) { $onelanguage = $1; }
-        $onelanguage =~ s/en-US/en/;    # java file name and class name contain only "_en"
-        $onelanguage =~ s/\-/\_/;       # "pt-BR" -> "pt_BR"
-        my $classfilename = "MyResources_" . $onelanguage;
-        set_classfilename($templatefile, $classfilename, "MyResources_TEMPLATE");
-
-        # saving the new file
-
-        my $newfilename = $templatefilename;
-        $newfilename =~ s/_template\.java\s*$/_$onelanguage\.java/;
-
-        installer::files::save_file($newfilename, $templatefile);
-
-        $infoline = "Saving Java file: $newfilename\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    # renaming one language java file to "MyResources.java"
-
-    my $baselanguage = installer::languages::get_default_language($languagesarrayref);
-    $baselanguage =~ s/\-/\_/;      # "pt-BR" -> "pt_BR"
-    $baselanguage =~ s/en_US/en/;   # java file name and class name contain only "_en"
-    # if ( $baselanguage =~ /^\s*(\w+)\-(\w+)\s*$/ ) { $baselanguage = $1; }     # java file name and class name contain only "_en"
-    # $baselanguage =~ s/en-US/en/;  # java file name and class name contain only "_en"
-    my $baselanguagefilename = $javadir . $installer::globals::separator . "locale/resources/MyResources_" . $baselanguage . "\.java";
-    my $basedestfilename = $javadir . $installer::globals::separator . "locale/resources/MyResources.java";
-    installer::systemactions::copy_one_file($baselanguagefilename, $basedestfilename);
-
-    # setting the class file name also for the base class
-
-    my $basetemplatefile = installer::files::read_file($basedestfilename);
-    my $oldclassfilename = $baselanguagefilename;
-    installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$oldclassfilename);
-    $oldclassfilename =~ s/\.java//;
-    my $newclassfilename = $basedestfilename;
-    installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$newclassfilename);
-    $newclassfilename =~ s/\.java//;
-
-    set_classfilename($basetemplatefile, $newclassfilename, $oldclassfilename);
-
-    installer::files::save_file($basedestfilename, $basetemplatefile);
-
-    $infoline = "Created base Java file: $basedestfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    # deleting the template file
-
-    unlink($templatefilename);
-
-    $infoline = "Deleted template Java resource file: $templatefilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    # changing into Java directory
-
-    my $from = cwd();
-
-    chdir($javadir);
-
-    $infoline = "Changing into directory: $javadir\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    # preparing the xml file
-
-    my $xmlfilename = "";
-    my $subdir = "";
-
-    if ( $installer::globals::issolarispkgbuild )
-    {
-        $xmlfilename = "pkgUnit.xml";
-    }
-    elsif ( $installer::globals::islinuxrpmbuild )
-    {
-        $xmlfilename = "rpmUnit.xml";
-    }
-    else
-    {
-        installer::exiter::exit_program("ERROR: No platform for Install SDK", "create_java_installer");
-    }
-
-    # reading, editing and saving the xmlfile
-
-    my $xmlfile = installer::files::read_file($xmlfilename);
-    prepare_language_pack_in_xmlfile($xmlfile, $languagesarrayref);
-    my $xmlfilename2 = $xmlfilename . ".test2";
-    installer::files::save_file($xmlfilename2, $xmlfile);
-    remove_empty_packages_in_xmlfile($xmlfile);
-    my $xmlfilename3 = $xmlfilename . ".test3";
-    installer::files::save_file($xmlfilename3, $xmlfile);
-    substitute_variables($xmlfile, $allvariableshashref);
-    if (( $installer::globals::islinuxrpmbuild ) && ( $#installer::globals::linkrpms > -1 )) { prepare_linkrpm_in_xmlfile($xmlfile,\@installer::globals::linkrpms); }
-    if ( $installer::globals::issolarisx86build || $installer::globals::islinuxbuild ) { remove_w4w_from_xmlfile($xmlfile); }
-    remove_module_if_not_defined($xmlfile, $modulesarrayref, "gid_Module_Optional_Onlineupdate");
-    replace_component_names($xmlfile, $templatefilename, $modulesarrayref, $javatemplateorigfile, $ulffile);
-    my $xmlfilename4 = $xmlfilename . ".test4";
-    installer::files::save_file($xmlfilename4, $xmlfile);
-    if ( $installer::globals::islinuxrpmbuild ) { put_rpmpath_into_xmlfile($xmlfile, $listofpackages); }
-    if ( $installer::globals::islinuxrpmbuild ) { put_filesize_into_xmlfile($xmlfile, $listofpackages); }
-    installer::files::save_file($xmlfilename, $xmlfile);
-    $infoline = "Saving xml file: $xmlfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    # Setting the classpath and starting compiler
-
-    set_classpath_for_install_sdk($javadir);
-
-    # creating class files:
-    # language class file, dialog class files, installer class file
-
-    my $jdkpath = "";
-    if ( $ENV{'JDKPATH'} ) { $jdkpath = $ENV{'JDKPATH'}; }
-
-    my $javac = "javac";
-    if ( $jdkpath ) { $javac = $jdkpath . $installer::globals::separator . $javac; }
-
-    my $systemcall = "$javac locale\/resources\/\*\.java 2\>\&1 |";
-    make_systemcall($systemcall, 1);
-
-    $systemcall = "$javac com\/sun\/staroffice\/install\/\*\.java 2\>\&1 |";
-    make_systemcall($systemcall, 1);
-
-    # making subdirectory creating empty packages
-    create_empty_packages($xmlfile);
-
-    # Copy "jresetup" from solver locally to include it into the classfile
-    # Copy "jresetup" from solver to installdir
-
-    my $setupname = "jresetup";
-    my $newname = "setup";
-    copy_setup_locally($includepatharrayref, $setupname, $newname);
-
-    my $java = "java";
-    if ( $jdkpath ) { $java = $jdkpath . $installer::globals::separator . $java; }
-
-    $systemcall = "$java com.sun.setup.builder.InstallBuilder $xmlfilename -novalidate 2\>\&1 |";
-    make_systemcall($systemcall, 1);
-
-    # copying the newly created classfile into the installation set
-
-    my $archivefilename = get_archivefilename($xmlfile);
-    $archivefilename = $archivefilename . ".class";
-
-    if ( ! -f $archivefilename ) { installer::exiter::exit_program("ERROR: Could not find Java class file $archivefilename!", "create_java_installer"); }
-
-    installer::systemactions::copy_one_file($archivefilename, $installdir);
-
-    # Adding the loader into the installation set. The name of the loader is setup.
-    put_loader_into_installset($installdir, $newname);
-
-    chdir($from);
-
-    $infoline = "Changing into directory: $from\n";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-1;
diff --git a/solenv/bin/modules/installer/languagepack.pm b/solenv/bin/modules/installer/languagepack.pm
index ded5bc3d2e21..2108c17ae724 100644
--- a/solenv/bin/modules/installer/languagepack.pm
+++ b/solenv/bin/modules/installer/languagepack.pm
@@ -82,33 +82,6 @@ sub select_language_items
 
             if ( $specificlanguage eq $onelanguage )
             {
-                # $oneitem->{'modules'} = $installer::globals::rootmodulegid;    # all files in a language pack are root files
-                # Using $installer::globals::languagemodulesbase (?)
-
-#               # no more automatic change of module assignments
-#               $oneitem->{'modules'} = $installer::globals::rootmodulegid . "_$locallang";      # all files in a language pack are root files
-#
-#               if (( $installer::globals::islinuxbuild ) || ( $installer::globals::issolarispkgbuild ))
-#               {
-#                   if ( $oneitem->{'Dir'} )
-#                   {
-#                       if ( $oneitem->{'Dir'} eq "gid_Dir_Fonts_Truetype" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Fonts_$locallang"; }
-#                       if ( $oneitem->{'Dir'} eq "gid_Dir_Resource" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Resource_$locallang"; }
-#                       if ( $oneitem->{'Dir'} eq "gid_Dir_Help_Isolanguage" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Help_$locallang"; }
-#                   }
-#               }
-
-                # preparing different modules for Windows Installer language packs
-                # my $underlinelanguage = $specificlanguage;
-                # $underlinelanguage =~ s/-/_/;
-                # if ( $installer::globals::iswindowsbuild ) { $oneitem->{'modules'} = $installer::globals::languagemodulesbase . $underlinelanguage; }
-
-#               # no more collecting of language pack feature
-#               if (! installer::existence::exists_in_array($oneitem->{'modules'}, \@installer::globals::languagepackfeature))
-#               {
-#                   push(@installer::globals::languagepackfeature, $oneitem->{'modules'});  # Collecting all language pack feature
-#               }
-
                 push(@itemsarray, $oneitem);
             }
         }
@@ -195,20 +168,6 @@ sub get_packagename_from_packagelist
 {
     my ( $alldirs, $allvariables, $languagestringref ) = @_;
 
-    # my $packagename = "";
-
-    # for ( my $i = 0; $i <= $#{$alldirs}; $i++ )
-    # {
-    #   if ( ${$alldirs}[$i] =~ /-fonts/ ) { next; }
-    #   if ( ${$alldirs}[$i] =~ /-help/ ) { next; }
-    #   if ( ${$alldirs}[$i] =~ /-res/ ) { next; }
-    #
-    #   $packagename = ${$alldirs}[$i];
-    #   last;
-    # }
-
-    # if ( $packagename eq "" ) { installer::exiter::exit_program("ERROR: Could not find base package in directory $installdir!", "get_packagename_from_packagelist"); }
-
     my $localproductname = $allvariables->{'PRODUCTNAME'};
     $localproductname = lc($localproductname);
     $localproductname =~ s/ //g;
@@ -232,14 +191,14 @@ sub determine_packagename
     my $packagename = "";
     my $allnames = "";
 
-    if ( $installer::globals::islinuxrpmbuild )
+    if ( $installer::globals::isrpmbuild )
     {
         # determining the rpm file in directory $installdir
 
         my $fileextension = "rpm";
         my $rpmfiles = installer::systemactions::find_file_with_file_extension($fileextension, $installdir);
         if ( ! ( $#{$rpmfiles} > -1 )) { installer::exiter::exit_program("ERROR: Could not find package in directory $installdir!", "determine_packagename"); }
-        my $rpmsav = installer::converter::copy_array_from_references($rpmfiles);
+        my $rpmsav = [@{$rpmfiles}];
         for ( my $i = 0; $i <= $#{$rpmfiles}; $i++ ) { installer::pathanalyzer::make_absolute_filename_to_relative_filename(\${$rpmfiles}[$i]); }
 
         $packagename = get_packagename_from_packagelist($rpmfiles, $allvariables, $languagestringref);
@@ -261,7 +220,7 @@ sub determine_packagename
         my $alldirs = installer::systemactions::get_all_directories($installdir);
 
         if ( ! ( $#{$alldirs} > -1 )) { installer::exiter::exit_program("ERROR: Could not find package in directory $installdir!", "determine_packagename"); }
-        my $alldirssav = installer::converter::copy_array_from_references($alldirs);
+        my $alldirssav = [@{$alldirs}];
         for ( my $i = 0; $i <= $#{$alldirs}; $i++ ) { installer::pathanalyzer::make_absolute_filename_to_relative_filename(\${$alldirs}[$i]); }
 
         $packagename = get_packagename_from_packagelist($alldirs, $allvariables, $languagestringref);
@@ -295,13 +254,13 @@ sub put_packagename_into_script
 
     if ( $installer::globals::issolarisbuild ) { $installline = "  /usr/sbin/pkgadd -d \$outdir -a \$adminfile"; }
 
-    if ( $installer::globals::islinuxrpmbuild ) { $installline = "  rpm --prefix \$PRODUCTINSTALLLOCATION --replacepkgs -i"; }
+    if ( $installer::globals::isrpmbuild ) { $installline = "  rpm --prefix \$PRODUCTINSTALLLOCATION --replacepkgs -i"; }
 
     for ( my $i = 0; $i <= $#{$allnames}; $i++ )
     {
         if ( $installer::globals::issolarisbuild ) { $installline = $installline . " ${$allnames}[$i]"; }
 
-        if ( $installer::globals::islinuxrpmbuild ) { $installline = $installline . " \$outdir/${$allnames}[$i]"; }
+        if ( $installer::globals::isrpmbuild ) { $installline = $installline . " \$outdir/${$allnames}[$i]"; }
     }
 
     for ( my $j = 0; $j <= $#{$scriptfile}; $j++ )
@@ -411,9 +370,6 @@ sub determine_scriptfile_name
 
     my $scriptfilename = $packagename;
 
-#   if ( $installer::globals::islinuxrpmbuild ) { $scriptfilename =~ s/\.rpm\s*$/\.sh/; }
-#   if ( $installer::globals::issolarisbuild ) { $scriptfilename =~ s/\.tar\.gz\s*$/\.sh/; }
-
     $scriptfilename =~ s/\.tar\.gz\s*$/\.sh/;
 
     my $infoline = "Setting language pack script file name to $scriptfilename\n";
@@ -466,8 +422,7 @@ sub include_package_into_script
         push( @installer::globals::logfileinfo, $infoline);
     }
 
-    my $localcall = "chmod 775 $scriptfilename \>\/dev\/null 2\>\&1";
-    system($localcall);
+    chmod 0775, $scriptfilename;
 
 }
 
@@ -519,7 +474,7 @@ sub build_installer_for_languagepack
 
     # find and read english license file
     my $licenselanguage = "en-US";                  # always english !
-    my $licensefilename = "LICENSE_" . $licenselanguage;
+    my $licensefilename = "LICENSE"; # _" . $licenselanguage;
     my $licenseincludepatharrayref = installer::worker::get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
 
     my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0);
diff --git a/solenv/bin/modules/installer/languages.pm b/solenv/bin/modules/installer/languages.pm
index 7070b09f80b8..8f0b6e929356 100644
--- a/solenv/bin/modules/installer/languages.pm
+++ b/solenv/bin/modules/installer/languages.pm
@@ -331,45 +331,6 @@ sub get_java_language
 {
     my ( $language ) = @_;
 
-    # my $javalanguage = "";
-
-    # if ( $language eq "en-US" ) { $javalanguage = "en_US"; }
-    # elsif ( $language eq "ar" ) { $javalanguage = "ar_AR"; }
-    # elsif ( $language eq "bg" ) { $javalanguage = "bg_BG"; }
-    # elsif ( $language eq "ca" ) { $javalanguage = "ca_CA"; }
-    # elsif ( $language eq "cs" ) { $javalanguage = "cs_CS"; }
-    # elsif ( $language eq "da" ) { $javalanguage = "da_DA"; }
-    # elsif ( $language eq "de" ) { $javalanguage = "de"; }
-    # elsif ( $language eq "de" ) { $javalanguage = "de_DE"; }
-    # elsif ( $language eq "et" ) { $javalanguage = "et_ET"; }
-    # elsif ( $language eq "el" ) { $javalanguage = "el_EL"; }
-    # elsif ( $language eq "fi" ) { $javalanguage = "fi_FI"; }
-    # elsif ( $language eq "fr" ) { $javalanguage = "fr_FR"; }
-    # elsif ( $language eq "hu" ) { $javalanguage = "hu_HU"; }
-    # elsif ( $language eq "he" ) { $javalanguage = "he_HE"; }
-    # elsif ( $language eq "it" ) { $javalanguage = "it_IT"; }
-    # elsif ( $language eq "nl" ) { $javalanguage = "nl_NL"; }
-    # elsif ( $language eq "es" ) { $javalanguage = "es_ES"; }
-    # elsif ( $language eq "sv" ) { $javalanguage = "sv_SV"; }
-    # elsif ( $language eq "sk" ) { $javalanguage = "sk_SK"; }
-    # elsif ( $language eq "pl" ) { $javalanguage = "pl_PL"; }
-    # elsif ( $language eq "pt-BR" ) { $javalanguage = "pt_BR"; }
-    # elsif ( $language eq "ru" ) { $javalanguage = "ru_RU"; }
-    # elsif ( $language eq "tr" ) { $javalanguage = "tr_TR"; }
-    # elsif ( $language eq "ja" ) { $javalanguage = "ja"; }
-    # elsif ( $language eq "ja" ) { $javalanguage = "ja_JP"; }
-    # elsif ( $language eq "ko" ) { $javalanguage = "ko_KR"; }
-    # elsif ( $language eq "th" ) { $javalanguage = "th_TH"; }
-    # elsif ( $language eq "zh-CN" ) { $javalanguage = "zh_CN"; }
-    # elsif ( $language eq "zh-TW" ) { $javalanguage = "zh_TW"; }
-
-    # languages not defined yet
-    # if ( $javalanguage eq "" )
-    # {
-    #   $javalanguage = $language;
-    #   $javalanguage =~ s/\-/\_/;
-    # }
-
     $javalanguage = $language;
     $javalanguage =~ s/\-/\_/;
 
diff --git a/solenv/bin/modules/installer/mail.pm b/solenv/bin/modules/installer/mail.pm
deleted file mode 100644
index 3580b3f3b6ab..000000000000
--- a/solenv/bin/modules/installer/mail.pm
+++ /dev/null
@@ -1,136 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::mail;
-
-use Net::SMTP;
-use installer::converter;
-use installer::exiter;
-use installer::ziplist;
-
-#########################################
-# Sending a mail
-#########################################
-
-sub send_mail
-{
-    my ($message, $listenerstring, $mailinfostring, $languagesref, $destdir) = @_;
-
-    my $listener = installer::converter::convert_stringlist_into_array($listenerstring, ",");
-    my $mailinfo = installer::converter::convert_stringlist_into_array($mailinfostring, ",");
-
-    my @listener = ();
-
-    for ( my $i = 0; $i <= $#{$listener}; $i++ ) { push(@listener, ${$listener}[$i]); }
-    for ( my $i = 0; $i <= $#{$mailinfo}; $i++ ) { ${$mailinfo}[$i] =~ s/\s*$//g; }
-
-    my $smtphost = ${$mailinfo}[0];
-    my $account = ${$mailinfo}[1];
-    my $sender = ${$mailinfo}[2];
-
-    if ( ! $smtphost ) { installer::exiter::exit_program("ERROR: Could not read SMTP Host in list file!", "send_mail"); }
-    if ( ! $account ) { installer::exiter::exit_program("ERROR: Could not read Account in list file!", "send_mail"); }
-    if ( ! $sender ) { installer::exiter::exit_program("ERROR: Could not read Sender in list file!", "send_mail"); }
-
-    my $subject = "";
-    my $basestring = $installer::globals::product . " " . $installer::globals::compiler . $installer::globals::productextension . " " . $installer::globals::build. " " . $installer::globals::buildid . " " . $$languagesref . "\n";
-    if ( $message eq "ERROR" ) { $subject = "ERROR: $basestring" }
-    if ( $message eq "SUCCESS" ) { $subject = "SUCCESS: $basestring" }
-
-    my @message = ();
-
-    my $recipient_string = join ',', @listener;
-    push(@message, "Subject: $subject");
-    push(@message, "To: $recipient_string");
-    push(@message, "\n");
-    push(@message, "Located at $destdir");
-
-    if ( $message eq "ERROR" )
-    {
-        for ( my $j = 0; $j <= $#installer::globals::errorlogfileinfo; $j++ )
-        {
-            my $line = $installer::globals::errorlogfileinfo[$j];
-            $line =~ s/\s*$//g;
-            push(@message, $line);
-        }
-    }
-
-    for ( my $i = 0; $i <= $#message; $i++ ) { $message[$i] = $message[$i] . "\015\012"; }
-
-    my $smtp = Net::SMTP->new( $smtphost, Hello => $account, Debug => 0 );
-
-    # set sender
-    $smtp->mail($sender);
-
-    # listener
-    my @good_addresses = ();
-    $smtp->recipient( @listener, { SkipBad => 1 } );
-
-    # send message
-    $smtp->data(\@message);
-
-    # quit server
-    $smtp->quit();
-}
-
-sub send_fail_mail
-{
-    my ($allsettingsarrayref, $languagestringref, $errordir) = @_;
-
-    # sending a mail into the error board
-    my $listener = "";
-    $listener = installer::ziplist::getinfofromziplist($allsettingsarrayref, "fail");
-
-    if ( $$listener )
-    {
-        my $mailinfo = installer::ziplist::getinfofromziplist($allsettingsarrayref, "mailinfo");
-
-        if ( $$mailinfo ) { send_mail("ERROR", $listener, $mailinfo, $languagestringref, $errordir); }
-        else { installer::exiter::exit_program("ERROR: Could not read mailinfo in list file!", "send_fail_mail"); }
-    }
-}
-
-sub send_success_mail
-{
-    my ($allsettingsarrayref, $languagestringref, $completeshipinstalldir) = @_;
-
-    # sending success mail
-    my $listener = "";
-    $listener = installer::ziplist::getinfofromziplist($allsettingsarrayref, "success");
-
-    if ( $$listener )
-    {
-        my $mailinfo = installer::ziplist::getinfofromziplist($allsettingsarrayref, "mailinfo");
-
-        if ( $$mailinfo ) { send_mail("SUCCESS", $listener, $mailinfo, $languagestringref, $completeshipinstalldir); }
-        else { installer::exiter::exit_program("ERROR: Could not read mailinfo in list file!", "send_success_mail"); }
-
-    }
-}
-
-
-1;
diff --git a/solenv/bin/modules/installer/packagelist.pm b/solenv/bin/modules/installer/packagelist.pm
index f2becc19a610..1c5d6fa00ba0 100644
--- a/solenv/bin/modules/installer/packagelist.pm
+++ b/solenv/bin/modules/installer/packagelist.pm
@@ -85,7 +85,6 @@ sub analyze_list
 
         push(@allmodules, $onegid);
 
-        # get_children($moduleslist, $onegid, \@allmodules);
         get_children_with_hash($moduleshash, $onegid, \@allmodules);
 
         $onepackage->{'allmodules'} = \@allmodules;
@@ -180,8 +179,6 @@ sub remove_multiple_modules_packages
         my $onepackage = ${$allpackagemodules}[$i];
         my $allmodules = $onepackage->{'allmodules'};
 
-        # print "Modules below $onepackage->{'module'}: $#{$allmodules}\n";
-
         # Comparing each package, with all following packages. If a
         # gid for the module is part of more than one package, it is
         # removed if the number of modules in the package is greater
@@ -240,14 +237,6 @@ sub remove_multiple_modules_packages
 
         $onepackage->{'allmodules'} = \@optimizedpackage;
     }
-
-    # for ( my $i = 0; $i <= $#{$allpackagemodules}; $i++ )
-    # {
-    #   my $onepackage = ${$allpackagemodules}[$i];
-    #   my $allmodules = $onepackage->{'allmodules'};
-    #   print "New: Modules below $onepackage->{'module'}: $#{$allmodules}\n";
-    # }
-
 }
 
 #####################################################################
@@ -652,11 +641,6 @@ sub collectpackages
         {
             my $modulegid = $onemodule->{'gid'};
 
-            # Only collecting modules with correct language for language packs
-#           if ( $installer::globals::languagepack ) { if ( ! ( $modulegid =~ /_$onelanguage\s*$/ )) { next; } }
-            # Resetting language, if this is no language pack
-#           if ( ! $installer::globals::languagepack ) { $onelanguage = ""; }
-
             my $styles = "";
             if ( $onemodule->{'Styles'} ) { $styles = $onemodule->{'Styles'}; }
 
diff --git a/solenv/bin/modules/installer/packagepool.pm b/solenv/bin/modules/installer/packagepool.pm
index d4032b7db17e..c3f3a91d2bd3 100644
--- a/solenv/bin/modules/installer/packagepool.pm
+++ b/solenv/bin/modules/installer/packagepool.pm
@@ -743,7 +743,7 @@ sub package_is_up_to_date
         log_pool_info(0);
 
         # removing new package from installation set
-        if ( $newpackagepath ne "" ) { remove_package_from_installset($newpackagepath); }   # A file was copied and a problem occured with pooling
+        if ( $newpackagepath ne "" ) { remove_package_from_installset($newpackagepath); }   # A file was copied and a problem occurred with pooling
 
         $package_is_up_to_date = 4; # repeat this package
         return $package_is_up_to_date;
@@ -756,7 +756,7 @@ sub package_is_up_to_date
         log_pool_info(1);
 
         # removing new package from installation set
-        if ( $newpackagepath ne "" ) { remove_package_from_installset($newpackagepath); }   # A file was copied and a problem occured with pooling
+        if ( $newpackagepath ne "" ) { remove_package_from_installset($newpackagepath); }   # A file was copied and a problem occurred with pooling
 
         $package_is_up_to_date = 4; # repeat this package
         return $package_is_up_to_date;
@@ -914,7 +914,7 @@ sub put_content_into_pool
     }
 
     # Before the new package is renamed in the pool, it has to be checked, if this process still has the lock for this package.
-    # Check, if lock file still exists and if this process is the owner. Otherwise a pool error occured.
+    # Check, if lock file still exists and if this process is the owner. Otherwise a pool error occurred.
     if ( ! -f $installer::globals::poollockfilename )
     {
         unlink $uniquedestination;  # removing file from pool
@@ -936,7 +936,7 @@ sub put_content_into_pool
     push( @installer::globals::logfileinfo, $infoline);
 
     # Before the lock file in the pool can be removed, it has to be checked, if this process is still the owner of this lock file.
-    # Check, if lock file still exists and if this process is the owner. Otherwise a pool error occured.
+    # Check, if lock file still exists and if this process is the owner. Otherwise a pool error occurred.
     if ( ! -f $installer::globals::poollockfilename )
     {
         log_pool_info(0);
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 70bc32e36c7c..9c5ec8c24394 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -69,6 +69,7 @@ The following parameter are needed:
 -ispatchedepm : Usage of a patched (non-standard) epm (opt., non-Windows only)
 -copyproject : is set for projects that are only used for copying (optional)
 -languagepack : do create a languagepack, no product pack (optional)
+-helppack : do create a helppack, no product pack (optional)
 -patch : do create a patch (optional)
 -patchinc: Source for the patch include files (Solaris only)
 -dontstrip: No file stripping (Unix only)
@@ -153,13 +154,14 @@ sub getparameter
         elsif ($param eq "-buildid") { $installer::globals::buildid = shift(@ARGV); }
         elsif ($param eq "-copyproject") { $installer::globals::is_copy_only_project = 1; }
         elsif ($param eq "-languagepack") { $installer::globals::languagepack = 1; }
+        elsif ($param eq "-helppack") { $installer::globals::helppack = 1;}
         elsif ($param eq "-patch") { $installer::globals::patch = 1; }
         elsif ($param eq "-debian") { $installer::globals::debian = 1; }
         elsif ($param eq "-dontstrip") { $installer::globals::strip = 0; }
         elsif ($param eq "-destdir")    # new parameter for simple installer
         {
             $installer::globals::rootpath ne "" && die "must set destdir before -i or -simple";
-            $installer::globals::destdir = shift @ARGV;
+            $installer::globals::destdir = Cwd::realpath( shift @ARGV );
         }
         elsif ($param eq "-simple")     # new parameter for simple installer
         {
@@ -299,6 +301,11 @@ sub setglobalvariables
         }
     }
 
+    if ( $installer::globals::compiler =~ /unxobsd/ )
+    {
+            $installer::globals::epmoutpath = "openbsd";
+    }
+
     if ( $installer::globals::compiler =~ /unxfbsd/ )
     {
         $installer::globals::isfreebsdbuild = 1;
@@ -314,12 +321,23 @@ sub setglobalvariables
 
     if ( $installer::globals::compiler =~ /unxso[lg]i/ ) { $installer::globals::issolarisx86build = 1; }
 
+    if ($ENV{OS} eq 'AIX')
+    {
+        if ( $installer::globals::packageformat eq "rpm" )
+        {
+            $installer::globals::isrpmbuild = 1;
+            $installer::globals::isxpdplatform = 1;
+            $installer::globals::epmoutpath = "RPMS";
+        }
+        if ( $installer::globals::rpm eq "" ) { installer::exiter::exit_program("ERROR: Environment variable \"\$RPM\" has to be defined!", "setglobalvariables"); }
+    }
+
     if ($ENV{OS} eq 'LINUX')
     {
         $installer::globals::islinuxbuild = 1;
         if ( $installer::globals::packageformat eq "rpm" )
         {
-            $installer::globals::islinuxrpmbuild = 1;
+            $installer::globals::isrpmbuild = 1;
             $installer::globals::isxpdplatform = 1;
             $installer::globals::epmoutpath = "RPMS";
             if ( $installer::globals::compiler =~ /unxlngi/ )
@@ -346,8 +364,8 @@ sub setglobalvariables
             my $message = "Creating Debian packages";
             installer::logger::print_message( $message );
             push(@installer::globals::globallogfileinfo, $message);
-            $installer::globals::islinuxrpmbuild = 0;
-            $installer::globals::islinuxdebbuild = 1;
+            $installer::globals::isrpmbuild = 0;
+            $installer::globals::isdebbuild = 1;
             $installer::globals::epmoutpath = "DEBS";
             if ( $installer::globals::compiler =~ /unxlngi/ )
             {
@@ -379,7 +397,6 @@ sub setglobalvariables
     if ($installer::globals::unpackpath eq "")  # unpackpath not set
     {
         $installer::globals::unpackpath = cwd();
-        if ( $installer::globals::iswin ) { $installer::globals::unpackpath =~ s/\//\\/g; }
     }
 
     if ( $installer::globals::localunpackdir ne "" ) { $installer::globals::unpackpath = $installer::globals::localunpackdir; }
@@ -398,7 +415,7 @@ sub setglobalvariables
 
     # setting jds exclude file list
 
-    if ( $installer::globals::islinuxrpmbuild )
+    if ( $installer::globals::isrpmbuild )
     {
         $installer::globals::jdsexcludefilename = "jds_excludefiles_linux.txt";
     }
@@ -425,8 +442,7 @@ sub setglobalvariables
 
         if ( $installer::globals::compiler =~ /^unxmac/ )
         {
-            my $localcall = "chmod 777 $installer::globals::temppath \>\/dev\/null 2\>\&1";
-            system($localcall);
+            chmod 0777, $installer::globals::temppath;
         }
 
         $installer::globals::temppath = $installer::globals::temppath . $installer::globals::separator . "i";
@@ -532,7 +548,7 @@ sub control_required_parameter
     # for Solaris packages and Linux
     #######################################
 
-    if (( $installer::globals::patch ) && ( ! $installer::globals::issolarispkgbuild ) && ( ! $installer::globals::islinuxrpmbuild ) && ( ! $installer::globals::islinuxdebbuild ) && ( ! $installer::globals::iswindowsbuild ) && ( ! $installer::globals::ismacdmgbuild ))
+    if (( $installer::globals::patch ) && ( ! $installer::globals::issolarispkgbuild ) && ( ! $installer::globals::isrpmbuild ) && ( ! $installer::globals::isdebbuild ) && ( ! $installer::globals::iswindowsbuild ) && ( ! $installer::globals::ismacdmgbuild ))
     {
         installer::logger::print_error( "Sorry, Patch flag currently only available for Solaris pkg, Linux RPM and Windows builds!" );
         usage();
@@ -636,6 +652,7 @@ sub outputparameter
     }
     if ( $installer::globals::is_copy_only_project ) { push(@output, "This is a copy only project!\n"); }
     if ( $installer::globals::languagepack ) { push(@output, "Creating language pack!\n"); }
+    if ( $installer::globals::helppack ) { push(@output, "Creating help pack!\n"); }
     if ( $installer::globals::patch ) { push(@output, "Creating patch!\n"); }
     push(@output, "########################################################\n");
 
diff --git a/solenv/bin/modules/installer/pathanalyzer.pm b/solenv/bin/modules/installer/pathanalyzer.pm
index 1c57a0d76e02..62085dac5e14 100644
--- a/solenv/bin/modules/installer/pathanalyzer.pm
+++ b/solenv/bin/modules/installer/pathanalyzer.pm
@@ -39,7 +39,7 @@ sub get_path_from_fullqualifiedname
 
     if ( $$longfilenameref =~ /\Q$installer::globals::separator\E/ )    # Is there a separator in the path? Otherwise the path is empty.
     {
-        if ( $$longfilenameref =~ /^\s*(\S.*\S\Q$installer::globals::separator\E)(\S.+\S?)/ )
+        if ( $$longfilenameref =~ /^\s*(.*\Q$installer::globals::separator\E)(.+)/ )
         {
             $$longfilenameref = $1;
         }
diff --git a/solenv/bin/modules/installer/remover.pm b/solenv/bin/modules/installer/remover.pm
index 541a33bce4c1..c23007edd177 100644
--- a/solenv/bin/modules/installer/remover.pm
+++ b/solenv/bin/modules/installer/remover.pm
@@ -37,8 +37,8 @@ sub remove_leading_and_ending_whitespaces
 {
     my ( $stringref ) = @_;
 
-    $$stringref =~ s/^\s*//;
-    $$stringref =~ s/\s*$//;
+    $$stringref =~ s/^\s+//;
+    $$stringref =~ s/\s+$//;
 }
 
 sub remove_leading_and_ending_quotationmarks
diff --git a/solenv/bin/modules/installer/scppatchsoname.pm b/solenv/bin/modules/installer/scppatchsoname.pm
index 32a142828981..df7caeb48c81 100644
--- a/solenv/bin/modules/installer/scppatchsoname.pm
+++ b/solenv/bin/modules/installer/scppatchsoname.pm
@@ -175,9 +175,6 @@ sub resolving_patchsoname_flag
             my $destinationpath = $replacedir . $onefilename;
             my $movepath = $destinationpath . ".orig";
 
-            # if (!(-f $destinationpath))   # do nothing if the file already exists
-            # {
-
             my $copysuccess = installer::systemactions::copy_one_file($sourcepath, $movepath);
 
             if ( $copysuccess )
@@ -197,8 +194,6 @@ sub resolving_patchsoname_flag
                 }
             }
 
-            # }
-
             # Saving the original source, where the file was found
             $onefile->{'originalsourcepath'} = $onefile->{'sourcepath'};
 
diff --git a/solenv/bin/modules/installer/scpzipfiles.pm b/solenv/bin/modules/installer/scpzipfiles.pm
index 52dea6032ee1..cb0e6408e565 100644
--- a/solenv/bin/modules/installer/scpzipfiles.pm
+++ b/solenv/bin/modules/installer/scpzipfiles.pm
@@ -45,7 +45,7 @@ sub replace_all_ziplistvariables_in_file
     {
         my $line = ${$fileref}[$i];
 
-        if ( $line =~ /^.*\$\{\w+\}.*$/ )   # only occurence of ${abc}
+        if ( $line =~ /^.*\$\{\w+\}.*$/ )   # only occurrence of ${abc}
         {
             my $key;
 
@@ -69,13 +69,11 @@ sub replace_all_ziplistvariables_in_rtffile
 {
     my ( $fileref, $variablesref, $onelanguage, $loggingdir ) = @_;
 
-    # installer::files::save_file($loggingdir . "license_" . $onelanguage . "_before.rtf", $fileref);
-
     for ( my $i = 0; $i <= $#{$fileref}; $i++ )
     {
         my $line = ${$fileref}[$i];
 
-        if ( $line =~ /^.*\$\\\{\w+\\\}.*$/ )   # only occurence of $\{abc\}
+        if ( $line =~ /^.*\$\\\{\w+\\\}.*$/ )   # only occurrence of $\{abc\}
         {
             for ( my $j = 0; $j <= $#{$variablesref}; $j++ )
             {
@@ -96,8 +94,6 @@ sub replace_all_ziplistvariables_in_rtffile
             }
         }
     }
-
-    # installer::files::save_file($loggingdir . "license_" . $onelanguage . "_after.rtf", $fileref);
 }
 
 #########################################################
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 54d22df1e19e..f6b3909a53a0 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -809,7 +809,6 @@ sub replace_setup_variables
 
     if ( $localminor =~ /^\s*\w(\d+)\w*\s*$/ ) { $localminor = $1; }
 
-    # $updateid
     my $updateid = $productname . "_" . $userdirproductversion . "_" . $$languagestringref;
     $updateid =~ s/ /_/g;
 
@@ -830,6 +829,8 @@ sub replace_setup_variables
         $value =~ s/\<sourceid\>/$installer::globals::build/;
         $value =~ s/\<updateid\>/$updateid/;
         $value =~ s/\<pkgformat\>/$installer::globals::packageformat/;
+        $value =~ s/\<vendor\>/$ENV{'OOO_VENDOR'}/;
+        $value =~ s/\<buildversion\>/$ENV{'BUILD_VER_STRING'}/;
 
         $oneitem->{'Value'} = $value;
     }
@@ -1226,6 +1227,7 @@ sub get_Source_Directory_For_Files_From_Includepathlist
         if ( $styles =~ /\bFILE_CAN_MISS\b/ ) { $file_can_miss = 1; }
 
         if (( $installer::globals::languagepack ) && ( ! $onefile->{'ismultilingual'} ) && ( ! ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))) { $file_can_miss = 1; }
+        if (( $installer::globals::helppack ) && ( ! $onefile->{'ismultilingual'} ) && ( ! ( $styles =~ /\bFORCEHELPPACK\b/ ))) { $file_can_miss = 1; }
 
         my $sourcepathref = "";
 
@@ -1243,7 +1245,6 @@ sub get_Source_Directory_For_Files_From_Includepathlist
                 my $oldname = $onefile->{'Name'};
                 my $oldlanguage = $onefile->{'specificlanguage'};
                 my $newlanguage = "en-US";
-                # $onefile->{'Name'} =~ s/$oldlanguage\./$newlanguage\./;   # Example: tplwizfax_it.zip -> tplwizfax_en-US.zip
                 $onefilename = $onefile->{'Name'};
                 $onefilename =~ s/$oldlanguage\./$newlanguage\./;   # Example: tplwizfax_it.zip -> tplwizfax_en-US.zip
                 $onefilename =~ s/^\s*\Q$installer::globals::separator\E//;     # filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
@@ -1255,7 +1256,6 @@ sub get_Source_Directory_For_Files_From_Includepathlist
                     $infoline = "WARNING: Using $onefilename instead of $oldname\n";
                     push( @installer::globals::logfileinfo, $infoline);
                     print "    $infoline";
-                    # if ( $onefile->{'destination'} ) { $onefile->{'destination'} =~ s/\Q$oldname\E/$onefile->{'Name'}/; }
 
                     # If the directory, in which the new file is installed, is not language dependent,
                     # the filename has to be changed to avoid installation conflicts
@@ -1338,7 +1338,7 @@ sub remove_Files_Without_Sourcedirectory
 
     my $infoline;
 
-    my $error_occured = 0;
+    my $error_occurred = 0;
     my @missingfiles = ();
     push(@missingfiles, "ERROR: The following files could not be found: \n");
 
@@ -1354,17 +1354,17 @@ sub remove_Files_Without_Sourcedirectory
             my $styles = $onefile->{'Styles'};
             my $filename = $onefile->{'Name'};
 
-            if ( ! $installer::globals::languagepack )
+            if ( ! $installer::globals::languagepack && !$installer::globals::helppack)
             {
                 $infoline = "ERROR: Removing file $filename from file list.\n";
                 push( @installer::globals::logfileinfo, $infoline);
 
                 push(@missingfiles, "ERROR: File not found: $filename\n");
-                $error_occured = 1;
+                $error_occurred = 1;
 
                 next;   # removing this file from list, if sourcepath is empty
             }
-            else # special case for language packs
+            elsif ( $installer::globals::languagepack ) # special case for language packs
             {
                 if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
                 {
@@ -1372,7 +1372,7 @@ sub remove_Files_Without_Sourcedirectory
                     push( @installer::globals::logfileinfo, $infoline);
 
                     push(@missingfiles, "ERROR: File not found: $filename\n");
-                    $error_occured = 1;
+                    $error_occurred = 1;
 
                     next;   # removing this file from list, if sourcepath is empty
                 }
@@ -1386,6 +1386,28 @@ sub remove_Files_Without_Sourcedirectory
                     next;   # removing this file from list, if sourcepath is empty
                 }
             }
+            else # special case for help packs
+            {
+                if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
+                {
+                    $infoline = "ERROR: Removing file $filename from file list.\n";
+                    push( @installer::globals::logfileinfo, $infoline);
+
+                    push(@missingfiles, "ERROR: File not found: $filename\n");
+                    $error_occured = 1;
+
+                    next;   # removing this file from list, if sourcepath is empty
+                }
+                else
+                {
+                    $infoline = "INFO: Removing file $filename from file list. It is not language dependent.\n";
+                    push( @installer::globals::logfileinfo, $infoline);
+                    $infoline = "INFO: It is not language dependent and can be ignored in help packs.\n";
+                    push( @installer::globals::logfileinfo, $infoline);
+
+                    next;   # removing this file from list, if sourcepath is empty
+                }
+           }
         }
 
         push(@newfilesarray, $onefile);
@@ -1394,7 +1416,7 @@ sub remove_Files_Without_Sourcedirectory
     $infoline = "\n";
     push( @installer::globals::logfileinfo, $infoline);
 
-    if ( $error_occured )
+    if ( $error_occurred )
     {
         for ( my $i = 0; $i <= $#missingfiles; $i++ ) { print "$missingfiles[$i]"; }
         installer::exiter::exit_program("ERROR: Missing files", "remove_Files_Without_Sourcedirectory");
@@ -1870,6 +1892,44 @@ sub remove_Languagepacklibraries_from_Installset
 }
 
 ############################################################################
+# Removing all help pack files from installation set (files with
+# the style HELPPACK), except this is a help pack.
+############################################################################
+
+sub remove_Helppacklibraries_from_Installset
+{
+    my ($itemsarrayref) = @_;
+
+    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_Helppacklibraries_from_Installset : $#{$itemsarrayref}"); }
+
+    my $infoline;
+
+    my @newitemsarray = ();
+
+    for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
+    {
+        my $oneitem = ${$itemsarrayref}[$i];
+        my $styles = "";
+        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
+
+        if ( $styles =~ /\bHELPPACK\b/ )
+        {
+            $infoline = "Removing help pack file $oneitem->{'gid'} from the installation set.\n";
+            push( @installer::globals::globallogfileinfo, $infoline);
+
+            next;
+        }
+
+        push(@newitemsarray, $oneitem);
+    }
+
+    $infoline = "\n";
+    push( @installer::globals::globallogfileinfo, $infoline);
+
+    return \@newitemsarray;
+}
+
+############################################################################
 # Removing all files with flag PATCH_ONLY from installation set.
 # This function is not called during patch creation.
 ############################################################################
@@ -2009,18 +2069,14 @@ sub quoting_illegal_filenames
 
             # sourcepath and destination have to be quoted for epm list file
 
-            # $filename =~ s/\$/\$\$/g;
             $destpath =~ s/\$/\$\$/g;
             $sourcepath =~ s/\$/\$\$/g;
 
-            # my $infoline = "ATTENTION: Files: Renaming $onefile->{'Name'} to $filename\n";
-            # push( @installer::globals::logfileinfo, $infoline);
             my $infoline = "ATTENTION: Files: Quoting sourcepath $onefile->{'sourcepath'} to $sourcepath\n";
             push( @installer::globals::logfileinfo, $infoline);
             $infoline = "ATTENTION: Files: Quoting destination path $onefile->{'destination'} to $destpath\n";
             push( @installer::globals::logfileinfo, $infoline);
 
-            # $onefile->{'Name'} = $filename;
             $onefile->{'sourcepath'} = $sourcepath;
             $onefile->{'destination'} = $destpath;
         }
@@ -2028,19 +2084,20 @@ sub quoting_illegal_filenames
 }
 
 ############################################################################
-# Removing multiple occurences of same module.
+# Removing multiple occurrences of same module.
 ############################################################################
 
 sub optimize_list
 {
     my ( $longlist ) = @_;
+    my %tmpHash;
 
-    my $shortlist = "";
-    my $hashref = installer::converter::convert_stringlist_into_hash(\$longlist, ",");
-    foreach my $key (sort keys %{$hashref} ) { $shortlist = "$shortlist,$key"; }
-    $shortlist =~ s/^\s*\,//;
+    $longlist =~ s/^\s+//;
+    $longlist =~ s/\s+$//;
+    $longlist =~ s/\s*,\s*/,/g;
 
-    return $shortlist;
+    @tmpHash{split /,/, $longlist} = ();
+    return join(",", sort keys %tmpHash);
 }
 
 #######################################################################
@@ -2063,7 +2120,6 @@ sub collect_directories_from_filesarray
     my %alldirectoryhash = ();
 
     my $predefinedprogdir_added = 0;
-    my $alreadyincluded = 0;
 
     # Preparing this already as hash, although the only needed value at the moment is the HostName
     # But also adding: "specificlanguage" and "Dir" (for instance gid_Dir_Program)
@@ -2075,64 +2131,26 @@ sub collect_directories_from_filesarray
         installer::pathanalyzer::get_path_from_fullqualifiedname(\$destinationpath);
         $destinationpath =~ s/\Q$installer::globals::separator\E\s*$//;     # removing ending slashes or backslashes
 
-        $alreadyincluded = 0;
-        if  ( exists($alldirectoryhash{$destinationpath}) ) { $alreadyincluded = 1; }
-
-        if (!($alreadyincluded))
+        do
         {
-            my %directoryhash = ();
-            $directoryhash{'HostName'} = $destinationpath;
-            $directoryhash{'specificlanguage'} = $onefile->{'specificlanguage'};
-            $directoryhash{'Dir'} = $onefile->{'Dir'};
-            $directoryhash{'modules'} = $onefile->{'modules'}; # NEW, saving modules
-            # NEVER!!!  if ( ! $installer::globals::iswindowsbuild ) { $directoryhash{'Styles'} = "(CREATE)"; } # this directories must be created
-
-            if ( $onefile->{'Dir'} eq "PREDEFINED_PROGDIR" ) { $predefinedprogdir_added = 1; }
-
-            $alldirectoryhash{$destinationpath} = \%directoryhash;
-
-            # Problem: The $destinationpath can be share/registry/schema/org/openoffice
-            # but not all directories contain files and will be added to this list.
-            # Therefore the path has to be analyzed.
-
-            while ( $destinationpath =~ /(^.*\S)\Q$installer::globals::separator\E(\S.*?)\s*$/ )    # as long as the path contains slashes
+            if (!exists($alldirectoryhash{$destinationpath}))
             {
-                $destinationpath = $1;
-
-                $alreadyincluded = 0;
-                if  ( exists($alldirectoryhash{$destinationpath}) ) { $alreadyincluded = 1; }
-
-                if (!($alreadyincluded))
-                {
-                    my %directoryhash = ();
+                my %directoryhash = ();
+                $directoryhash{'HostName'} = $destinationpath;
+                $directoryhash{'specificlanguage'} = $onefile->{'specificlanguage'};
+                $directoryhash{'Dir'} = $onefile->{'Dir'};
+                $directoryhash{'modules'} = $onefile->{'modules'}; # NEW, saving modules
 
-                    $directoryhash{'HostName'} = $destinationpath;
-                    $directoryhash{'specificlanguage'} = $onefile->{'specificlanguage'};
-                    $directoryhash{'Dir'} = $onefile->{'Dir'};
-                    $directoryhash{'modules'} = $onefile->{'modules'}; # NEW, saving modules
-                    # NEVER!!! if ( ! $installer::globals::iswindowsbuild ) { $directoryhash{'Styles'} = "(CREATE)"; }  # this directories must be created
+                $predefinedprogdir_added ||= $onefile->{'Dir'} eq "PREDEFINED_PROGDIR";
 
-                    $alldirectoryhash{$destinationpath} = \%directoryhash;
-                }
-                else
-                {
-                    # Adding the modules to the module list!
-                    $alldirectoryhash{$destinationpath}->{'modules'} = $alldirectoryhash{$destinationpath}->{'modules'} . "," . $onefile->{'modules'};
-                }
+                $alldirectoryhash{$destinationpath} = \%directoryhash;
             }
-        }
-        else
-        {
-            # Adding the modules to the module list!
-            $alldirectoryhash{$destinationpath}->{'modules'} = $alldirectoryhash{$destinationpath}->{'modules'} . "," . $onefile->{'modules'};
-
-            # Also adding the module to all parents
-            while ( $destinationpath =~ /(^.*\S)\Q$installer::globals::separator\E(\S.*?)\s*$/ )    # as long as the path contains slashes
+            else
             {
-                $destinationpath = $1;
-                $alldirectoryhash{$destinationpath}->{'modules'} = $alldirectoryhash{$destinationpath}->{'modules'} . "," . $onefile->{'modules'};
+                # Adding the modules to the module list!
+                $alldirectoryhash{$destinationpath}->{'modules'} .= "," . $onefile->{'modules'};
             }
-        }
+        } while ($destinationpath =~ s/(^.*\S)\Q$installer::globals::separator\E(\S.*?)\s*$/$1/);  # as long as the path contains slashes
     }
 
     # if there is no file in the root directory PREDEFINED_PROGDIR, it has to be included into the directory array now
@@ -2195,7 +2213,6 @@ sub collect_directories_with_create_flag_from_directoryarray
                 my %directoryhash = ();
                 $directoryhash{'HostName'} = $directoryname;
                 $directoryhash{'specificlanguage'} = $onedir->{'specificlanguage'};
-                # $directoryhash{'gid'} = $onedir->{'gid'};
                 $directoryhash{'Dir'} = $onedir->{'gid'};
                 $directoryhash{'Styles'} = $onedir->{'Styles'};
 
@@ -2468,7 +2485,6 @@ sub insert_for_item ($$$)
 {
     my ($hash, $item, $id) = @_;
 
-    # print STDERR "insert '$id' for '$item'\n";
     if (!defined $hash->{$item})
     {
         my @gids = ();
@@ -2522,7 +2538,6 @@ sub get_string_of_modulegids_for_itemgid
     my $haslanguagemodule = 0;
     my %foundmodules = ();
 
-    # print STDERR "lookup '" . lc($itemgid) . "'\n";
     my $gid_list = $module_lookup_table->{lc($itemgid)};
 
     for my $gid (@{$gid_list})
@@ -2542,8 +2557,6 @@ sub get_string_of_modulegids_for_itemgid
         if ( ! $isreallylanguagemodule ) { installer::exiter::exit_program("ERROR: \"$itemgid\" is assigned to modules with flag \"LANGUAGEMODULE\" and also to modules without this flag! Modules: $allmodules", "get_string_of_modulegids_for_itemgid");  }
     }
 
-    # print STDERR "get_string_for_itemgid ($itemgid, $itemname) => $allmodules, $haslanguagemodule\n";
-
     return ($allmodules, $haslanguagemodule);
 }
 
@@ -2923,7 +2936,7 @@ sub filter_layerlinks_from_unixlinks
         if ( $styles =~ /\bLAYERLINK\b/ )
         {
             # Platforms, that do not need the layer links
-            if (( $installer::globals::islinuxrpmbuild ) || ( $installer::globals::issolarispkgbuild ))
+            if (( $installer::globals::isrpmbuild ) || ( $installer::globals::issolarispkgbuild ))
             {
                 $isrequired = 0;
             }
diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm
index a3bf5abf50a9..c463eb23bd45 100644
--- a/solenv/bin/modules/installer/setupscript.pm
+++ b/solenv/bin/modules/installer/setupscript.pm
@@ -162,23 +162,17 @@ sub add_lowercase_productname_setupscriptvariable
                 push(@{$variablesref} ,$newline);
                 $value = $original;
                 $value =~ s/\s/\_/g;
-                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
                 $newline = "\%UNIXPRODUCTNAME " . lc($value) . "\n";
                 push(@{$variablesref} ,$newline);
                 $newline = "\%SYSTEMINTUNIXPACKAGENAME " . lc($value) . "\n";
                 push(@{$variablesref} ,$newline);
-                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
-                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $2 . $4; }
                 $newline = "\%UNIXPACKAGENAME " . lc($value) . "\n";
                 push(@{$variablesref} ,$newline);
                 $value = $original;
                 $value =~ s/\s/\_/g;
                 $value =~ s/\.//g;
-                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
                 $newline = "\%WITHOUTDOTUNIXPRODUCTNAME " . lc($value) . "\n";
                 push(@{$variablesref} ,$newline);
-                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
-                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $2 . $4; }
                 $newline = "\%WITHOUTDOTUNIXPACKAGENAME " . lc($value) . "\n";
                 push(@{$variablesref} ,$newline);
                 $newline = "\%SOLARISBRANDPACKAGENAME " . lc($value) . "\n";
@@ -272,7 +266,7 @@ sub replace_all_setupscriptvariables_in_script
     my $bigstring = '';
     for my $line (@{$scriptref}) { $bigstring = $bigstring . $line; }
 
-    foreach my $key ( keys %subs )
+    foreach my $key (sort { length ($b) <=> length ($a) } keys %subs)
     {
         # Attention: It must be possible to substitute "%PRODUCTNAMEn", "%PRODUCTNAME%PRODUCTVERSIONabc"
         my $value = $subs{$key};
@@ -292,7 +286,6 @@ sub replace_all_setupscriptvariables_in_script
             if (( $check =~ /%1/ ) || ( $check =~ /%2/ ) || ( $check =~ /%verify/ )) { next; }
             my $infoline = "WARNING: mis-named or un-known '%' variable in setup script at line $num:\n$check\n";
             push( @installer::globals::globallogfileinfo, $infoline);
-            # print STDERR "Warning: mis-named or un-known '%' variable at line $num:\n$check\n";
         }
     }
 
@@ -311,91 +304,72 @@ sub get_all_items_from_script
 
     my @allitemarray = ();
 
-    my ($itemkey, $itemvalue, $valuecounter);
+    my ($itemkey, $itemvalue);
 
     for ( my $i = 0; $i <= $#{$scriptref}; $i++ )
     {
         my $line = ${$scriptref}[$i];
 
-        if ( $line =~ /^\s*\Q$searchitem\E\s+(\S+)\s*$/ )
-        {
-            my $gid = $1;
-            my $counter = $i + 1;
+        next unless ($line =~ /^\s*\Q$searchitem\E\s+(\S+)\s*$/);
+        my $gid = $1;
 
-            my %oneitemhash = ();
-            my $ismultilang = 0;
+        my %oneitemhash = ();
+        my $ismultilang = 0;
 
-            $oneitemhash{'gid'} = $gid;
+        $oneitemhash{'gid'} = $gid;
 
-            while  (!( $line =~ /^\s*End\s*$/ ))
+        while (!( $line =~ /^\s*End\s*$/ ))
+        {
+            if ( $i >= $#{$scriptref} ) {
+                installer::exiter::exit_program("Invalid setup script file. End of file reached before 'End' line of '$searchitem' section.", "get_all_items_from_script");
+            }
+            $line = ${$scriptref}[++$i];
+
+            if ( $line =~ /^\s*(.+?)\=\s*(.+?)\;\s*$/ ) # only oneliner!
             {
-                if ( $counter > $#{$scriptref} ) {
-                    installer::exiter::exit_program("Invalid setup script file. End of file reached before 'End' line of '$searchitem' section.", "get_all_items_from_script");
-                }
-                $line = ${$scriptref}[$counter];
-                $counter++;
+                $itemkey = $1;
+                $itemvalue = $2;
 
-                if ( $line =~ /^\s*(.+?)\s*\=\s*(.+?)\s*\;\s*$/ )   # only oneliner!
-                {
-                    $itemkey = $1;
-                    $itemvalue = $2;
+                $itemkey =~ s/\s+$//;
+                $itemvalue =~ s/\s+$//;
 
-                    installer::remover::remove_leading_and_ending_quotationmarks(\$itemvalue);
-                    $itemvalue =~ s/\s*$//; # removing ending whitespaces. Could be introduced by empty variables.
+                installer::remover::remove_leading_and_ending_quotationmarks(\$itemvalue);
 
-                    $oneitemhash{$itemkey} = $itemvalue;
+                $oneitemhash{$itemkey} = $itemvalue;
 
-                    if ( $itemkey =~ /^\s*\S+\s+\(\S+\)\s*$/ )
-                    {
-                        $ismultilang = 1;
-                    }
-                }
-                else
+                $ismultilang ||= $itemkey =~ /^\S+\s+\(\S+\)$/;
+            }
+            elsif (($searchitem eq "Module") &&
+                   ($line =~ /^\s*.+?\s*\=\s*\(/) &&
+                   (!($line =~ /\)\;\s*$/)))    # more than one line, for instance files at modules!
+            {
+                $line =~ /^\s*(.+?)\s*\=\s*(.+?)\s*$/;  # the first line
+                $itemkey = $1;
+                $itemvalue = $2;
+
+                # collecting the complete itemvalue
+                do
                 {
-                    if ( $searchitem eq "Module" ) # more than one line, for instance files at modules!
-                    {
-                        if (( $line =~ /^\s*(.+?)\s*\=\s*\(/ ) && (!($line =~ /\)\;\s*$ / )))
-                        {
-                            if ( $line =~ /^\s*(.+?)\s*\=\s*(.+)/ ) # the first line
-                            {
-                                $itemkey = $1;
-                                $itemvalue = $2;
-                                $itemvalue =~ s/\s*$//;
-                            }
-
-                            # collecting the complete itemvalue
-
-                            $valuecounter = $counter;
-                            $line = ${$scriptref}[$valuecounter];
-                            installer::remover::remove_leading_and_ending_whitespaces(\$line);
-                            $itemvalue = $itemvalue . $line;
-
-                            while (!( $line =~ /\)\;\s*$/ ))
-                            {
-                                $valuecounter++;
-                                $line = ${$scriptref}[$valuecounter];
-                                installer::remover::remove_leading_and_ending_whitespaces(\$line);
-                                $itemvalue = $itemvalue . $line;
-                            }
-
-                            # removing ending ";"
-                            $itemvalue =~ s/\;\s*$//;
-
-                            $oneitemhash{$itemkey} = $itemvalue;
-
-                            if ( $itemkey =~ /^\s*\S+\s+\(\S+\)\s*$/ )
-                            {
-                                $ismultilang = 1;
-                            }
-                        }
+                    if ( $i >= $#{$scriptref} ) {
+                        installer::exiter::exit_program("Invalid setup script file. Premature end of file.", "get_all_items_from_script");
                     }
-                }
-            }
+                    $line = ${$scriptref}[++$i];
+                    installer::remover::remove_leading_and_ending_whitespaces(\$line);
+                    $itemvalue .= $line;
+                } while (!($line =~ /\)\;\s*$/));
+
+                # removing ending ";"
+                $itemvalue =~ s/\;\s*$//;
 
-            $oneitemhash{'ismultilingual'} = $ismultilang;
+                $oneitemhash{$itemkey} = $itemvalue;
 
-            push(@allitemarray, \%oneitemhash);
+                $ismultilang ||= $itemkey =~ /^\S+\s+\(\S+\)$/;
+            }
         }
+
+        $oneitemhash{'ismultilingual'} = $ismultilang+0;
+
+        push(@allitemarray, \%oneitemhash);
     }
 
     return \@allitemarray;
@@ -521,10 +495,6 @@ sub replace_preset_properties
     my @presetproperties = ();
     push(@presetproperties, "SOLARISBRANDPACKAGENAME");
     push(@presetproperties, "SYSTEMINTUNIXPACKAGENAME");
-    # push(@presetproperties, "UNIXPACKAGENAME");
-    # push(@presetproperties, "WITHOUTDOTUNIXPACKAGENAME");
-    # push(@presetproperties, "UNIXPRODUCTNAME");
-    # push(@presetproperties, "WITHOUTDOTUNIXPRODUCTNAME");
 
 
     foreach $property ( @presetproperties )
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 1f392f4f6c86..8c0e9ee0be79 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -27,7 +27,6 @@
 
 package installer::simplepackage;
 
-# use Archive::Zip qw( :ERROR_CODES :CONSTANTS );
 use Cwd;
 use File::Copy;
 use installer::download;
@@ -111,6 +110,13 @@ sub register_extensions
         push( @installer::globals::logfileinfo, $infoline);
     }
 
+    if (( $installer::globals::helppack ) && ( ! -f $unopkgfile ))
+    {
+        $unopkgexists = 0;
+        $infoline = "Help packs do not contain unopkg!\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+
     if ( ! -f $unopkgfile )
     {
         $unopkgexists = 0;
@@ -127,7 +133,7 @@ sub register_extensions
 
         if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: $unopkgfile not found!", "register_extensions"); }
 
-        my $systemcall = $unopkgfile . " sync --verbose" . " -env:UNO_JAVA_JFW_ENV_JREHOME=true 2\>\&1 |";
+        my $systemcall = "JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1 " . $unopkgfile . " sync --verbose" . " -env:UNO_JAVA_JFW_ENV_JREHOME=true 2\>\&1 |";
 
         print "... $systemcall ...\n";
 
@@ -174,9 +180,6 @@ sub register_extensions
 sub get_mac_translation_file
 {
     my $translationfilename = $installer::globals::maclangpackfilename;
-    # my $translationfilename = $installer::globals::idtlanguagepath . $installer::globals::separator . $installer::globals::maclangpackfilename;
-    # if ( $installer::globals::unicodensis ) { $translationfilename = $translationfilename . ".uulf"; }
-    # else { $translationfilename = $translationfilename . ".mlf"; }
     if ( ! -f $translationfilename ) { installer::exiter::exit_program("ERROR: Could not find language file $translationfilename!", "get_mac_translation_file"); }
     my $translationfile = installer::files::read_file($translationfilename);
 
@@ -288,8 +291,6 @@ sub localize_scriptfile
 {
     my ($scriptfile, $translationfile, $languagestringref) = @_;
 
-    # my $translationfile = get_mac_translation_file();
-
     my $onelanguage = $$languagestringref;
     if ( $onelanguage =~ /^\s*(.*?)_/ ) { $onelanguage = $1; }
 
@@ -337,7 +338,7 @@ sub replace_variables_in_scriptfile
     replace_one_variable_in_shellscript($scriptfile, $allvariables->{'PRODUCTVERSION'}, "PRODUCTVERSION" );
 
     my $scriptname = lc($allvariables->{'PRODUCTNAME'}) . "\.script";
-    if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $scriptname = "org.openoffice.script"; }
+    if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $scriptname = "org.libreoffice.script"; }
 
     replace_one_variable_in_shellscript($scriptfile, $scriptname, "SEARCHSCRIPTNAME" );
 }
@@ -414,9 +415,10 @@ sub create_package
 
         my $localtempdir = $tempdir;
 
-        if (( $installer::globals::languagepack ) || ( $installer::globals::patch ))
+        if (( $installer::globals::languagepack ) || ( $installer::globals::helppack ) || ( $installer::globals::patch ))
         {
             $localtempdir = "$tempdir/$packagename";
+            if ( $installer::globals::helppack ) { $volume_name = "$volume_name Help Pack"; }
             if ( $installer::globals::languagepack )
             {
                 $volume_name = "$volume_name Language Pack";
@@ -473,6 +475,7 @@ sub create_package
             my $scriptrealfilename = "osx_install.applescript";
             my $scriptfilename = "";
             if ( $installer::globals::languagepack ) { $scriptfilename = "osx_install_languagepack.applescript"; }
+            if ( $installer::globals::helppack ) { $scriptfilename = "osx_install_helppack.applescript"; }
             if ( $installer::globals::patch ) { $scriptfilename = "osx_install_patch.applescript"; }
             my $scripthelpersolverfilename = "mac_install.script";
             # my $scripthelperrealfilename = $volume_name;
@@ -503,10 +506,8 @@ sub create_package
             replace_variables_in_scriptfile($scriptfilecontent, $volume_name_classic, $volume_name_classic_app, $allvariables);
             installer::files::save_file($scriptfilename, $scriptfilecontent);
 
-            $systemcall = "chmod 775 " . "\"" . $scriptfilename . "\"";
-            system($systemcall);
-            $systemcall = "chmod 775 " . "\"" . $scripthelperrealfilename . "\"";
-            system($systemcall);
+            chmod 0775, $scriptfilename;
+            chmod 0775, $scripthelperrealfilename;
 
             # Copy also Info.plist and icon file
             # Finding both files in solver
@@ -620,6 +621,7 @@ sub create_simple_package
         {
             $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "downloadname");
             if ( $installer::globals::languagepack ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "langpackdownloadname"); }
+            if ( $installer::globals::helppack ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "helppackdownloadname"); }
             if ( $installer::globals::patch ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "patchdownloadname"); }
             $packagename = installer::download::resolve_variables_in_downloadname($allvariables, $$downloadname, \$locallanguage);
         }
@@ -709,7 +711,7 @@ sub create_simple_package
             }
             else
             {
-                $infoline = "ERROR: Could not copy $source to $destination\n";
+                $infoline = "ERROR: Could not copy $source to $destination $!\n";
                 $returnvalue = 0;
             }
 
@@ -722,13 +724,9 @@ sub create_simple_package
             if ( ! $installer::globals::iswindowsbuild )
             {
                 # see issue 102274
-                my $unixrights = "";
                 if ( $onefile->{'UnixRights'} )
                 {
-                    $unixrights = $onefile->{'UnixRights'};
-
-                    my $localcall = "$installer::globals::wrapcmd chmod $unixrights \'$destination\' \>\/dev\/null 2\>\&1";
-                    system($localcall);
+                    chmod oct($onefile->{'UnixRights'}), $destination;
                 }
             }
         }
diff --git a/solenv/bin/modules/installer/substfilenamefiles.pm b/solenv/bin/modules/installer/substfilenamefiles.pm
index fd9557ff81c0..98906913c159 100644
--- a/solenv/bin/modules/installer/substfilenamefiles.pm
+++ b/solenv/bin/modules/installer/substfilenamefiles.pm
@@ -79,7 +79,6 @@ sub resolving_subst_filename_flag
 
             my $sourcepath = $onefile->{'sourcepath'};
 
-            # if ( $onefilename =~ /^\s*\Q$installer::globals::separator\E/ )   # filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
             if ( $onefilename =~ /\Q$installer::globals::separator\E/ ) # filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
             {
                 $onefilename =~ s/^\s*\Q$installer::globals::separator\E//;
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index 07cd838cf4fa..09b4cb1882a3 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -43,108 +43,7 @@ sub create_directory
 {
     my ($directory) = @_;
 
-    my $returnvalue = 1;
-    my $infoline = "";
-
-    if (!(-d $directory))
-    {
-        $returnvalue = mkdir($directory, 0775);
-
-        if ($returnvalue)
-        {
-            $infoline = "\nCreated directory: $directory\n";
-            push(@installer::globals::logfileinfo, $infoline);
-
-            my $localcall = "chmod 0775 $directory \>\/dev\/null 2\>\&1";
-            system($localcall);
-
-            # chmod 0775 is not sufficient on mac to remove sticky tag
-            $localcall = "chmod a-s $directory \>\/dev\/null 2\>\&1";
-            system($localcall);
-        }
-        else
-        {
-            # New solution in parallel packing: It is possible, that the directory now exists, although it
-            # was not created in this process. There is only an important error, if the directory does not
-            # exist now.
-
-            $infoline = "\nDid not succeed in creating directory: \"$directory\". Further attempts will follow.\n";
-            push(@installer::globals::logfileinfo, $infoline);
-
-            if (!(-d $directory))
-            {
-                # Problem with parallel packaging? -> Try a little harder, before exiting.
-                # Did someone else remove the parent directory in the meantime?
-                my $parentdir = $directory;
-                installer::pathanalyzer::get_path_from_fullqualifiedname(\$parentdir);
-                if (!(-d $parentdir))
-                {
-                    $returnvalue = mkdir($parentdir, 0775);
-
-                    if ($returnvalue)
-                    {
-                        $infoline = "\nAttention: Successfully created parent directory (should already be created before): $parentdir\n";
-                        push(@installer::globals::logfileinfo, $infoline);
-
-                        my $localcall = "chmod 775 $parentdir \>\/dev\/null 2\>\&1";
-                        system($localcall);
-                    }
-                    else
-                    {
-                        $infoline = "\Error: \"$directory\" could not be created. Even the parent directory \"$parentdir\" does not exist and could not be created.\n";
-                        push(@installer::globals::logfileinfo, $infoline);
-                        if ( -d $parentdir )
-                        {
-                            $infoline = "\nAttention: Finally the parent directory \"$parentdir\" exists, but I could not create it.\n";
-                            push(@installer::globals::logfileinfo, $infoline);
-                        }
-                        else
-                        {
-                            # Now it is time to exit, even the parent could not be created.
-                            installer::exiter::exit_program("ERROR: Could not create parent directory \"$parentdir\"", "create_directory");
-                        }
-                    }
-                }
-
-                # At this point we have to assume, that the parent directory exist.
-                # Trying once more to create the desired directory
-
-                $returnvalue = mkdir($directory, 0775);
-
-                if ($returnvalue)
-                {
-                    $infoline = "\nAttention: Created directory \"$directory\" in the second try.\n";
-                    push(@installer::globals::logfileinfo, $infoline);
-
-                    my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
-                    system($localcall);
-                }
-                else
-                {
-                    if ( -d $directory )
-                    {
-                        $infoline = "\nAttention: Finally the directory \"$directory\" exists, but I could not create it.\n";
-                        push(@installer::globals::logfileinfo, $infoline);
-                    }
-                    else
-                    {
-                        # It is time to exit, even the second try failed.
-                        installer::exiter::exit_program("ERROR: Failed to create the directory: $directory", "create_directory");
-                    }
-                }
-            }
-            else
-            {
-                $infoline = "\nAnother process created this directory in exactly this moment :-) : $directory\n";
-                push(@installer::globals::logfileinfo, $infoline);
-            }
-        }
-    }
-    else
-    {
-        $infoline = "\nAlready existing directory, did not create: $directory\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
+    create_directory_with_privileges( $directory, "755" );
 }
 
 ######################################################
@@ -157,10 +56,10 @@ sub create_directory_with_privileges
 
     my $returnvalue = 1;
     my $infoline = "";
+    my $localprivileges = oct("0".$privileges); # changes "777" to 0777
 
     if (!(-d $directory))
     {
-        my $localprivileges = oct("0".$privileges); # changes "777" to 0777
         $returnvalue = mkdir($directory, $localprivileges);
 
         if ($returnvalue)
@@ -168,8 +67,7 @@ sub create_directory_with_privileges
             $infoline = "\nCreated directory: $directory\n";
             push(@installer::globals::logfileinfo, $infoline);
 
-            my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
-            system($localcall);
+            chmod $localprivileges, $directory;
         }
         else
         {
@@ -195,8 +93,7 @@ sub create_directory_with_privileges
                         $infoline = "\nAttention: Successfully created parent directory (should already be created before): $parentdir\n";
                         push(@installer::globals::logfileinfo, $infoline);
 
-                        my $localcall = "chmod $privileges $parentdir \>\/dev\/null 2\>\&1";
-                        system($localcall);
+                        chmod $localprivileges, $parentdir;
                     }
                     else
                     {
@@ -225,8 +122,7 @@ sub create_directory_with_privileges
                     $infoline = "\nAttention: Created directory \"$directory\" in the second try.\n";
                     push(@installer::globals::logfileinfo, $infoline);
 
-                    my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
-                    system($localcall);
+                    chmod $localprivileges, $directory;
                 }
                 else
                 {
@@ -254,8 +150,7 @@ sub create_directory_with_privileges
         $infoline = "\nAlready existing directory, did not create: $directory\n";
         push(@installer::globals::logfileinfo, $infoline);
 
-        my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
-        system($localcall);
+        chmod $localprivileges, $directory;
     }
 }
 
@@ -374,6 +269,7 @@ sub create_directories
         }
 
         if ( $installer::globals::languagepack ) { $path = $path . $localproductname . "_languagepack" . $installer::globals::separator; }
+        elsif ( $installer::globals::helppack ) { $path = $path . $localproductname . "_helppack" . $installer::globals::separator; }
         elsif ( $installer::globals::patch ) { $path = $path . $localproductname . "_patch" . $installer::globals::separator; }
         else { $path = $path . $localproductname . $installer::globals::separator; }
 
@@ -395,21 +291,30 @@ sub create_directories
 
         if ( $$languagesref ) { $locallanguagesref = $$languagesref; }
 
-        if (!($locallanguagesref eq "" ))   # this will be a path like "01_49", for Profiles and ConfigurationFiles, idt-Files
+        if ($newdirectory eq "install" && $installer::globals::ooodownloadfilename ne "" )
         {
-            my $languagestring = $$languagesref;
-
-            if (length($languagestring) > $installer::globals::max_lang_length )
+            # put packages into versioned path; needed only on linux (fdo#30837)
+            $path = $path . "$installer::globals::ooodownloadfilename" . $installer::globals::separator;
+            create_directory($path);
+        }
+        else
+        {
+            if ($locallanguagesref ne "")   # this will be a path like "01_49", for Profiles and ConfigurationFiles, idt-Files
             {
-                my $number_of_languages = get_number_of_langs($languagestring);
-                chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
-                # $languagestring = $shorter;
-                my $id = substr($shorter, 0, 8); # taking only the first 8 digits
-                $languagestring = "lang_" . $number_of_languages . "_id_" . $id;
-            }
 
-            $path = $path . $languagestring  . $installer::globals::separator;
-            create_directory($path);
+                my $languagestring = $$languagesref;
+
+                if (length($languagestring) > $installer::globals::max_lang_length )
+                {
+                    my $number_of_languages = get_number_of_langs($languagestring);
+                    chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
+                    my $id = substr($shorter, 0, 8); # taking only the first 8 digits
+                    $languagestring = "lang_" . $number_of_languages . "_id_" . $id;
+                }
+
+                $path = $path . $languagestring . $installer::globals::separator;
+                create_directory($path);
+            }
         }
     }
 
@@ -439,7 +344,7 @@ sub copy_one_file
     }
     else
     {
-        $infoline = "ERROR: Could not copy $source to $dest\n";
+        $infoline = "ERROR: Could not copy $source to $dest $!\n";
         $returnvalue = 0;
     }
 
@@ -1194,9 +1099,7 @@ sub rename_directory
     }
     else
     {
-        installer::exiter::exit_program("ERROR: Could not move directory from $olddir to $newdir", "rename_directory");
-        # $infoline = "\nATTENTION: Could not move directory from $olddir to $newdir, \"rename_directory\"\n";
-        # push(@installer::globals::logfileinfo, $infoline);
+        installer::exiter::exit_program("ERROR: Could not move directory from $olddir to $newdir $!", "rename_directory");
     }
 
     return $newdir;
@@ -1433,12 +1336,7 @@ sub try_to_create_directory
             $infoline = "\nCreated directory: $directory\n";
             push(@installer::globals::logfileinfo, $infoline);
 
-            my $localcall = "chmod 0775 $directory \>\/dev\/null 2\>\&1";
-            system($localcall);
-
-            # chmod 0775 is not sufficient on mac to remove sticky tag
-            $localcall = "chmod a-s $directory \>\/dev\/null 2\>\&1";
-            system($localcall);
+            chmod 0775, $directory;
         }
         else
         {
diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm
index 47a71b059b2a..6c79aaedea3c 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -54,13 +54,6 @@ sub unpack_cabinet_file
     # But this wrong expand.exe is typically in the PATH before this expand.exe, to unpack
     # cabinet files.
 
-#   if ( $^O =~ /cygwin/i )
-#   {
-#       $expandfile = $ENV{'SYSTEMROOT'} . "/system32/expand.exe"; # Has to be located in the systemdirectory
-#       $expandfile =~ s/\\/\//;
-#       if ( ! -f $expandfile ) { exit_program("ERROR: Did not find file $expandfile in the Windows system folder!"); }
-#   }
-
     if ( $^O =~ /cygwin/i )
     {
         $expandfile = qx(cygpath -u "$ENV{WINDIR}"/System32/expand.exe);
@@ -70,7 +63,6 @@ sub unpack_cabinet_file
     my $expandlogfile = $unpackdir . $installer::globals::separator . "expand.log";
 
     # exclude cabinet file
-    # my $systemcall = $cabarc . " -o X " . $mergemodulehash->{'cabinetfile'};
 
     my $systemcall = "";
     if ( $^O =~ /cygwin/i ) {
@@ -326,7 +318,6 @@ sub analyze_registry_file
             my $component = $6;
 
             my %helphash = ();
-            # $helphash{'Registry'} = $registry;
             $helphash{'Root'} = $root;
             $helphash{'Key'} = $key;
             $helphash{'Name'} = $name;
@@ -489,13 +480,7 @@ sub copy_files_into_directory_structure
             }
 
             if ( $destfile =~ /unopkg\.exe\s*$/ ) { $unopkgfile = $destfile; }
-
-            # installer::systemactions::copy_one_file($sourcefile, $destfile);
         }
-        # else  # allowing missing sequence numbers ?
-        # {
-        #   installer::exiter::exit_program("ERROR: No file assigned to sequence $i", "copy_files_into_directory_structure");
-        # }
     }
 
     return $unopkgfile;
@@ -805,8 +790,6 @@ sub remove_empty_dirs_in_folder
 
         # try to remove empty directory
         my $returnvalue = rmdir $dir;
-
-        # if ( $returnvalue ) { print "Successfully removed empty dir $dir\n"; }
     }
 }
 
diff --git a/solenv/bin/modules/installer/windows/assembly.pm b/solenv/bin/modules/installer/windows/assembly.pm
index bb5efe2207d5..349f92cecc42 100644
--- a/solenv/bin/modules/installer/windows/assembly.pm
+++ b/solenv/bin/modules/installer/windows/assembly.pm
@@ -81,7 +81,6 @@ sub get_msiassembly_filemanifest
     my $filemanifest = "";
 
     $filemanifest = $onefile->{'uniquename'};
-    # $filemanifest = $onefile->{'Name'};
 
     return $filemanifest;
 }
@@ -139,8 +138,6 @@ sub get_msiassembly_file
     }
 
     # It does not need to exist. For example products that do not contain the libraries.
-    # if (! $foundfile ) { installer::exiter::exit_program("ERROR: No unique file name found for $filename !", "get_selfreg_file"); }
-
     if (! $foundfile ) { $onefile  = ""; }
 
     return $onefile;
@@ -170,8 +167,6 @@ sub get_msiassembly_file_by_gid
     }
 
     # It does not need to exist. For example products that do not contain the libraries.
-    # if (! $foundfile ) { installer::exiter::exit_program("ERROR: No unique file name found for $filename !", "get_selfreg_file"); }
-
     if (! $foundfile ) { $onefile  = ""; }
 
     return $onefile;
@@ -344,7 +339,6 @@ sub add_assembly_condition_into_component_table
                 {
                     # setting the condition
 
-                    # $condition = "MsiNetAssemblySupport";
                     $condition = "DOTNET_SUFFICIENT=1";
                     $oneline = $component . "\t" . $componentid . "\t" . $directory . "\t" . $attributes . "\t" . $condition . "\t" . $keypath . "\n";
                     ${$componenttable}[$j] = $oneline;
@@ -368,4 +362,4 @@ sub add_assembly_condition_into_component_table
     }
 }
 
-1;
\ No newline at end of file
+1;
diff --git a/solenv/bin/modules/installer/windows/component.pm b/solenv/bin/modules/installer/windows/component.pm
index 4ab5aac68954..da11997e5f83 100644
--- a/solenv/bin/modules/installer/windows/component.pm
+++ b/solenv/bin/modules/installer/windows/component.pm
@@ -128,6 +128,11 @@ sub get_file_component_directory
         return $installer::globals::templatefolder;
     }
 
+    if ( $destdir =~ /\bPREDEFINED_OSWINSHELLNEWDIR\b/ )
+    {
+        return "WindowsShellNewFolder";
+    }
+
     my $destination = $onefile->{'destination'};
 
     installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination);
@@ -395,9 +400,6 @@ sub create_component_table
 
     installer::windows::idtglobal::write_idt_header(\@componenttable, "component");
 
-    # collect_layer_conditions();
-
-
     # File components
 
     for ( my $i = 0; $i <= $#{$allfilecomponentsref}; $i++ )
@@ -527,4 +529,4 @@ sub set_component_in_environment_table
     }
 }
 
-1;
\ No newline at end of file
+1;
diff --git a/solenv/bin/modules/installer/windows/createfolder.pm b/solenv/bin/modules/installer/windows/createfolder.pm
index 7ade8866c6c5..cc3d87e47bb7 100644
--- a/solenv/bin/modules/installer/windows/createfolder.pm
+++ b/solenv/bin/modules/installer/windows/createfolder.pm
@@ -96,6 +96,7 @@ sub get_createfolder_component
 
     my $onefile = "";
     if ( $installer::globals::languagepack ) { $onefile = get_languagepack_file($filesref, $onedir); }
+    elsif ( $installer::globals::helppack ) { $onefile = installer::existence::get_specified_file($filesref, 'gid_File_Help_Common_Zip'); }
     else { $onefile = installer::existence::get_specified_file($filesref, $globalfilegid); }
 
     return $onefile->{'componentname'};
@@ -121,8 +122,8 @@ sub create_createfolder_table
     {
         my $onedir = ${$dirref}[$i];
 
-        # language packs get only language dependent directories
-        if (( $installer::globals::languagepack ) && ( $onedir->{'specificlanguage'} eq "" )) { next };
+        # language packs and help packs get only language dependent directories
+        if (( $installer::globals::languagepack ) ||  ( $installer::globals::languagepack ) && ( $onedir->{'specificlanguage'} eq "" )) { next };
 
         my $styles = "";
 
@@ -150,4 +151,4 @@ sub create_createfolder_table
 
 }
 
-1;
\ No newline at end of file
+1;
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index f7b13747e3bf..7a588edeb71b 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -133,6 +133,8 @@ sub make_short_dir_version
 # Adding unique directory names to the directory collection
 ##############################################################
 
+my $already_checked_the_frigging_directories_for_uniqueness = 0;
+
 sub create_unique_directorynames
 {
     my ($directoryref, $allvariables) = @_;
@@ -161,6 +163,7 @@ sub create_unique_directorynames
         $uniquename =~ s/\.//g;                 # removing dots in directoryname
         $uniquename =~ s/\Q$installer::globals::separator\E/\_/g;   # replacing slash and backslash with underline
         $uniquename =~ s/OpenOffice/OO/g;
+        $uniquename =~ s/LibreOffice/LO/g;
         $uniquename =~ s/_registry/_rgy/g;
         $uniquename =~ s/_registration/_rgn/g;
         $uniquename =~ s/_extension/_ext/g;
@@ -176,7 +179,8 @@ sub create_unique_directorynames
             $uniquename = make_short_dir_version($uniquename, $startlength, $hostname); # taking care of underlines!
         }
 
-        if ( exists($installer::globals::alluniquedirectorynames{$uniquename}) )
+        if ( !$already_checked_the_frigging_directories_for_uniqueness &&
+         exists($installer::globals::alluniquedirectorynames{$uniquename}) )
         {
             # This is an error, that must stop the packaging process
             $errorcount++;
@@ -260,6 +264,7 @@ sub check_sourcedir_addon
     if (($installer::globals::addchildprojects) ||
         ($installer::globals::patch) ||
         ($installer::globals::languagepack) ||
+        ($installer::globals::helppack) ||
         ($allvariableshashref->{'CHANGETARGETDIR'}))
     {
         my $sourcediraddon = "\:\.";
@@ -335,7 +340,6 @@ sub create_defaultdir_directorynames
 
         $hostname =~ s/\Q$installer::globals::separator\E\s*$//;
         get_last_directory_name(\$hostname);
-        # installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$hostname); # making program/classes to classes
         my $uniquename = $onedir->{'uniquename'};
         my $shortstring;
         if (( $installer::globals::updatedatabase ) && ( exists($shortdirnamehashref->{$uniquename}) ))
@@ -408,22 +412,15 @@ sub create_directorytable_from_collection
 
 sub add_root_directories
 {
-    my ($directorytableref, $allvariableshashref) = @_;
-
-#   my $sourcediraddon = "";
-#   if (($installer::globals::addchildprojects) ||
-#       ($installer::globals::patch) ||
-#       ($installer::globals::languagepack) ||
-#       ($allvariableshashref->{'CHANGETARGETDIR'}))
-#   {
-#       $sourcediraddon = "\:\.";
-#   }
+    my ($directorytableref, $allvariableshashref, $onelanguage) = @_;
 
     my $oneline = "";
 
-    if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} ))
+    if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} ))
     {
-        my $productname = $allvariableshashref->{'PRODUCTNAME'};
+        my $productname;
+
+    $productname = $allvariableshashref->{'PRODUCTNAME'};
         my $productversion = $allvariableshashref->{'PRODUCTVERSION'};
         my $baseproductversion = $productversion;
 
@@ -461,6 +458,12 @@ sub add_root_directories
     $oneline = "TARGETDIR\t\tSourceDir\n";
     push(@{$directorytableref}, $oneline);
 
+    $oneline = "WindowsFolder\tTARGETDIR\tWindows\n";
+    push(@{$directorytableref}, $oneline);
+
+    $oneline = "WindowsShellNewFolder\tWindowsFolder\tShellNew\n";
+    push(@{$directorytableref}, $oneline);
+
     $oneline = "$installer::globals::programfilesfolder\tTARGETDIR\t.\n";
     push(@{$directorytableref}, $oneline);
 
@@ -520,7 +523,7 @@ sub add_root_directories
 
 sub create_directory_table
 {
-    my ($directoryref, $basedir, $allvariableshashref, $shortdirnamehashref, $loggingdir) = @_;
+    my ($directoryref, $languagesarrayref, $basedir, $allvariableshashref, $shortdirnamehashref, $loggingdir) = @_;
 
     # Structure of the directory table:
     # Directory Directory_Parent DefaultDir
@@ -530,28 +533,34 @@ sub create_directory_table
     # Before ":" : [sourcedir]:[destdir] (not programmed yet)
     # After ":" : 8+3 and not 8+3 the destination directory name
 
+    for ( my $m = 0; $m <= $#{$languagesarrayref}; $m++ )
+    {
+        my $onelanguage = ${$languagesarrayref}[$m];
+        $installer::globals::installlocationdirectoryset = 0;
+
     my @directorytable = ();
     my $infoline;
 
     overwrite_programfilesfolder($allvariableshashref);
     if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_1.log", $directoryref); }
     create_unique_directorynames($directoryref, $allvariableshashref);
+    $already_checked_the_frigging_directories_for_uniqueness++;
     if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_1a.log", $directoryref); }
     create_defaultdir_directorynames($directoryref, $shortdirnamehashref);  # only destdir!
     if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_2.log", $directoryref); }
     set_installlocation_directory($directoryref, $allvariableshashref);
     if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_3.log", $directoryref); }
     installer::windows::idtglobal::write_idt_header(\@directorytable, "directory");
-    add_root_directories(\@directorytable, $allvariableshashref);
+    add_root_directories(\@directorytable, $allvariableshashref, $onelanguage);
     create_directorytable_from_collection(\@directorytable, $directoryref);
 
     # Saving the file
 
-    my $directorytablename = $basedir . $installer::globals::separator . "Director.idt";
+    my $directorytablename = $basedir . $installer::globals::separator . "Director.idt" . "." . $onelanguage;
     installer::files::save_file($directorytablename ,\@directorytable);
     $infoline = "Created idt file: $directorytablename\n";
     push(@installer::globals::logfileinfo, $infoline);
-
+    }
 }
 
 1;
diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
index 39521baecdfe..e5aa5f5a3fdc 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -120,8 +120,8 @@ sub get_feature_display
     # Special handling for c05office. No program module visible.
     if (( $onefeature->{'gid'} eq "gid_Module_Prg" ) && ( $installer::globals::product =~ /c05office/i )) { $display = "0"; }
 
-    # making all feature invisible in Language packs!
-    if ( $installer::globals::languagepack ) { $display = "0"; }
+    # making all feature invisible in Language packs and in Help packs!
+    if ( $installer::globals::languagepack || $installer::globals::helppack ) { $display = "0"; }
 
     return $display
 }
@@ -218,7 +218,8 @@ sub replace_variables
 {
     my ($translationfile, $variableshashref) = @_;
 
-    foreach $key (keys %{$variableshashref})
+    # we want to substitute FOO_BR before FOO to avoid floating _BR suffixes
+    foreach $key (sort { length ($b) <=> length ($a) } keys %{$variableshashref})
     {
         my $value = $variableshashref->{$key};
         replace_one_variable($translationfile, $value, $key);
@@ -399,7 +400,6 @@ sub create_feature_table
 
             $feature{'feature'} = get_feature_gid($onefeature);
             $feature{'feature_parent'} = get_feature_parent($onefeature);
-            # if ( $onefeature->{'ParentID'} eq "" ) { $feature{'feature_parent'} = ""; }   # Root has no parent
             $feature{'Title'} = $onefeature->{'Name'};
             $feature{'Description'} = $onefeature->{'Description'};
             $feature{'Display'} = get_feature_display($onefeature);
diff --git a/solenv/bin/modules/installer/windows/featurecomponent.pm b/solenv/bin/modules/installer/windows/featurecomponent.pm
index c5053212aad3..8e9ebee84703 100644
--- a/solenv/bin/modules/installer/windows/featurecomponent.pm
+++ b/solenv/bin/modules/installer/windows/featurecomponent.pm
@@ -132,71 +132,6 @@ sub create_featurecomponent_table_from_registry_collector
 }
 
 #################################################################################
-# Collecting all feature that are listed in the featurecomponent table.
-#################################################################################
-
-sub collect_all_feature
-{
-    my ($featurecomponenttable) = @_;
-
-    my @allfeature = ();
-
-    for ( my $i = 3; $i <= $#{$featurecomponenttable}; $i++ )   # beginning in line 4
-    {
-        my $oneline = ${$featurecomponenttable}[$i];
-
-        if ( $oneline =~ /^\s*(\S+)\s+(\S+)\s*$/ )
-        {
-            my $feature = $1;
-
-            if (! installer::existence::exists_in_array($feature, \@allfeature)) { push(@allfeature, $feature); }
-        }
-    }
-
-    return \@allfeature;
-}
-
-#################################################################################
-# On Win98 and Win Me there seems to be the problem, that maximum 817
-# components can be added to a feature. Even if Windows Installer 2.0
-# is used.
-#################################################################################
-
-sub check_number_of_components_at_feature
-{
-    my ($featurecomponenttable) = @_;
-
-    my $infoline = "\nChecking number of components at features. Maximum is 817 (for Win 98 and Win Me)\n";
-    push(@installer::globals::logfileinfo, $infoline);
-
-    my $allfeature = collect_all_feature($featurecomponenttable);
-
-    for ( my $i = 0; $i <= $#{$allfeature}; $i++ )
-    {
-        my $onefeature = ${$allfeature}[$i];
-        my $featurecomponents = 0;
-
-        for ( my $j = 0; $j <= $#{$featurecomponenttable}; $j++ )
-        {
-            if ( ${$featurecomponenttable}[$j] =~ /^\s*\Q$onefeature\E\s+(\S+)\s*$/ ) { $featurecomponents++; }
-        }
-
-        if ( $featurecomponents > 816 )
-        {
-            installer::exiter::exit_program("ERROR: More than 816 components ($featurecomponents) at feature $onefeature. This causes problems on Win 98 and Win Me!", "check_number_of_components_at_feature");
-        }
-
-        # Logging the result
-
-        $infoline = "Number of components at feature $onefeature : $featurecomponents\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-
-    $infoline = "\n";
-    push(@installer::globals::logfileinfo, $infoline);
-}
-
-#################################################################################
 # Creating the file FeatureC.idt dynamically
 # Content:
 # Feature Component
@@ -228,10 +163,6 @@ sub create_featurecomponent_table
 
     # Additional components have to be added here
 
-    # Checking, whether there are more than 817 components at a feature
-
-    check_number_of_components_at_feature(\@featurecomponenttable);
-
     # Saving the file
 
     my $featurecomponenttablename = $basedir . $installer::globals::separator . "FeatureC.idt";
@@ -241,4 +172,4 @@ sub create_featurecomponent_table
 
 }
 
-1;
\ No newline at end of file
+1;
diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm
index 3ac72ecf6ac3..c4315b43aceb 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -877,7 +877,6 @@ sub create_files_table
 
     # The filenames must be collected because of uniqueness
     # 01-44-~1.DAT, 01-44-~2.DAT, ...
-    # my @shortnames = ();
     my %shortnames = ();
 
     if ( $installer::globals::updatedatabase ) { collect_shortnames_from_old_database($uniquefilenamehashref, \%shortnames); }
@@ -902,7 +901,6 @@ sub create_files_table
         $onefile->{'componentname'} = $file{'Component_'};
 
         # Collecting all components
-        # if (!(installer::existence::exists_in_array($file{'Component_'}, $allfilecomponentsref))) { push(@{$allfilecomponentsref}, $file{'Component_'}); }
 
         if ( ! exists($allfilecomponents{$file{'Component_'}}) ) { $allfilecomponents{$file{'Component_'}} = 1; }
 
@@ -984,7 +982,6 @@ sub create_files_table
         }
 
         # Collecting all language specific conditions
-        # if ( $onefile->{'haslanguagemodule'} )
         if ( $onefile->{'ismultilingual'} )
         {
             if ( $onefile->{'ComponentCondition'} ) { installer::exiter::exit_program("ERROR: Cannot set language condition. There is already another component condition for file $onefile->{'gid'}: \"$onefile->{'ComponentCondition'}\" !", "create_files_table"); }
diff --git a/solenv/bin/modules/installer/windows/font.pm b/solenv/bin/modules/installer/windows/font.pm
index 9dab78caf5f7..3e3afed5577b 100644
--- a/solenv/bin/modules/installer/windows/font.pm
+++ b/solenv/bin/modules/installer/windows/font.pm
@@ -58,7 +58,6 @@ sub create_font_table
             my %font = ();
 
             $font{'File_'} = $onefile->{'uniquename'};
-            # $font{'FontTitle'} = $onefile->{'FontName'};  # results in a warning during validation
             $font{'FontTitle'} = "";
 
             my $oneline = $font{'File_'} . "\t" . $font{'FontTitle'} . "\n";
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index 4a54ead9dfd4..94b5dcc62399 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -139,7 +139,6 @@ sub get_next_free_number_with_hash
 
     if (!($dontsave))
     {
-        # push(@{$shortnamesref}, $newname);    # adding the new shortname to the array of shortnames
         $shortnamesref->{$newname} = 1; # adding the new shortname to the array of shortnames, always uppercase
         $saved = 1;
     }
@@ -273,7 +272,6 @@ sub make_eight_three_conform_with_hash
     my $changed = 0;
     my $saved;
 
-    # if (( $inputstring =~ /^\s*(.*?)\.(.*?)\s*$/ ) && ( $pattern eq "file" )) # files with a dot
     if (( $inputstring =~ /^\s*(.*)\.(.*?)\s*$/ ) && ( $pattern eq "file" ))    # files with a dot
     {
         # extension has to be non-greedy, but name is. This is important to find the last dot in the filename
@@ -401,7 +399,7 @@ sub write_idt_header
     {
         $oneline = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n";
         push(@{$idtref}, $oneline);
-        $oneline = "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n";
+        $oneline = "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti4\n";
         push(@{$idtref}, $oneline);
         $oneline = "File\tFile\n";
         push(@{$idtref}, $oneline);
@@ -461,7 +459,7 @@ sub write_idt_header
     {
         $oneline = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n";
         push(@{$idtref}, $oneline);
-        $oneline = "i2\ti2\tL64\tS255\tS32\tS72\n";
+        $oneline = "i2\ti4\tL64\tS255\tS32\tS72\n";
         push(@{$idtref}, $oneline);
         $oneline = "Media\tDiskId\n";
         push(@{$idtref}, $oneline);
@@ -629,7 +627,6 @@ sub get_languagefilename
 {
     my ($idtfilename, $basedir) = @_;
 
-    # $idtfilename =~ s/\.idt/\.ulf/;
     $idtfilename =~ s/\.idt/\.mlf/;
 
     my $languagefilename = $basedir . $installer::globals::separator . $idtfilename;
@@ -758,7 +755,6 @@ sub translate_idtfile
             my $language_block = get_language_block_from_language_file($oldstring, $languagefile);
             my $newstring = get_language_string_from_language_block($language_block, $onelanguage, $oldstring);
 
-            # if (!( $newstring eq "" )) { ${$idtfile}[$i] =~ s/$oldstring/$newstring/; }
             ${$idtfile}[$i] =~ s/$oldstring/$newstring/;    # always substitute, even if $newstring eq "" (there are empty strings for control.idt)
         }
     }
@@ -922,18 +918,12 @@ sub get_rtf_licensetext
     for ( my $i = 0; $i <= $#{$licensefile}; $i++ )
     {
         my $oneline = ${$licensefile}[$i];
-        # if  ( $oneline =~ /^\s*$/ ) { $oneline = '\par'; }    # empty lines
 
         if ( $i == 0 ) { $oneline =~ s/^\W*//; }
 
         $oneline =~ s/\t/    /g;        # no tabs allowed, converting to four spaces
         $oneline =~ s/\n$//g;           # no newline at line end
 
-#       $oneline =~ s/�/\\\'e4/g;           # converting "�"
-#       $oneline =~ s/�/\\\'f6/g;           # converting "�"
-#       $oneline =~ s/�/\\\'fc/g;           # converting "�"
-#       $oneline =~ s/�/\\\'df/g;           # converting "�"
-
         # german replacements
 
         $oneline =~ s/\�\�/\\\'c4/g;        # converting "�"
@@ -1146,11 +1136,7 @@ sub add_language_checkboxes_to_database
         my $onelanguage = ${$languagesarrayref}[$i];
         my $windowslanguage = installer::windows::language::get_windows_language($onelanguage);
 
-        # my $is_english = 0;
-        # if ( $windowslanguage eq "1033" ) { $is_english = 1; }
-
         my $checkboxattribute = "3";
-        # if ( $is_english ) { $checkboxattribute = "1"; }  # english is not deselectable
 
         my $count = $i + 1;
         my $nextcount = $i + 2;
@@ -1167,7 +1153,6 @@ sub add_language_checkboxes_to_database
         my $yvalue = $offset + $i * $multiplier;
 
         my $property = "IS" . $windowslanguage;
-    #   if ( ! exists($installer::globals::languageproperties{$property}) ) { installer::exiter::exit_program("ERROR: Could not find property \"$property\" in the list of language properties!", "add_language_checkboxes_to_database"); }
 
         my $controlnext = "";
         if ( $last ) { $controlnext = "Next"; }
@@ -1301,7 +1286,7 @@ sub set_custom_action
 
     # All files are located in $filesref and in @installer::globals::binarytableonlyfiles.
     # Both must be added together
-    my $localfilesref = installer::converter::combine_arrays_from_references(\@installer::globals::binarytableonlyfiles, $filesref);
+    my $localfilesref = [@installer::globals::binarytableonlyfiles, @{$filesref}];
 
     for ( my $i = 0; $i <= $#{$localfilesref}; $i++ )
     {
@@ -1379,7 +1364,7 @@ sub add_custom_action_to_install_table
 
     # All files are located in $filesref and in @installer::globals::binarytableonlyfiles.
     # Both must be added together
-    my $localfilesref = installer::converter::combine_arrays_from_references(\@installer::globals::binarytableonlyfiles, $filesref);
+    my $localfilesref = [@installer::globals::binarytableonlyfiles, @{$filesref}];
 
     for ( my $i = 0; $i <= $#{$localfilesref}; $i++ )
     {
@@ -1613,7 +1598,6 @@ sub include_subdirname_into_directory_table
             {
                 my $newuniquename = "sub" . $subdir;
                 $newdir = $newuniquename;
-                # my $newparent = $parent;
                 my $newparent = "INSTALLLOCATION";
                 my $newname = $name . "\:" . $subdir;
                 my $newline =
@@ -2097,7 +2081,7 @@ sub get_customaction_position
 
 ##########################################################################
 # Setting the position of CustomActions in sequence tables.
-# Replacing all occurences of "POSITIONTEMPLATE_"
+# Replacing all occurrences of "POSITIONTEMPLATE_"
 ##########################################################################
 
 sub set_positions_in_table
@@ -2107,7 +2091,7 @@ sub set_positions_in_table
     my $infoline = "\nSetting positions in table \"$tablename\".\n";
     push(@installer::globals::logfileinfo, $infoline);
 
-    # Step 1: Resolving all occurences of "POSITIONTEMPLATE_end"
+    # Step 1: Resolving all occurrences of "POSITIONTEMPLATE_end"
 
     my $lastposition = get_last_position_in_sequencetable($sequencetable);
 
@@ -2123,9 +2107,9 @@ sub set_positions_in_table
         }
     }
 
-    # Step 2: Resolving all occurences of "POSITIONTEMPLATE_abc" or "POSITIONTEMPLATE_behind_abc"
+    # Step 2: Resolving all occurrences of "POSITIONTEMPLATE_abc" or "POSITIONTEMPLATE_behind_abc"
     # where abc is the name of the reference Custom Action.
-    # This has to be done, until there is no more occurence of POSITIONTEMPLATE (success)
+    # This has to be done, until there is no more occurrence of POSITIONTEMPLATE (success)
     # or there is no replacement in one circle (failure).
 
     my $template_exists = 0;
@@ -2180,7 +2164,7 @@ sub set_positions_in_table
         }
     } while (( $template_exists ) && ( $template_replaced ));
 
-    # An error occured, because templates still exist, but could not be replaced.
+    # An error occurred, because templates still exist, but could not be replaced.
     # Reason:
     # 1. Wrong name of CustomAction in scp2 (typo?)
     # 2. Circular dependencies of CustomActions (A after B and B after A)
@@ -2193,9 +2177,6 @@ sub set_positions_in_table
 
     if (( $template_exists ) && ( ! $template_replaced ))
     {
-        # Giving a precise error message, collecting all unresolved templates
-        # my $templatestring = "";
-
         for ( my $i = 0; $i <= $#{$sequencetable}; $i++ )
         {
             if ( ${$sequencetable}[$i] =~ /^\s*([\w\.]+)\t.*\t\s*(POSITIONTEMPLATE_.*?)\s*$/ )
@@ -2204,22 +2185,12 @@ sub set_positions_in_table
                 my $fulltemplate = $2;
                 my $template = $fulltemplate;
                 $template =~ s/POSITIONTEMPLATE_//;
-                # my $newstring = $customactionname . " (" . $template . ")";
-                # $templatestring = $templatestring . $newstring . ", ";
-                # Setting at the end!
                 $lastposition = $lastposition + 25;
                 ${$sequencetable}[$i] =~ s/$fulltemplate/$lastposition/;
                 $infoline = "WARNING: Setting position \"$lastposition\" for custom action \"$customactionname\". Could not find CustomAction \"$template\".\n";
                 push(@installer::globals::logfileinfo, $infoline);
             }
         }
-        # $templatestring =~ s/,\s*$//;
-
-        # $infoline = "Error: Saving table \"$tablename\"\n";
-        # push(@installer::globals::logfileinfo, $infoline);
-        # print $infoline;
-        # installer::files::save_file($tablename, $sequencetable);
-        # installer::exiter::exit_program("ERROR: Unresolved positions in CustomActions in scp2: $templatestring", "set_positions_in_table");
     }
 }
 
diff --git a/solenv/bin/modules/installer/windows/language.pm b/solenv/bin/modules/installer/windows/language.pm
index c0dca543eb56..a95bed94517c 100644
--- a/solenv/bin/modules/installer/windows/language.pm
+++ b/solenv/bin/modules/installer/windows/language.pm
@@ -60,7 +60,6 @@ sub get_windows_encoding
 
     if ( $installer::globals::msiencoding->{$language} ) { $windowsencoding = $installer::globals::msiencoding->{$language}; }
 
-    # if ( $windowsencoding eq "" ) { installer::exiter::exit_program("ERROR: Unknown language $language in function get_windows_encoding", "get_windows_encoding"); }
     if ( $windowsencoding eq "" ) { $windowsencoding = "0"; }   # setting value, if the language is not listed in the encodinglist
 
     if ( $windowsencoding eq "0" ) { $windowsencoding = "65001"; }  # languages with "0" have to be available in UTF-8 (65001)
@@ -71,4 +70,4 @@ sub get_windows_encoding
     return $windowsencoding;
 }
 
-1;
\ No newline at end of file
+1;
diff --git a/solenv/bin/modules/installer/windows/media.pm b/solenv/bin/modules/installer/windows/media.pm
index 35e90f6a3856..12da8a723c9d 100644
--- a/solenv/bin/modules/installer/windows/media.pm
+++ b/solenv/bin/modules/installer/windows/media.pm
@@ -351,7 +351,6 @@ sub create_media_table
         if ( $allvariables->{'CABFILENUMBER'} ) { $maxcabfilenumber = $allvariables->{'CABFILENUMBER'}; }
         my $allfiles = $#{$filesref} + 1;
         my $maxfilenumber = get_maximum_filenumber($allfiles, $maxcabfilenumber);
-        # my $maxfilenumber = 1000; # maximum 1000 files in each cabinet file
         my $cabfilenumber = 0;
         my $cabfull = 0;
         my $counter = 0;
@@ -385,7 +384,6 @@ sub create_media_table
                 $cabfilenumber++;
 
                 $media{'DiskId'} = get_media_diskid($cabfilenumber);
-                # $media{'LastSequence'} = get_media_lastsequence($onefile);
                 $media{'LastSequence'} = $i + 1;    # This should be correct, also for unsorted files collectors
                 $media{'DiskPrompt'} = get_media_diskprompt();
                 $media{'Cabinet'} = generate_cab_filename_for_some_cabs($allvariables, $cabfilenumber);
@@ -420,7 +418,6 @@ sub create_media_table
         my $maximumfile = $#{$filesref};
 
         $media{'DiskId'} = get_media_diskid($diskid);
-        # $media{'LastSequence'} = ${$filesref}[$maximumfile]->{'sequencenumber'};  # sequence number of the last file
         $media{'LastSequence'} = $maximumfile + 1; # This works also for unsorted file collector
         $media{'DiskPrompt'} = get_media_diskprompt();
         $media{'Cabinet'} = generate_cab_filename($allvariables);
diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm b/solenv/bin/modules/installer/windows/mergemodule.pm
index eb524fdafc3e..b9591c417994 100755
--- a/solenv/bin/modules/installer/windows/mergemodule.pm
+++ b/solenv/bin/modules/installer/windows/mergemodule.pm
@@ -51,7 +51,7 @@ sub merge_mergemodules_into_msi_database
     my ($mergemodules, $filesref, $msifilename, $languagestringref, $language, $languagefile, $allvariables, $includepatharrayref, $allupdatesequences, $allupdatelastsequences, $allupdatediskids) = @_;
 
     my $domerge = 0;
-    if (( $#{$mergemodules} > -1 ) && ( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack )) { $domerge = 1; }
+    if (( $#{$mergemodules} > -1 ) && ( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack )) { $domerge = 1; }
 
     if ( $domerge )
     {
@@ -79,7 +79,6 @@ sub merge_mergemodules_into_msi_database
             %installer::globals::mergemodules = ();
 
             my $mergemoduledir = installer::systemactions::create_directories("mergefiles", $languagestringref);
-            # push(@installer::globals::removedirs, $mergemoduledir);
 
             my $mergemodule;
             foreach $mergemodule ( @{$mergemodules} )
@@ -144,7 +143,6 @@ sub merge_mergemodules_into_msi_database
                 }
                 else
                 {
-                    # $systemcall = $msidb . " -d " . $filename . " -f " . $workdir . " -e File Component MsiAssembly Directory";
                     $systemcall = $msidb . " -d " . $filename . " -f " . $workdir . " -e \*";
                 }
 
@@ -398,14 +396,14 @@ sub merge_mergemodules_into_msi_database
             installer::logger::include_timestamp_into_logfile("\nPerformance Info: After merging database");
 
             # Saving original idt files
-            if ( -f "File.idt" ) { installer::systemactions::rename_one_file("File.idt", "File.idt.$counter"); }
-            if ( -f "Media.idt" ) { installer::systemactions::rename_one_file("Media.idt", "Media.idt.$counter"); }
-            if ( -f "Directory.idt" ) { installer::systemactions::rename_one_file("Directory.idt", "Directory.idt.$counter"); }
-            if ( -f "Director.idt" ) { installer::systemactions::rename_one_file("Director.idt", "Director.idt.$counter"); }
-            if ( -f "FeatureComponents.idt" ) { installer::systemactions::rename_one_file("FeatureComponents.idt", "FeatureComponents.idt.$counter"); }
-            if ( -f "FeatureC.idt" ) { installer::systemactions::rename_one_file("FeatureC.idt", "FeatureC.idt.$counter"); }
-            if ( -f "MsiAssembly.idt" ) { installer::systemactions::rename_one_file("MsiAssembly.idt", "MsiAssembly.idt.$counter"); }
-            if ( -f "MsiAssem.idt" ) { installer::systemactions::rename_one_file("MsiAssem.idt", "MsiAssem.idt.$counter"); }
+            if ( -f "File.idt" ) { installer::systemactions::rename_one_file("File.idt", "old.File.idt.$counter"); }
+            if ( -f "Media.idt" ) { installer::systemactions::rename_one_file("Media.idt", "old.Media.idt.$counter"); }
+            if ( -f "Directory.idt" ) { installer::systemactions::rename_one_file("Directory.idt", "old.Directory.idt.$counter"); }
+            if ( -f "Director.idt" ) { installer::systemactions::rename_one_file("Director.idt", "old.Director.idt.$counter"); }
+            if ( -f "FeatureComponents.idt" ) { installer::systemactions::rename_one_file("FeatureComponents.idt", "old.FeatureComponents.idt.$counter"); }
+            if ( -f "FeatureC.idt" ) { installer::systemactions::rename_one_file("FeatureC.idt", "old.FeatureC.idt.$counter"); }
+            if ( -f "MsiAssembly.idt" ) { installer::systemactions::rename_one_file("MsiAssembly.idt", "old.MsiAssembly.idt.$counter"); }
+            if ( -f "MsiAssem.idt" ) { installer::systemactions::rename_one_file("MsiAssem.idt", "old.MsiAssem.idt.$counter"); }
 
             # Extracting tables
 
@@ -474,13 +472,13 @@ sub merge_mergemodules_into_msi_database
             # merged into the three ExecuteSequences with the following process (also into InstallUISequence.idt).
 
             # Saving original idt files
-            if ( -f "InstallE.idt" ) { installer::systemactions::rename_one_file("InstallE.idt", "InstallE.idt.$counter"); }
-            if ( -f "InstallU.idt" ) { installer::systemactions::rename_one_file("InstallU.idt", "InstallU.idt.$counter"); }
-            if ( -f "AdminExe.idt" ) { installer::systemactions::rename_one_file("AdminExe.idt", "AdminExe.idt.$counter"); }
-            if ( -f "AdvtExec.idt" ) { installer::systemactions::rename_one_file("AdvtExec.idt", "AdvtExec.idt.$counter"); }
-            if ( -f "ModuleInstallExecuteSequence.idt" ) { installer::systemactions::rename_one_file("ModuleInstallExecuteSequence.idt", "ModuleInstallExecuteSequence.idt.$counter"); }
-            if ( -f "ModuleAdminExecuteSequence.idt" ) { installer::systemactions::rename_one_file("ModuleAdminExecuteSequence.idt", "ModuleAdminExecuteSequence.idt.$counter"); }
-            if ( -f "ModuleAdvtExecuteSequence.idt" ) { installer::systemactions::rename_one_file("ModuleAdvtExecuteSequence.idt", "ModuleAdvtExecuteSequence.idt.$counter"); }
+            if ( -f "InstallE.idt" ) { installer::systemactions::rename_one_file("InstallE.idt", "old.InstallE.idt.$counter"); }
+            if ( -f "InstallU.idt" ) { installer::systemactions::rename_one_file("InstallU.idt", "old.InstallU.idt.$counter"); }
+            if ( -f "AdminExe.idt" ) { installer::systemactions::rename_one_file("AdminExe.idt", "old.AdminExe.idt.$counter"); }
+            if ( -f "AdvtExec.idt" ) { installer::systemactions::rename_one_file("AdvtExec.idt", "old.AdvtExec.idt.$counter"); }
+            if ( -f "ModuleInstallExecuteSequence.idt" ) { installer::systemactions::rename_one_file("ModuleInstallExecuteSequence.idt", "old.ModuleInstallExecuteSequence.idt.$counter"); }
+            if ( -f "ModuleAdminExecuteSequence.idt" ) { installer::systemactions::rename_one_file("ModuleAdminExecuteSequence.idt", "old.ModuleAdminExecuteSequence.idt.$counter"); }
+            if ( -f "ModuleAdvtExecuteSequence.idt" ) { installer::systemactions::rename_one_file("ModuleAdvtExecuteSequence.idt", "old.ModuleAdvtExecuteSequence.idt.$counter"); }
 
             # Extracting tables
             my $moduleexecutetables = "ModuleInstallExecuteSequence ModuleAdminExecuteSequence ModuleAdvtExecuteSequence"; # new tables
@@ -557,16 +555,22 @@ sub merge_mergemodules_into_msi_database
                 my $localworkdir = $workdir;
                 $localmsifilename =~ s/\//\\\\/g;
                 $localworkdir =~ s/\//\\\\/g;
-                $systemcall = $msidb . " -d " . $localmsifilename . " -f " . $localworkdir . " -i " . $workingtables. " " . $executetables;
+        foreach $table (split / /, $workingtables . ' ' . $executetables) {
+          $systemcall = $msidb . " -d " . $localmsifilename . " -f " . $localworkdir . " -i " . $table;
+          my $retval = system($systemcall);
+          $infoline = "Systemcall returned $retval: $systemcall\n";
+          push( @installer::globals::logfileinfo, $infoline);
+          $returnvalue |= $retval;
+        }
             }
             else
             {
                 $systemcall = $msidb . " -d " . $msifilename . " -f " . $workdir . " -i " . $workingtables. " " . $executetables;
-            }
-            $returnvalue = system($systemcall);
+        $returnvalue = system($systemcall);
+        $infoline = "Systemcall: $systemcall\n";
+        push( @installer::globals::logfileinfo, $infoline);
 
-            $infoline = "Systemcall: $systemcall\n";
-            push( @installer::globals::logfileinfo, $infoline);
+            }
 
             if ($returnvalue)
             {
@@ -1105,23 +1109,6 @@ sub change_file_table
     {
         if ( ! -d $unpackdir ) { installer::systemactions::create_directory($unpackdir); }
 
-        # Unpack the cab file, so that in can be included into the last office cabinet file. Attention: cararc.exe from cabsdk required.
-        # cabarc.exe -o X <fullcabfilepath>
-
-        # my $cabarcfilename = "cabarc.exe";
-        # my $cabarcfile = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$cabarcfilename, $includepatharrayref, 1);
-
-        # if ( ! -f $$cabarcfile )
-        # {
-        #   $cabarcfilename = "CABARC.EXE";
-        #   $cabarcfile = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$cabarcfilename, $includepatharrayref, 1);
-        #   if ( ! -f $$cabarcfile )
-        #   {
-        #       installer::exiter::exit_program("ERROR: cabarc.exe not found !", "change_file_table");
-        #   }
-        # }
-        # my $cabarc = $$cabarcfile;
-
         # changing directory
         my $from = cwd();
         my $to = $mergemodulehash->{'workdir'};
@@ -1148,9 +1135,6 @@ sub change_file_table
 
         my $cabfilename = "MergeModule.CABinet";
 
-        # exclude cabinet file
-        # my $systemcall = $cabarc . " -o X " . $mergemodulehash->{'cabinetfile'};
-
         my $systemcall = "";
         if ( $^O =~ /cygwin/i ) {
             my $localunpackdir = qx(cygpath -m "$unpackdir");
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index dbb6e051aa29..07f6b73c9cbc 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -64,7 +64,10 @@ sub write_ddf_file_header
     push(@{$ddffileref} ,$oneline);
     $oneline = ".Set Compress=ON\n";
     push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set CompressionLevel=$installer::globals::cabfilecompressionlevel\n";
+# The window size for LZX compression
+# CompressionMemory=15 | 16 | ... | 21
+# Reference: http://msdn.microsoft.com/en-us/library/bb417343.aspx
+    $oneline = ".Set CompressionMemory=$installer::globals::cabfilecompressionlevel\n";
     push(@{$ddffileref} ,$oneline);
     $oneline = ".Set Cabinet=ON\n";
     push(@{$ddffileref} ,$oneline);
@@ -1010,9 +1013,9 @@ sub create_transforms
         my $infoline = "Systemcall: $systemcall\n";
         push( @installer::globals::logfileinfo, $infoline);
 
-        # Problem: msitran.exe in version 4.0 always returns "1", even if no failure occured.
+        # Problem: msitran.exe in version 4.0 always returns "1", even if no failure occurred.
         # Therefore it has to be checked, if this is version 4.0. If yes, if the mst file
-        # exists and if it is larger than 0 bytes. If this is true, then no error occured.
+        # exists and if it is larger than 0 bytes. If this is true, then no error occurred.
         # File Version of msitran.exe: 4.0.6000.16384 has checksum: "b66190a70145a57773ec769e16777b29".
         # Same for msitran.exe from wntmsci12: "aa25d3445b94ffde8ef0c1efb77a56b8"
 
@@ -1026,7 +1029,7 @@ sub create_transforms
             my $digest = Digest::MD5->new->addfile(*FILE)->hexdigest;
             close(FILE);
 
-            my @problemchecksums = ("b66190a70145a57773ec769e16777b29", "aa25d3445b94ffde8ef0c1efb77a56b8");
+            my @problemchecksums = ("b66190a70145a57773ec769e16777b29", "aa25d3445b94ffde8ef0c1efb77a56b8", "748206e54fc93efe6a1aaa9d491f3ad1");
             my $isproblemchecksum = 0;
 
             foreach my $problemchecksum ( @problemchecksums )
@@ -1057,13 +1060,13 @@ sub create_transforms
                     }
                     else
                     {
-                        $infoline = "Filesize indicates that an error occured.\n";
+                        $infoline = "Filesize indicates that an error occurred.\n";
                         push( @installer::globals::logfileinfo, $infoline);
                     }
                 }
                 else
                 {
-                    $infoline = "File $transformfile does not exist -> An error occured.\n";
+                    $infoline = "File $transformfile does not exist -> An error occurred.\n";
                     push( @installer::globals::logfileinfo, $infoline);
                 }
             }
@@ -1476,7 +1479,6 @@ sub get_guid_list
 
     # "-c" for uppercase output
 
-    # my $systemcall = "$uuidgen -n$number -c |";
     my $systemcall = "$uuidgen -n$number |";
     open (UUIDGEN, "$systemcall" ) or die("uuidgen is missing.");
     my @uuidlist = <UUIDGEN>;
@@ -1519,7 +1521,6 @@ sub calculate_guid
     my $digest = $md5->hexdigest;
     $digest = uc($digest);
 
-    # my $id = pack("A32", $digest);
     my ($first, $second, $third, $fourth, $fifth) = unpack ('A8 A4 A4 A4 A12', $digest);
     $guid = "$first-$second-$third-$fourth-$fifth";
 
@@ -1593,8 +1594,6 @@ sub set_uuid_into_component_table
 
     my $infoline = "";
     my $counter = 0;
-    # my $componentfile = installer::files::read_file($installer::globals::componentfilename);
-    # my $componenthash = fill_component_hash($componentfile);
 
     for ( my $i = 3; $i <= $#{$componenttable}; $i++ )  # ignoring the first three lines
     {
@@ -1604,13 +1603,6 @@ sub set_uuid_into_component_table
 
         my $uuid = "";
 
-    #   if ( $componenthash->{$componentname} )
-    #   {
-    #       $uuid = $componenthash->{$componentname};
-    #   }
-    #   else
-    #   {
-
             if ( exists($installer::globals::calculated_component_guids{$componentname}))
             {
                 $uuid = $installer::globals::calculated_component_guids{$componentname};
@@ -1634,44 +1626,12 @@ sub set_uuid_into_component_table
                 if ( exists($installer::globals::allcalculated_guids{$uuid}) ) { installer::exiter::exit_program("ERROR: \"$uuid\" was already created before!", "set_uuid_into_component_table"); }
                 $installer::globals::allcalculated_guids{$uuid} = 1;
                 $installer::globals::calculated_component_guids{$componentname} = $uuid;
-
-                # Setting new uuid
-                # $componenthash->{$componentname} = $uuid;
-
-                # Setting flag
-                # $installer::globals::created_new_component_guid = 1;  # this is very important!
             }
-    #   }
 
         ${$componenttable}[$i] =~ s/COMPONENTGUID/$uuid/;
     }
 
     installer::files::save_file($componenttablename, $componenttable);
-
-#   if ( $installer::globals::created_new_component_guid )
-#   {
-#       # create new component file!
-#       $componentfile = create_new_component_file($componenthash);
-#       installer::worker::sort_array($componentfile);
-#
-#       # To avoid conflict the components file cannot be saved at the same place
-#       # All important data have to be saved in the directory: $installer::globals::infodirectory
-#       my $localcomponentfilename = $installer::globals::componentfilename;
-#       installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$localcomponentfilename);
-#       $localcomponentfilename = $installer::globals::infodirectory . $installer::globals::separator . $localcomponentfilename;
-#       installer::files::save_file($localcomponentfilename, $componentfile);
-#
-#       # installer::files::save_file($installer::globals::componentfilename, $componentfile);  # version using new file in solver
-#
-#       $infoline = "COMPONENTCODES: Created $counter new GUIDs for components ! \n";
-#       push( @installer::globals::logfileinfo, $infoline);
-#   }
-#   else
-#   {
-#       $infoline = "SUCCESS COMPONENTCODES: All component codes exist! \n";
-#       push( @installer::globals::logfileinfo, $infoline);
-#   }
-
 }
 
 #########################################################################
@@ -1884,8 +1844,6 @@ sub execute_packaging
 
         installer::logger::print_message( "... makecab.exe ($callscounter/$allmakecabcalls) ... \n" );
 
-        # my $returnvalue = system($systemcall);
-
         for ( my $n = 1; $n <= $maxmakecabcalls; $n++ )
         {
             my @ddfoutput = ();
@@ -1913,7 +1871,6 @@ sub execute_packaging
                 }
 
                 push( @installer::globals::logfileinfo, $infoline);
-                # for ( my $j = 0; $j <= $#ddfoutput; $j++ ) { push( @installer::globals::logfileinfo, "$ddfoutput[$j]"); }
 
                 for ( my $m = 0; $m <= $#ddfoutput; $m++ )
                 {
@@ -1930,7 +1887,6 @@ sub execute_packaging
             }
             else
             {
-                # installer::logger::print_message( "Success (Try $n): \"$systemcall\"\n" );
                 $infoline = "Success (Try $n): $systemcall";
                 push( @installer::globals::logfileinfo, $infoline);
                 last;
@@ -2033,7 +1989,6 @@ sub set_global_code_variables
         $installer::globals::upgradecode = installer::windows::idtglobal::get_language_string_from_language_block($codeblock, $onelanguage, "");
     }
 
-    # if (( $installer::globals::productcode eq "" ) && ( ! $isopensource )) { installer::exiter::exit_program("ERROR: ProductCode for language $onelanguage not defined in $installer::globals::codefilename !", "set_global_code_variables"); }
     if ( $installer::globals::upgradecode eq "" ) { installer::exiter::exit_program("ERROR: UpgradeCode not defined in $installer::globals::codefilename !", "set_global_code_variables"); }
 
     $infoline = "Setting ProductCode to: $installer::globals::productcode \n";
@@ -2226,8 +2181,8 @@ sub read_saved_mappings
     {
         my @errorlines = ();
         my $errorstring = "";
-        my $error_occured = 0;
-        my $file_error_occured = 0;
+        my $error_occurred = 0;
+        my $file_error_occurred = 0;
         my $dir_error = 0;
 
         my $idtdir = $installer::globals::previous_idt_dir;
@@ -2251,28 +2206,28 @@ sub read_saved_mappings
 
             if ( exists($installer::globals::savedmapping{"$2/$5"}))
             {
-                if ( ! $file_error_occured )
+                if ( ! $file_error_occurred )
                 {
                     $errorstring = "\nErrors in $idtfile: \n";
                     push(@errorlines, $errorstring);
                 }
                 $errorstring = "Duplicate savedmapping{" . "$2/$5}\n";
                 push(@errorlines, $errorstring);
-                $error_occured = 1;
-                $file_error_occured = 1;
+                $error_occurred = 1;
+                $file_error_occurred = 1;
             }
 
             if ( exists($installer::globals::savedrevmapping{$lc1}))
             {
-                if ( ! $file_error_occured )
+                if ( ! $file_error_occurred )
                 {
                     $errorstring = "\nErrors in $idtfile: \n";
                     push(@errorlines, $errorstring);
                 }
                 $errorstring = "Duplicate savedrevmapping{" . "$lc1}\n";
                 push(@errorlines, $errorstring);
-                $error_occured = 1;
-                $file_error_occured = 1;
+                $error_occurred = 1;
+                $file_error_occurred = 1;
             }
 
             my $shortname = $4 || '';
@@ -2286,15 +2241,15 @@ sub read_saved_mappings
 
             if (( $shortname ne '' ) && ( index($shortname, '~') > 0 ) && ( exists($installer::globals::savedrev83mapping{$shortname}) ))
             {
-                if ( ! $file_error_occured )
+                if ( ! $file_error_occurred )
                 {
                     $errorstring = "\nErrors in $idtfile: \n";
                     push(@errorlines, $errorstring);
                 }
                 $errorstring = "Duplicate savedrev83mapping{" . "$shortname}\n";
                 push(@errorlines, $errorstring);
-                $error_occured = 1;
-                $file_error_occured = 1;
+                $error_occurred = 1;
+                $file_error_occurred = 1;
             }
 
             $installer::globals::savedmapping{"$2/$5"} = "$1;$shortname";
@@ -2326,15 +2281,15 @@ sub read_saved_mappings
 
             if ( exists($installer::globals::saved83dirmapping{$1}) )
             {
-                if ( ! $dir_error_occured )
+                if ( ! $dir_error_occurred )
                 {
                     $errorstring = "\nErrors in $idtfile: \n";
                     push(@errorlines, $errorstring);
                 }
                 $errorstring = "Duplicate saved83dirmapping{" . "$1}\n";
                 push(@errorlines, $errorstring);
-                $error_occured = 1;
-                $dir_error_occured = 1;
+                $error_occurred = 1;
+                $dir_error_occurred = 1;
             }
 
             $installer::globals::saved83dirmapping{$1} = $4;
@@ -2346,7 +2301,7 @@ sub read_saved_mappings
 
         # Analyzing errors
 
-        if ( $error_occured )
+        if ( $error_occurred )
         {
             for ( my $i = 0; $i <= $#errorlines; $i++ )
             {
@@ -2356,7 +2311,6 @@ sub read_saved_mappings
             installer::exiter::exit_program("ERROR: Duplicate entries in saved mappings!", "read_saved_mappings");
         }
     } else {
-        # push( @installer::globals::globallogfileinfo, "WARNING: Windows patch shall be prepared, but PREVIOUS_IDT_DIR is not set!\n" );
         installer::exiter::exit_program("ERROR: Windows patch shall be prepared, but environment variable PREVIOUS_IDT_DIR is not set!", "read_saved_mappings");
     }
 
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index ac28f9258820..7593c96a6ea8 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -420,7 +420,6 @@ sub execute_msimsp
         $locallogfilename =~ s/\//\\\\/g;
 
         $localmspfilename =~ s/\\/\\\\/g; # path already contains backslash
-        # $localmspfilename =~ s/\//\\\\/g;
 
         $localmsimsptemppath = qx{cygpath -w "$localmsimsptemppath"};
         $localmsimsptemppath =~ s/\\/\\\\/g;
@@ -888,7 +887,7 @@ sub change_patchmetadata_table
     if ( $allvariables->{'PROPERTYTABLEPRODUCTNAME'} ) { $targetproductnamevalue = $allvariables->{'PROPERTYTABLEPRODUCTNAME'}; }
 
     my $manufacturerstring = "ManufacturerName";
-    my $manufacturervalue = "OpenOffice.org";
+    my $manufacturervalue = "LibreOffice";
     if ( $installer::globals::longmanufacturer ) { $manufacturervalue = $installer::globals::longmanufacturer; }
 
     my $displaynamestring = "DisplayName";
@@ -897,7 +896,7 @@ sub change_patchmetadata_table
     my $descriptionvalue = "";
 
     my $base = $allvariables->{'PRODUCTNAME'} . " " . $allvariables->{'PRODUCTVERSION'};
-    if ( $installer::globals::languagepack ) { $base = $targetproductnamevalue; }
+    if ( $installer::globals::languagepack || $installer::globals::helppack ) { $base = $targetproductnamevalue; }
 
     my $windowspatchlevel = 0;
     if ( $allvariables->{'WINDOWSPATCHLEVEL'} ) { $windowspatchlevel = $allvariables->{'WINDOWSPATCHLEVEL'}; }
@@ -1176,6 +1175,7 @@ sub correct_patch
 
     my $localproduct = $installer::globals::product;
     if ( $installer::globals::languagepack ) { $localproduct = $localproduct . "LanguagePack"; }
+    elsif ( $installer::globals::helppack ) { $localproduct = $localproduct . "HelpPack"; }
 
     if ( $product eq $localproduct ) { $product_is_good = 1; }
 
@@ -1273,10 +1273,7 @@ sub convert_unicode_to_ascii
     my $savfilename = $filename . "_before.unicode";
     installer::systemactions::copy_one_file($filename, $savfilename);
 
-#   open( IN, "<:utf16", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_unicode_to_ascii");
-#   open( IN, "<:para:crlf:uni", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_unicode_to_ascii");
     open( IN, "<:encoding(UTF16-LE)", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_unicode_to_ascii");
-#   open( IN, "<:encoding(UTF-8)", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_unicode_to_ascii");
     while ( $line = <IN> ) {
         push @localfile, $line;
     }
@@ -1408,6 +1405,7 @@ sub create_msp_patch
     my $pcpfilename = $allvariables->{'PCPFILENAME'};
 
     if ( $installer::globals::languagepack ) { $pcpfilename =~ s/.pcp\s*$/languagepack.pcp/; }
+    elsif ( $installer::globals::helppack ) { $pcpfilename =~ s/.pcp\s*$/helppack.pcp/; }
 
     # Searching the pcp file in the include pathes
     my $fullpcpfilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$pcpfilename, $includepatharrayref, 1);
@@ -1456,7 +1454,7 @@ sub create_msp_patch
     installer::systemactions::copy_complete_directory($oldinstallationsetpath, $mspdir);
 
     # Copying additional patches into the installation set, if required
-    if (( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ) && ( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ne "" ) && ( ! $installer::globals::languagepack ))
+    if (( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ) && ( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ne "" ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ))
     {
         my $filename = $allvariables->{'ADDITIONALREQUIREDPATCHES'};
 
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index a5d3745d94c3..5cfa674dd7c0 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -54,6 +54,7 @@ sub get_arpcomments_for_property_table
     }
 
     if ( $installer::globals::languagepack ) { $comment = $comment . " " . "Language Pack"; }
+    elsif ( $installer::globals::helppack ) { $comment = $comment . " " . "Help Pack"; }
 
     if ( $installer::globals::patch )
     {
@@ -142,11 +143,20 @@ sub get_english_language_string
     return $langstring;
 }
 
-sub get_productname_for_property_table
+sub get_productname($$)
 {
-    my ( $allvariables ) = @_;
+    my ( $language, $allvariables ) = @_;
 
     my $name = $allvariables->{'PRODUCTNAME'};
+
+    return $name;
+}
+
+sub get_productname_for_property_table($$)
+{
+    my ( $language, $allvariables ) = @_;
+
+    my $name = get_productname ($language, $allvariables);
     my $version = $allvariables->{'PRODUCTVERSION'};
     my $productname = $name . " " . $version;
 
@@ -166,10 +176,14 @@ sub get_productname_for_property_table
 
     if ( $installer::globals::languagepack )
     {
-        # my $langstring = get_language_string();   # Example (English, Deutsch)
-        my $langstring = get_english_language_string(); # New: (English, German)
+        my $langstring = get_english_language_string(); # Example: (English, German)
         $productname = $name . " " . $version . " Language Pack" . " " . $langstring;
     }
+    elsif ( $installer::globals::helppack )
+    {
+        my $langstring = get_english_language_string(); # New: (English, German)
+        $productname = $name . " " . $version . " Help Pack" . " " . $langstring;
+    }
 
     if ( $installer::globals::patch )
     {
@@ -186,13 +200,12 @@ sub get_productname_for_property_table
     return $productname;
 }
 
-sub get_quickstarterlinkname_for_property_table
+sub get_quickstarterlinkname_for_property_table($$)
 {
-    my ( $allvariables ) = @_;
+    my ( $language, $allvariables ) = @_;
 
     # no usage of POSTVERSIONEXTENSION for Quickstarter link name!
-
-    my $name = $allvariables->{'PRODUCTNAME'};
+    my $name = get_productname ($language, $allvariables);
     my $version = $allvariables->{'PRODUCTVERSION'};
     my $quickstartername = $name . " " . $version;
 
@@ -358,6 +371,11 @@ sub set_important_properties
         my $onepropertyline = "ISLANGUAGEPACK" . "\t" . "1" . "\n";
         push(@{$propertyfile}, $onepropertyline);
     }
+    elsif ( $installer::globals::helppack )
+    {
+        my $onepropertyline = "ISHELPPACK" . "\t" . "1" . "\n";
+        push(@{$propertyfile}, $onepropertyline);
+    }
 
     my $languagesline = "PRODUCTALLLANGUAGES" . "\t" . $$languagestringref . "\n";
     push(@{$propertyfile}, $languagesline);
@@ -485,9 +503,9 @@ sub update_property_table
     my $ischeckforproductupdates = get_ischeckforproductupdates_for_property_table();
     my $manufacturer = get_manufacturer_for_property_table();
     my $productlanguage = get_productlanguage_for_property_table($language);
-    my $productname = get_productname_for_property_table($allvariables);
+    my $productname = get_productname_for_property_table($language, $allvariables);
     my $productversion = get_productversion_for_property_table();
-    my $quickstarterlinkname = get_quickstarterlinkname_for_property_table($allvariables);
+    my $quickstarterlinkname = get_quickstarterlinkname_for_property_table($language, $allvariables);
 
     # Updating the values
 
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index 18981d661372..ad036865ebc3 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -94,6 +94,7 @@ sub get_registry_component_name
     $componentname = $componentname . $addon;
 
     if (( $styles =~ /\bLANGUAGEPACK\b/ ) && ( $installer::globals::languagepack )) { $componentname = $componentname . "_lang"; }
+    elsif (( $styles =~ /\bHELPPACK\b/ ) && ( $installer::globals::helppack )) { $componentname = $componentname . "_help"; }
     if ( $styles =~ /\bALWAYS_REQUIRED\b/ ) { $componentname = $componentname . "_forced"; }
 
     # Attention: Maximum length for the componentname is 72
diff --git a/solenv/bin/modules/installer/windows/shortcut.pm b/solenv/bin/modules/installer/windows/shortcut.pm
index 76039baf10c9..cb62a0a7fdd9 100644
--- a/solenv/bin/modules/installer/windows/shortcut.pm
+++ b/solenv/bin/modules/installer/windows/shortcut.pm
@@ -357,10 +357,9 @@ sub get_folderitem_directory
 {
     my ($shortcut) = @_;
 
-    # my $directory = "$installer::globals::programmenufolder";  # default
     my $directory = "$installer::globals::officemenufolder";     # default
 
-    # The value $installer::globals::programmenufolder is not correct for the
+    # The default is not correct for the
     # PREDEFINED folders, like PREDEFINED_AUTOSTART
 
     if ( $shortcut->{'FolderID'} eq "PREDEFINED_AUTOSTART" )
@@ -694,4 +693,4 @@ sub create_shortcut_table
 }
 
 
-1;
\ No newline at end of file
+1;
diff --git a/solenv/bin/modules/installer/windows/sign.pm b/solenv/bin/modules/installer/windows/sign.pm
index 70954bd9f5b1..8fb7b3fe13a0 100644
--- a/solenv/bin/modules/installer/windows/sign.pm
+++ b/solenv/bin/modules/installer/windows/sign.pm
@@ -243,9 +243,6 @@ sub execute_open_system_call
 
     if( $^O =~ /cygwin/i )
     {
-        # $comspec =~ s/\\/\\\\/g;
-        # $comspec = qx{cygpath -u "$comspec"};
-        # $comspec =~ s/\s*$//g;
         $comspec = "";
     }
 
@@ -548,7 +545,6 @@ sub cabinet_cosistency_check
         my $sourcecabfile = $finalinstalldir . $installer::globals::separator . $onefile;
         my $currentpath = cwd();
         my $destcabfile = $currentpath . $installer::globals::separator . $onefile;
-        # my $destcabfile = $onefile;
 
         if ( $^O =~ /cygwin/i )
         {
@@ -614,7 +610,6 @@ sub cabinet_cosistency_check
                 # Also making a binary diff?
 
                 my $difffile = "diff.exe";  # has to be in the path
-                # $systemcall = "$difffile $sourcecabfile $destcabfile";  # Test for differences
                 $systemcall = "$difffile $origfile $newfile";
                 $infoline = $systemcall . "\n";
                 $returnvalue = make_systemcall($systemcall, $systemcall);
@@ -634,9 +629,9 @@ sub cabinet_cosistency_check
                 }
                 else
                 {
-                    $infoline = "ERROR: Problem occured calling diff.exe (File: $lastfile)\n";
+                    $infoline = "ERROR: Problem occurred calling diff.exe (File: $lastfile)\n";
                     push( @installer::globals::logfileinfo, $infoline);
-                    installer::exiter::exit_program("ERROR: Problem occured calling diff.exe (File: $lastfile) !", "cabinet_cosistency_check");
+                    installer::exiter::exit_program("ERROR: Problem occurred calling diff.exe (File: $lastfile) !", "cabinet_cosistency_check");
                 }
             }
         }
@@ -1050,8 +1045,6 @@ sub already_certified
 
     if ( $returnvalue ) { $success = 0; }
 
-    # my $success = make_systemcall($systemcall, $systemcall);
-
      if ( $success )
      {
          $is_certified = 1;
diff --git a/solenv/bin/modules/installer/windows/update.pm b/solenv/bin/modules/installer/windows/update.pm
index efe6949b6fc4..50d31f022024 100644
--- a/solenv/bin/modules/installer/windows/update.pm
+++ b/solenv/bin/modules/installer/windows/update.pm
@@ -215,6 +215,7 @@ sub correct_database
 
     my $localproduct = $installer::globals::product;
     if ( $installer::globals::languagepack ) { $localproduct = $localproduct . "LanguagePack"; }
+    elsif ( $installer::globals::helppack ) { $localproduct = $localproduct . "HelpPack"; }
 
     if ( $product eq $localproduct ) { $product_is_good = 1; }
 
@@ -334,7 +335,6 @@ sub readdatabase
     }
     else
     {
-        # installer::logger::print_message( "... no update process, no database found ...\n" );
         $infoline = "\nNo database found in $completelistname. This is no update process!\n\n";
     }
     push( @installer::globals::logfileinfo, $infoline);
@@ -597,4 +597,4 @@ sub create_database_hashes
 }
 
 
-1;
\ No newline at end of file
+1;
diff --git a/solenv/bin/modules/installer/windows/upgrade.pm b/solenv/bin/modules/installer/windows/upgrade.pm
index 49479b26bf49..547bc4ce7bf1 100644
--- a/solenv/bin/modules/installer/windows/upgrade.pm
+++ b/solenv/bin/modules/installer/windows/upgrade.pm
@@ -47,7 +47,7 @@ sub create_upgrade_table
     # fix for problematic OOo 1.9 versions
     my $include_ooo_fix = 0;
     my $ooomaxnew = "";
-    if (($installer::globals::product =~ /^\s*OpenOffice/i ) && ( ! ( $installer::globals::product =~ /SDK/i )) && ( ! $installer::globals::languagepack ))
+    if (($installer::globals::product =~ /^\s*OpenOffice/i ) && ( ! ( $installer::globals::product =~ /SDK/i )) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ))
     {
         $include_ooo_fix = 1;
         $ooomaxnew = "34.0.0";
@@ -61,7 +61,8 @@ sub create_upgrade_table
     push(@upgradetable, $newline);
 
     # Setting all products, that must be removed.
-    $newline = $installer::globals::upgradecode . "\t" . $installer::globals::msimajorproductversion . "\t" . $installer::globals::msiproductversion . "\t" . "\t" . "257" . "\t" . "\t" . "OLDPRODUCTSSAMEMAJOR" . "\n";
+    # $newline = $installer::globals::upgradecode . "\t" . $installer::globals::msimajorproductversion . "\t" . $installer::globals::msiproductversion . "\t" . "\t" . "257" . "\t" . "\t" . "OLDPRODUCTSSAMEMAJOR" . "\n";
+    $newline = $installer::globals::upgradecode . "\t" . $installer::globals::msimajorproductversion . "\t" . $installer::globals::msiproductversion . "\t" . "\t" . "769" . "\t" . "\t" . "OLDPRODUCTSSAMEMAJOR" . "\n";
     push(@upgradetable, $newline);
 
     if ( ! $installer::globals::patch )
@@ -70,8 +71,8 @@ sub create_upgrade_table
         $newline = $installer::globals::upgradecode . "\t" . $installer::globals::msiproductversion . "\t" . $ooomaxnew . "\t" . "\t" . "2" . "\t" . "\t" . "NEWPRODUCTS" . "\n";
         push(@upgradetable, $newline);
 
-        $newline = $installer::globals::upgradecode . "\t" . $installer::globals::msiproductversion . "\t" . $ooomaxnew . "\t" . "\t" . "258" . "\t" . "\t" . "SAMEPRODUCTS" . "\n";
-        push(@upgradetable, $newline);
+        # $newline = $installer::globals::upgradecode . "\t" . $installer::globals::msiproductversion . "\t" . $ooomaxnew . "\t" . "\t" . "258" . "\t" . "\t" . "SAMEPRODUCTS" . "\n";
+        # push(@upgradetable, $newline);
 
         if ( $include_ooo_fix )
         {
@@ -93,7 +94,7 @@ sub create_upgrade_table
 
         # also searching for the beta
 
-        if (( $allvariableshashref->{'BETAUPGRADECODE'} ) && ( ! $installer::globals::languagepack ))
+        if (( $allvariableshashref->{'BETAUPGRADECODE'} ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ))
         {
             $newline = $allvariableshashref->{'BETAUPGRADECODE'} . "\t" . "1.0" . "\t" . "\t" . "\t" . "1" . "\t" . "\t" . "BETAPRODUCTS" . "\n";
             push(@upgradetable, $newline);
@@ -101,7 +102,7 @@ sub create_upgrade_table
 
         # also searching for the stub
 
-        if (( $allvariableshashref->{'STUBUPGRADECODE'} ) && ( ! $installer::globals::languagepack ))
+        if (( $allvariableshashref->{'STUBUPGRADECODE'} ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ))
         {
             $newline = $allvariableshashref->{'STUBUPGRADECODE'} . "\t" . "1.0" . "\t" . "\t" . "\t" . "1" . "\t" . "\t" . "STUBPRODUCTS" . "\n";
             push(@upgradetable, $newline);
@@ -109,7 +110,7 @@ sub create_upgrade_table
 
         # searching for all older patches and languagepacks (defined in a extra file)
 
-        if (( $allvariableshashref->{'REMOVE_UPGRADE_CODE_FILE'} ) && ( ! $installer::globals::languagepack ))
+        if (( $allvariableshashref->{'REMOVE_UPGRADE_CODE_FILE'} ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ))
         {
             my $filename = $allvariableshashref->{'REMOVE_UPGRADE_CODE_FILE'};
             my $langpackcodefilename = $installer::globals::idttemplatepath  . $installer::globals::separator . $filename;
@@ -124,7 +125,7 @@ sub create_upgrade_table
 
     # No upgrade for Beta versions!
 
-    if (( $allvariableshashref->{'PRODUCTEXTENSION'} eq "Beta" ) && ( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ))
+    if (( $allvariableshashref->{'PRODUCTEXTENSION'} eq "Beta" ) && ( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ))
     {
         @upgradetable = ();
         installer::windows::idtglobal::write_idt_header(\@upgradetable, "upgrade");
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index 564a8cb71da7..d3b96d155e59 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -31,6 +31,7 @@ use Cwd;
 use File::Copy;
 use File::stat;
 use File::Temp qw(tmpnam);
+use File::Path;
 use installer::control;
 use installer::converter;
 use installer::existence;
@@ -38,7 +39,6 @@ use installer::exiter;
 use installer::files;
 use installer::globals;
 use installer::logger;
-use installer::mail;
 use installer::pathanalyzer;
 use installer::scpzipfiles;
 use installer::scriptitems;
@@ -104,13 +104,6 @@ sub copy_install_sets_to_ship
     installer::logger::print_message( "... copy installation set from " . $destdir . " to " . $localshipinstalldir . "\n" );
     installer::systemactions::copy_complete_directory($destdir, $localshipinstalldir);
 
-    if (( ! $installer::globals::iswindowsbuild ) && ( $installer::globals::addjavainstaller ))
-    {
-        # Setting Unix rights for Java starter ("setup")
-        my $localcall = "chmod 775 $localshipinstalldir/setup \>\/dev\/null 2\>\&1";
-        system($localcall);
-    }
-
     # unpacking the tar.gz file for Solaris
     if ( $installer::globals::issolarisbuild ) { unpack_all_targzfiles_in_directory($localshipinstalldir); }
 
@@ -184,17 +177,6 @@ sub make_checksum_file
     my $checksumfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$installer::globals::checksumfile, $includepatharrayref, 1);
     if ( $$checksumfileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $installer::globals::checksumfile !", "make_checksum_file"); }
 
-#   # very slow on Windows
-#   for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-#   {
-#       my $onefile = ${$filesref}[$i];
-#       my $systemcall = "$$checksumfileref $onefile->{'sourcepath'} |";
-#       open (CHECK, "$systemcall");
-#       my $localchecksum = <CHECK>;
-#       close (CHECK);
-#       push(@checksum, $localchecksum);
-#   }
-
     my $systemcall = "$$checksumfileref";
 
     for ( my $i = 0; $i <= $#{$filesref}; $i++ )
@@ -429,12 +411,11 @@ sub analyze_and_save_logfile
 
     my $contains_error = installer::control::check_logfile(\@installer::globals::logfileinfo);
 
-    # Dependent from the success, the installation directory can be renamed and mails can be send.
+    # Dependent from the success, the installation directory can be renamed.
 
     if ( $contains_error )
     {
         my $errordir = installer::systemactions::rename_string_in_directory($installdir, "_inprogress", "_witherror");
-        if ( $installer::globals::updatepack ) { installer::mail::send_fail_mail($allsettingsarrayref, $languagestringref, $errordir); }
         # Error output to STDERR
         for ( my $j = 0; $j <= $#installer::globals::errorlogfileinfo; $j++ )
         {
@@ -460,7 +441,6 @@ sub analyze_and_save_logfile
                 if ( $installdir =~ /_packed/ ) { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_inprogress", ""); }
                 else { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_inprogress", "_packed"); }
             }
-            installer::mail::send_success_mail($allsettingsarrayref, $languagestringref, $destdir);
         }
         else
         {
@@ -486,7 +466,7 @@ sub analyze_and_save_logfile
 
     if ( $installer::globals::creating_windows_installer_patch ) { $installer::globals::creating_windows_installer_patch = 0; }
 
-    # Exiting the packaging process, if an error occured.
+    # Exiting the packaging process, if an error occurred.
     # This is important, to get an error code "-1", if an error was found in the log file,
     # that did not break the packaging process
 
@@ -563,45 +543,8 @@ sub clean_jds_temp_dirs
 }
 
 ###########################################################
-# Copying a reference array
-###########################################################
-
-sub copy_array_from_references
-{
-    my ( $arrayref ) = @_;
-
-    my @newarray = ();
-
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {
-        push(@newarray, ${$arrayref}[$i]);
-    }
-
-    return \@newarray;
-}
-
-###########################################################
-# Copying a reference hash
-###########################################################
-
-sub copy_hash_from_references
-{
-    my ($hashref) = @_;
-
-    my %newhash = ();
-    my $key;
-
-    foreach $key (keys %{$hashref})
-    {
-        $newhash{$key} = $hashref->{$key};
-    }
-
-    return \%newhash;
-}
-
-###########################################################
 # Setting one language in the language independent
-# array of include pathes with $(LANG)
+# array of include paths with $(LANG)
 ###########################################################
 
 sub get_language_specific_include_pathes
@@ -773,9 +716,16 @@ sub install_simple ($$$$$$)
 
         if ((!($dir =~ /\bPREDEFINED_/ )) || ( $dir =~ /\bPREDEFINED_PROGDIR\b/ ))
         {
-            # printf "mkdir $destdir$onedir->{'HostName'}\n";
-            mkdir $destdir . $onedir->{'HostName'};
-            push @lines, "%dir " . $onedir->{'HostName'} . "\n";
+            my $hostname = $onedir->{'HostName'};
+
+            # ignore '.' subdirectories
+            next if ( $hostname =~ m/\.$/ );
+            # remove './' from the path
+            $hostname =~ s/\.\///g;
+
+            # printf "mkdir $destdir$hostname\n";
+            mkdir $destdir . $hostname;
+            push @lines, "%dir " . $hostname . "\n";
         }
     }
 
@@ -792,13 +742,23 @@ sub install_simple ($$$$$$)
         $destination =~ s/\$\$/\$/;
         $sourcepath =~ s/\$\$/\$/;
 
+        # remove './' from the path
+        $sourcepath =~ s/\.\///g;
+        $destination =~ s/\.\///g;
+
         push @lines, "$destination\n";
-        # printf "cp $sourcepath $destdir$destination\n";
+        if(-d  "$destdir$destination"){
+            rmtree("$destdir$destination");
+        }
+        if(-e "$destdir$destination") {
+            unlink "$destdir$destination";
+        }
+
         copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!";
         my $sourcestat = stat($sourcepath);
         utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination");
         chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!";
-         push @lines, "$destination\n";
+        push @lines, "$destination\n";
     }
 
     for ( my $i = 0; $i <= $#{$linksarray}; $i++ )
@@ -807,7 +767,9 @@ sub install_simple ($$$$$$)
         my $destination = $onelink->{'destination'};
         my $destinationfile = $onelink->{'destinationfile'};
 
-        # print "link $destinationfile -> $destdir$destination\n";
+        if(-e "$destdir$destination") {
+            unlink "$destdir$destination";
+        }
         symlink ("$destinationfile", "$destdir$destination") || die "Can't create symlink: $!";
         push @lines, "$destination\n";
     }
@@ -818,7 +780,6 @@ sub install_simple ($$$$$$)
         my $target = $onelink->{'Target'};
         my $destination = $onelink->{'destination'};
 
-        # print "Unix link $target -> $destdir$destination\n";
         `ln -sf '$target' '$destdir$destination'`;
         push @lines, "$destination\n";
     }
@@ -827,7 +788,6 @@ sub install_simple ($$$$$$)
     {
         my $filelist;
         my $fname = $installer::globals::destdir . "/$packagename";
-        if ($installer::globals::languagepack) { $fname .= ".$languagestring"; }
         open ($filelist, ">$fname") || die "Can't open $fname: $!";
         print $filelist @lines;
         close ($filelist);
@@ -1223,7 +1183,7 @@ sub select_patch_items_without_name
 }
 
 ###########################################################
-# Selecting patch items
+# Selecting langpack items
 ###########################################################
 
 sub select_langpack_items
@@ -1248,6 +1208,31 @@ sub select_langpack_items
 }
 
 ###########################################################
+# Selecting helppack items
+###########################################################
+
+sub select_helppack_items
+{
+    my ( $itemsref, $itemname ) = @_;
+
+    installer::logger::include_header_into_logfile("Selecting RegistryItems for Help Packs");
+
+    my @itemsarray = ();
+
+    for ( my $i = 0; $i <= $#{$itemsref}; $i++ )
+    {
+        my $oneitem = ${$itemsref}[$i];
+
+        # Items with style "HELPPACK" have to be included into the patch
+        my $styles = "";
+        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
+        if (( $styles =~ /\bHELPPACK\b/ ) || ( $styles =~ /\bFORCEHELPPACK\b/ )) { push(@itemsarray, $oneitem); }
+    }
+
+    return \@itemsarray;
+}
+
+###########################################################
 # Searching if LICENSE and README, which are not removed
 # in select_patch_items are really needed for the patch.
 # If not, they are removed now.
@@ -1491,7 +1476,6 @@ sub reorg_patchfile
 
         for ( my $j = 0; $j <= $#{$patchfiles}; $j++ )
         {
-            # "\tXXXXX\t" . $olddestination . "\n";
             if ( ${$patchfiles}[$j] =~ /^\s*(.*?)\s*\tXXXXX\t\Q$directory\E\s*$/ )
             {
                 $line = $1 . "\n";
@@ -1625,7 +1609,6 @@ sub prepare_windows_patchfiles
     my $patchfilename2 = "patchmsi.dll";
 
     if ( ! $allvariableshashref->{'WINDOWSPATCHLEVEL'} ) { installer::exiter::exit_program("ERROR: No Windows patch level defined in list file (WINDOWSPATCHLEVEL) !", "prepare_windows_patchfiles"); }
-    # my $windowspatchlevel = $allvariableshashref->{'WINDOWSPATCHLEVEL'};
     my $windowspatchlevel = $installer::globals::buildid;
 
     # the environment variable CWS_WORK_STAMP is set only in CWS
@@ -1701,9 +1684,6 @@ sub prepare_windows_patchfiles
         $infoline = "Size of patch file list: $filesize\n\n";
         push( @installer::globals::logfileinfo, $infoline);
         installer::logger::print_message( "... size of patch list file: $filesize Byte ... \n" );
-
-        # Win 98: Maximum size of ini file is 65 kB
-        # if ( $filesize > 64000 ) { installer::exiter::exit_program("ERROR: Maximum size of patch file list is 65 kB (Win98), now reached: $filesize Byte !", "prepare_windows_patchfiles"); }
     }
 
 }
@@ -1721,7 +1701,8 @@ sub replace_variables_in_string
     {
         my $key;
 
-        foreach $key (keys %{$variableshashref})
+        # we want to substitute FOO_BR before FOO to avoid floating _BR suffixes
+        foreach $key (sort { length ($b) <=> length ($a) } keys %{$variableshashref})
         {
             my $value = $variableshashref->{$key};
             $key = "\%" . $key;
@@ -1767,14 +1748,9 @@ sub get_all_files_from_filelist
 
     my @allpackages = ();
 
-    for ( my $i = 0; $i <= $#{$listfile}; $i++ )
-    {
-        my $line = ${$listfile}[$i];
-        if ( $line =~ /^\s*\#/ ) { next; } # this is a comment line
-        if ( $line =~ /^\s*$/ ) { next; } # empty line
-        $line =~ s/^\s*//;
-        $line =~ s/\s*$//;
-        push(@allpackages, $line);
+    for (@{$listfile}) {
+        next unless /^\s*([^#].*?)\s*$/;
+        push @allpackages, $1;
     }
 
     return \@allpackages;
@@ -1860,7 +1836,7 @@ sub get_all_packages_in_installdir
     my @allpackages = ();
     my $allpackages = \@allpackages;
 
-    if ( $installer::globals::islinuxrpmbuild )
+    if ( $installer::globals::isrpmbuild )
     {
         $allpackages = installer::systemactions::find_file_with_file_extension("rpm", $directory);
     }
@@ -1930,7 +1906,7 @@ sub copy_all_packages
             if ( ! is_matching($packagename, $allexcludepackages ) )
             {
 
-                if ( $installer::globals::islinuxrpmbuild )
+                if ( $installer::globals::isrpmbuild )
                 {
                     my $sourcepackage = $sourcedir . $installer::globals::separator . $packagename;
                     my $destfile = $destdir . $installer::globals::separator . $packagename;
@@ -1942,8 +1918,6 @@ sub copy_all_packages
                 {
                     my $destinationdir = $destdir . $installer::globals::separator . $packagename;
                     if ( ! -d $onepackage ) { installer::exiter::exit_program("ERROR: Could not find Solaris package $onepackage!", "copy_all_packages"); }
-                    # installer::systemactions::hardlink_complete_directory($onepackage, $destinationdir);
-                    # installer::systemactions::copy_complete_directory($onepackage, $destinationdir);
 
                     my $systemcall = "cp -p -R $onepackage $destinationdir";
                      make_systemcall($systemcall);
@@ -2108,8 +2082,6 @@ sub check_jds_language
 
     my $infoline = "";
 
-    # languagesarrayref and $allvariableshashref->{'JDSLANG'}
-
     if ( ! $allvariableshashref->{'JDSLANG'} ) { installer::exiter::exit_program("ERROR: For building JDS installation sets \"JDSLANG\" must be defined!", "check_jds_language"); }
     my $languagestring = $allvariableshashref->{'JDSLANG'};
 
@@ -2207,8 +2179,7 @@ sub put_scpactions_into_installset
 
         if ( $onescpaction->{'UnixRights'} )
         {
-            my $localcall = "chmod $onescpaction->{'UnixRights'} $destfile \>\/dev\/null 2\>\&1";
-            system($localcall);
+            chmod oct($onescpaction->{'UnixRights'}), $destfile;
         }
 
     }
@@ -2273,7 +2244,6 @@ sub get_platform_name
     }
     else
     {
-        # $platformname = $installer::globals::packageformat;
         $platformname = $installer::globals::compiler;
     }
 
@@ -2295,7 +2265,7 @@ sub add_variables_from_inc_to_hashref
     my $includefilelist = "";
     if ( $allvariables->{'ADD_INCLUDE_FILES'} ) { $includefilelist = $allvariables->{'ADD_INCLUDE_FILES'}; }
 
-    my $includefiles = installer::converter::convert_stringlist_into_array_without_linebreak_and_quotes(\$includefilelist, ",");
+    my $includefiles = installer::converter::convert_stringlist_into_array_without_newline(\$includefilelist, ",");
 
     for ( my $i = 0; $i <= $#{$includefiles}; $i++ )
     {
@@ -2341,7 +2311,7 @@ sub add_variables_from_inc_to_hashref
 }
 
 ##############################################
-# Collecting all files from include pathes
+# Collecting all files from include paths
 ##############################################
 
 sub collect_all_files_from_includepathes
@@ -2349,7 +2319,7 @@ sub collect_all_files_from_includepathes
     my ($patharrayref) = @_;
 
     installer::logger::globallog("Reading all directories: Start");
-    installer::logger::print_message( "... reading include pathes ...\n" );
+    installer::logger::print_message( "... reading include paths ...\n" );
     # empty the global
 
     @installer::globals::allincludepathes =();
@@ -2369,7 +2339,6 @@ sub collect_all_files_from_includepathes
 
         my @sourcefiles = ();
         my $pathstring = "";
-        # installer::systemactions::read_complete_directory($includepath, $pathstring, \@sourcefiles);
         installer::systemactions::read_full_directory($includepath, $pathstring, \@sourcefiles);
 
         if ( ! ( $#sourcefiles > -1 ))
@@ -2424,9 +2393,6 @@ sub find_file_by_id
         }
     }
 
-    # It does not need to exist. For example products that do not contain the libraries.
-    # if (! $foundfile ) { installer::exiter::exit_program("ERROR: No unique file name found for $filename !", "get_selfreg_file"); }
-
     if (! $foundfile ) { $onefile  = ""; }
 
     return $onefile;
@@ -2974,7 +2940,6 @@ sub resolving_hidden_flag
 
             if ( $copysuccess )
             {
-                # $onefile->{'Name'} = $newfilename;
                 $onefile->{'sourcepath'} = $destfile;
                 $destination = $onefile->{'destination'};
                 installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination);
@@ -3132,8 +3097,8 @@ sub put_license_into_setup
 
     # find and read english license file
     my $licenselanguage = "en-US";                  # always english !
-    # my $licensefilename = "LICENSE_" . $licenselanguage;
-    my $licensefilename = "license_" . $licenselanguage . ".txt";
+    # my $licensefilename = "LICENSE"; # _" . $licenselanguage;
+    my $licensefilename = "license"; # . $licenselanguage . ".txt";
     my $licenseincludepatharrayref = get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
 
     my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0);
@@ -3184,7 +3149,6 @@ sub tar_package
     if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . $getuidlibrary; }
 
     my $systemcall = "cd $installdir; $ldpreloadstring tar -cf - $packagename > $tarfilename";
-    # my $systemcall = "cd $installdir; $ldpreloadstring tar -cf - * > $tarfilename";
 
     my $returnvalue = system($systemcall);
 
@@ -3202,8 +3166,7 @@ sub tar_package
         push( @installer::globals::logfileinfo, $infoline);
     }
 
-    my $localcall = "chmod 775 $tarfilename \>\/dev\/null 2\>\&1";
-    $returnvalue = system($localcall);
+    chmod 0775, $tarfilename;
 
     my $fulltarfile = $installdir . $installer::globals::separator . $tarfilename;
     my $filesize = ( -s $fulltarfile );
@@ -3240,8 +3203,7 @@ sub untar_package
         push( @installer::globals::logfileinfo, $infoline);
     }
 
-    my $localcall = "chmod 775 $tarfilename \>\/dev\/null 2\>\&1";
-    $returnvalue = system($localcall);
+    chmod 0775, $tarfilename;
 }
 
 #########################################################
@@ -3252,32 +3214,12 @@ sub shuffle_array
 {
     my ( $arrayref ) = @_;
 
-    # my $counter = 0;
-    # my $infoline = "Old package order: \n";
-    # push( @installer::globals::logfileinfo, $infoline);
-    # foreach my $onepackage ( @{$arrayref} )
-    # {
-    #   $counter++;
-    #   $infoline = "$counter: $onepackage->{'module'}\n";
-    #   push( @installer::globals::logfileinfo, $infoline);
-    # }
-
     my $i = @$arrayref;
     while (--$i)
     {
         my $j = int rand ($i+1);
         @$arrayref[$i,$j] = @$arrayref[$j,$i];
     }
-
-    # $counter = 0;
-    # $infoline = "New package order: \n";
-    # push( @installer::globals::logfileinfo, $infoline);
-    # foreach my $onepackage ( @{$arrayref} )
-    # {
-    #   $counter++;
-    #   $infoline = "$counter: $onepackage->{'module'}\n";
-    #   push( @installer::globals::logfileinfo, $infoline);
-    # }
 }
 
 ################################################
@@ -3427,7 +3369,6 @@ sub collectpackagemaps
     # Create a tar gz file with all package maps
     my $tarfilename = $subdirname . ".tar";
     my $targzname = $tarfilename . ".gz";
-    # my $systemcall = "cd $pkgmapdir; tar -cf - $subdirname > $tarfilename";
     $systemcall = "cd $pkgmapdir; tar -cf - $subdirname | gzip > $targzname";
     make_systemcall($systemcall);
     installer::systemactions::remove_complete_directory($pkgmapsubdir, 1);
diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm
index c6938292b313..3b72889d2bc1 100644
--- a/solenv/bin/modules/installer/xpdinstaller.pm
+++ b/solenv/bin/modules/installer/xpdinstaller.pm
@@ -109,8 +109,6 @@ sub get_module
             $found = 1;
             last;
         }
-
-        # if ( ! $found ) { installer::exiter::exit_program("ERROR: Could not find module belonging to gid $modulegid!", "get_module (xpdinstaller)"); }
     }
 
     return $searchmodule;
@@ -445,8 +443,8 @@ sub get_forceintoupdate_value
 }
 
 ###################################################
-# Substituting all occurences of "<" by "&lt;"
-# and all occurences of ">" by "&gt;"
+# Substituting all occurrences of "<" by "&lt;"
+# and all occurrences of ">" by "&gt;"
 ###################################################
 
 sub replace_brackets_in_string
@@ -460,7 +458,7 @@ sub replace_brackets_in_string
 }
 
 ###################################################
-# Substituting all occurences of "\uUXYZ" by
+# Substituting all occurrences of "\uUXYZ" by
 # "&#xUXYZ;", because the use xml saxparser does
 # not know anything about this encoding. Therfore
 # the xml file can keep standard encoding "UTF-8"
@@ -579,9 +577,8 @@ sub get_size_value
     my $isrpmfile = 0;
     if ( $packagename =~ /\.rpm\s*$/ ) { $isrpmfile = 1; }
 
-    if (( $installer::globals::islinuxrpmbuild ) && ( $isrpmfile ))
+    if (( $installer::globals::isrpmbuild ) && ( $isrpmfile ))
     {
-        # if ( ! $installer::globals::rpmquerycommand ) { installer::exiter::exit_program("ERROR: rpm not found for querying packages!", "get_size_value"); }
         if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; }
 
         my $systemcall = "$installer::globals::rpmquerycommand -qp --queryformat \"\[\%\{FILESIZES\}\\n\]\" $packagename 2\>\&1 |";
@@ -658,7 +655,7 @@ sub get_md5_value
         return $value;
     }
 
-    if ( $installer::globals::islinuxrpmbuild )
+    if ( $installer::globals::isrpmbuild )
     {
         my $md5file = "/usr/bin/md5sum";
 
@@ -712,7 +709,7 @@ sub get_fullpkgname_value
     my $isrpmfile = 0;
     if ( $packagename =~ /\.rpm\s*$/ ) { $isrpmfile = 1; }
 
-    if (( $installer::globals::islinuxrpmbuild ) && ( $isrpmfile ))
+    if (( $installer::globals::isrpmbuild ) && ( $isrpmfile ))
     {
         if ( $xpdinfo->{'FullPackageName'} )
         {
@@ -720,7 +717,6 @@ sub get_fullpkgname_value
             return $value;
         }
 
-        # if ( ! $installer::globals::rpmquerycommand ) { installer::exiter::exit_program("ERROR: rpm not found for querying packages!", "get_fullpkgname_value"); }
         if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; }
         my $systemcall = "$installer::globals::rpmquerycommand -qp $packagename |";
         my $ld_library_backup = $ENV{LD_LIBRARY_PATH};
@@ -888,7 +884,7 @@ sub make_systemcall
     {
         $infoline = "ERROR: $systemcall\n";
         push( @installer::globals::logfileinfo, $infoline);
-        $error_occured = 1;
+        $error_occurred = 1;
     }
     else
     {
@@ -931,13 +927,13 @@ sub make_systemcall_allowing_error
         {
             $infoline = "WARNING: Failed system call:  $systemcall\n";
             push( @installer::globals::logfileinfo, $infoline);
-            $error_occured = 1;
+            $error_occurred = 1;
         }
         else
         {
             $infoline = "ERROR: $systemcall\n";
             push( @installer::globals::logfileinfo, $infoline);
-            $error_occured = 1;
+            $error_occurred = 1;
         }
     }
     else
@@ -1076,7 +1072,6 @@ sub set_productdir_tag
         if ( $allvariables->{"BRANDPACKAGEVERSION"} )
         {
             $productdir = $productdir . $allvariables->{"BRANDPACKAGEVERSION"};
-#           if ( $allvariables->{"LCPRODUCTEXTENSION"} ) { $productdir = $productdir . $allvariables->{"LCPRODUCTEXTENSION"}; }
         }
         else
         {
@@ -1487,7 +1482,6 @@ sub create_emptyparents_xpd_file
         push(@installer::globals::logfileinfo, $infoline);
     }
 
-    # push(@installer::globals::emptyxpdparents, $parentgid);
     push( @installer::globals::createdxpdfiles, $parentgid);
 
     return $grandpagid;
@@ -1558,7 +1552,6 @@ sub create_xpd_file
     my $xpddir = installer::systemactions::create_directories("xpdinstaller", $languagestringref);
     $xpddir =~ s/\/\s*$//;
     $installer::globals::xpddir = $xpddir;
-    # push(@installer::globals::removedirs, $xpddir);
 
     my $modulegid = $onepackage->{'module'};
 
@@ -1616,7 +1609,6 @@ sub create_xpd_file
         {
             my $create_missing_parent = is_empty_parent($parentgid, $allpackages);
 
-            # if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($parentgid, \@installer::globals::emptyxpdparents) ))
             if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($parentgid, \@installer::globals::createdxpdfiles) ))
             {
                 $grandpagid = create_emptyparents_xpd_file($parentgid, $modulesarrayref, $xpddir);
@@ -1627,7 +1619,6 @@ sub create_xpd_file
         {
             my $create_missing_parent = is_empty_parent($grandpagid, $allpackages);
 
-            # if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($parentgid, \@installer::globals::emptyxpdparents) ))
             if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($grandpagid, \@installer::globals::createdxpdfiles) ))
             {
                 create_emptyparents_xpd_file($grandpagid, $modulesarrayref, $xpddir);
@@ -1671,7 +1662,6 @@ sub create_xpd_file_for_childproject
 
     if ( $parentgid ne "root" )
     {
-        # my $create_missing_parent = is_empty_parent($parentgid, $allpackages);
         my $create_missing_parent = 1; # -> Always missing parent by child projects!
         # Parent is now created, if it was not created before. Attention: Parent module must not come later.
         if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($parentgid, \@installer::globals::createdxpdfiles) ))
@@ -1698,12 +1688,10 @@ sub create_xpd_file_for_systemintegration
     {
         my $newpackagename = ${$newcontent}[$i];
 
-        # installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$newpackagename);
-
         my $infoline = "Creating xpd file for package: $newpackagename\n";
         push( @installer::globals::logfileinfo, $infoline);
 
-        my $childmodule = installer::worker::copy_hash_from_references($module);
+        my $childmodule = {%{$module}};
         $childmodule->{'ParentID'} = $module->{'gid'};  # the module gid is the new parent
         $childmodule->{'InstallOrder'} = $installer::globals::defaultsystemintinstallorder;
         my $number = $i + 1;
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index 9a5460cacb3c..d52e97bf4e87 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -464,7 +464,7 @@ sub replace_all_variables_in_pathes
 
         my $key;
 
-        foreach $key (keys %{$variableshashref})
+        foreach $key (sort { length ($b) <=> length ($a) } keys %{$variableshashref})
         {
             my $value = $variableshashref->{$key};
 
@@ -489,18 +489,8 @@ sub replace_minor_in_pathes
     {
         my $line = ${$patharrayref}[$i];
 
-        if ( ! defined $ENV{CWS_WORK_STAMP} and defined $ENV{UPDMINOR} )
-#       if ( $installer::globals::minor )
-        {
-            $line =~ s/\{minor\}/$installer::globals::minor/g;
-            # no difference for minor and minornonpre (ToDo ?)
-            $line =~ s/\{minornonpre\}/$installer::globals::minor/g;
-        }
-        else    # building without a minor
-        {
-            $line =~ s/\.\{minor\}//g;
-            $line =~ s/\.\{minornonpre\}//g;
-        }
+        $line =~ s/\.\{minor\}//g;
+        $line =~ s/\.\{minornonpre\}//g;
 
         ${$patharrayref}[$i] = $line;
     }
@@ -643,7 +633,7 @@ sub set_manufacturer
 {
     my ($allvariables) = @_;
 
-    my $openofficeproductname = "OpenOffice.org";
+    my $openofficeproductname = "LibreOffice";
     my $sunname = "";
 
 
@@ -793,6 +783,7 @@ sub add_variables_to_allvariableshashref
 
     if ( $installer::globals::patch ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::patchaddon; }
     elsif ( $installer::globals::languagepack ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::languagepackaddon; }
+    elsif ( $installer::globals::helppack ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::helppackpackaddon; }
     else { $variableshashref->{'PRODUCTADDON'} = ""; }
 
     my $localbuild = $installer::globals::build;
diff --git a/solenv/bin/modules/osarch.pm b/solenv/bin/modules/osarch.pm
deleted file mode 100755
index 205e4c933193..000000000000
--- a/solenv/bin/modules/osarch.pm
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/usr/bin/perl -w
-
-# ***********************************************************************
-# Description:
-# Filename:    osarch.pm
-# Autor:       EG
-# Date:        28.10.96
-# $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/solenv/bin/modules/osarch.pm,v 1.3 2008-08-18 13:11:04 vg Exp $
-# Copyright:   STAR DIVISION
-# **********************************************************************/
-
-package osarch;
-
-$m_str = `uname -m`;
-$s_str = `uname -s`;
-chop( $m_str, $s_str );
-
-%osTable    = ("SunOS",     "solaris",
-               "HP-UX",     "hpux",
-               "AIX",       "aix",
-               "OS/390",    "s390",
-               "Linux",     "linux",
-               "FreeBSD",   "freebsd",
-               "NetBSD",    "netbsd",
-               "OSF1",      "decunix",
-               "SCO_SV",    "scoosr5",
-#              "SCO_SV",    "scouw21",
-               "Darwin",    "macosxp",
-               "Mac OS",    "macosxp",
-               "SINIX-N",   "sinix"
-               );
-
-%osDefTable = ("SunOS",     "-DSYSV -DSOLARIS",
-               "HP-UX",     "-DSYSV -DHPUX",
-               "AIX",       "-DSYSV -DAIX",
-               "Linux",     "-DLINUX",
-               "FreeBSD",   "-DFREEBSD",
-               "NetBSD",    "-DNETBSD",
-               "OSF1",      "-DSYSV -DDECUNIX",
-               "SCO_SV",    "-DSYSV -DSCO -DSCO_OSR5",
-#              "SCO_SV",    "-DSYSV -DSCO -DSCO_UW21",
-               "Darwin",    "-DBSD -DMACOSX",
-               "Mac OS",    "-DBSD -DMACOSX",
-               "SINIX-N",   "-DSYSV -DSINIX"
-               );
-
-%osDosTable = ("SunOS",     "sol",
-               "HP-UX", "hpx",
-               "AIX",   "aix",
-               "OS/390",    "mvs",
-               "Linux", "lng",
-               "FreeBSD",   "fbsd",
-               "NetBSD",    "bsd",
-               "SCO_SV",    "sco",
-               "Darwin",    "macx",
-               "Mac OS",    "macx",
-               "SINIX-N",   "sni"
-               );
-
-%archTable  = ("sun4c",         "sparc",
-               "sun4m",         "sparc",
-               "sun4u",         "sparc",
-               "9000/712",      "hp9000",
-               "9000/715",      "hp9000",
-               "9000/778",      "hp9000",
-               "000029484600",  "rs6000",       # salsa
-               "000328144600",  "rs6000",       # lambada
-               "00245D29E000",  "rs6000",       # segv
-               "00245C46E000",  "rs6000",       # bus
-               "002012974600",  "rs6000",       # tango
-               "0006404C4C00",  "rs6000",       # jive
-               "2003",          "g3",           # ezopen4
-               "i86pc",         "x86",          # blauwal
-               "i386",          "x86",          # SCO_SV, NetBSD, FreeBSD
-               "i486",          "x86",          # tiger
-               "i586",          "x86",          # blauwal
-               "i686",          "x86",
-               "prep",          "ppc",          # hooge
-               "ppc",           "ppc",          # ppc-linux
-               "alpha",         "alpha",
-               "RM400",         "rm400",        # garbo
-               "IP22",          "mips",         # voyager
-               "IP32",          "mips",         # giotto
-               "Power Macintosh",           "ppc",          # NetBSD/arm32
-               "arm32",         "arm32"         # NetBSD/arm32
-               );
-
-%archDefTable=("sun4c",         "-DSPARC -DSUN -DSUN4", # hawai
-               "sun4m",         "-DSPARC -DSUN -DSUN4", # broccoli
-               "sun4u",         "-DSPARC -DSUN -DSUN4", # broccoli
-               "9000/712",      "-DHP9000",     # tuborg
-               "9000/715",      "-DHP9000",     # koepi
-               "9000/778",      "-DHP9000",     # jever, flens
-               "000029484600",  "-DRS6000",     # salsa
-               "000328144600",  "-DRS6000",     # lambada
-               "00245D29E000",  "-DRS6000",     # segv
-               "00245C46E000",  "-DRS6000",     # segv
-               "002012974600",  "-DRS6000",     # tango
-               "0006404C4C00",  "-DRS6000",     # jive
-               "2003",          "-DG3",         # ezopen4
-               "i86pc",         "-DX86 -DINTEL",# gepard
-               "i386",          "-DX86",        # SCO_SV, NetBSD, FreeBSD
-               "i486",          "-DX86",        # tiger
-               "i586",          "-DX86",        # blauwal
-               "i686",          "-DX86",        #
-               "prep",          "-DPPC",        # hooge
-               "ppc",           "-DPPC",        # ppc-linux
-               "alpha",         "-DALPHA",      # mars
-               "RM400",         "-DMIPS -DRM400",   # ekberg, garbo
-               "IP22",          "-DMIPS",           # voyager
-               "IP32",          "-DMIPS",           # giotto
-               "Power Macintosh",       "-DPPC",        # NetBSD/arm32
-               "arm32",         "-DARM32"       # NetBSD/arm32
-               );
-
-%archDosTable=("sun4c",         "s",        # hawai
-               "sun4m",         "s",        # broccoli
-               "sun4u",         "s",        # broccoli
-               "9000/712",      "r",        # tuborg
-               "9000/715",      "r",        # koepi
-               "9000/778",      "r",        # jever, flens
-               "000029484600",  "p",        # salsa
-               "000328144600",  "p",        # lambada
-               "00245D29E000",  "p",        # segv
-               "00245C46E000",  "p",        # segv
-               "002012974600",  "p",        # tango
-               "0006404C4C00",  "p",        # jive
-               "2003",          "g",        # ezopen4
-               "i86pc",         "i",        # gepard
-               "i386",          "i",        # SCO_SV, NetBSD, FreeBSD
-               "i486",          "i",        # tiger
-               "i586",          "i",        # blauwal
-               "i686",          "i",
-               "prep",          "p",        # hooge
-               "ppc",           "p",        # ppc-linux
-               "alpha",         "a",        # mars
-               "RM400",         "m",        # ekberg, garbo
-               "IP22",          "m",        # voyager
-               "IP32",          "m",        # giotto
-               "Power Macintosh",           "p",            # NetBSD/arm32
-               "arm32",         "a"         # NetBSD/arm32
-               );
-
-$main::solarDef     = $osDefTable{ $s_str }.' '.$archDefTable{ $m_str };
-
-$main::solarOS      = $osTable{ $s_str };
-$main::solarMT      = $archTable{ $m_str };
-
-$main::solarArch    = $main::solarOS.$main::solarMT;
-$main::solarOldArch = $main::solarArch; # for compatibility
-
-$main::solarDOS     = 'unx'.$osDosTable{ $s_str }. $archDosTable{ $m_str };
-
-sub main::osarch
-{
-    local ( $flag ) = @_;
-
-    $perlFlag   = $flag eq 'perl';
-    $defFlag    = $flag eq 'def';
-    $oldFlag    = $flag eq 'old';
-    $dirFlag    = $flag eq 'dir';
-    $dosFlag    = $flag eq 'dos';
-
-    local( $result ) = ( '' );
-
-    if ( $perlFlag )
-    {
-        $result .= '$solarDef     = '."'$main::solarDef';\n";
-        $result .= '$solarArch    = '."'$main::solarArch';\n";
-        $result .= '$solarOldArch = '."'$main::solarOldArch';\n";
-        $result .= '$solarOS      = '."'$main::solarOS';\n";
-        $result .= '$solarMT      = '."'$main::solarMT';\n";
-        $result .= '$solarDOS     = '."'$main::solarDOS';";
-    }
-    elsif ( $defFlag )
-    {
-        $result = $main::solarDef;
-    }
-    elsif ( $dirFlag )
-    {
-        $result = "$main::solarOS-$main::solarMT";
-    }
-    elsif ( $dosFlag )
-    {
-        $result = $main::solarDOS;
-    }
-    else
-    {
-        $result = $oldFlag ? $main::solarOldArch : $main::solarArch;
-    }
-
-    return $result;
-}
-
-1;
diff --git a/solenv/bin/modules/packager/work.pm b/solenv/bin/modules/packager/work.pm
index ae0c743a635f..014d53b19efe 100644
--- a/solenv/bin/modules/packager/work.pm
+++ b/solenv/bin/modules/packager/work.pm
@@ -293,7 +293,7 @@ sub do_broadcast
     print "cmd_bcst -s 18 \@$tmpfile_name\n";
     unlink "$tmpfile_name";
 
-    if ( $returnvalue ) # an error occured
+    if ( $returnvalue ) # an error occurred
     {
         if (!($packager::globals::ignoreerrors)) { packager::exiter::exit_program("ERROR: Packing not successful!", "do_broadcast"); }
     }
diff --git a/solenv/bin/modules/par2script/systemactions.pm b/solenv/bin/modules/par2script/systemactions.pm
index f5a8db9979a7..149fafe93b0b 100644
--- a/solenv/bin/modules/par2script/systemactions.pm
+++ b/solenv/bin/modules/par2script/systemactions.pm
@@ -133,7 +133,7 @@ sub copy_one_file
     }
     else
     {
-        $infoline = "Error: Could not copy $source to $dest\n";
+        $infoline = "Error: Could not copy $source to $dest $!\n";
         $returnvalue = 0;
     }
 
diff --git a/solenv/bin/modules/par2script/work.pm b/solenv/bin/modules/par2script/work.pm
index fd266e306d04..c9b0bb150bce 100644
--- a/solenv/bin/modules/par2script/work.pm
+++ b/solenv/bin/modules/par2script/work.pm
@@ -148,67 +148,74 @@ sub collect_definitions
     my $multidefinitionerror = 0;
     my @multidefinitiongids = ();
 
+    my %itemhash;
 
-    foreach $oneitem ( @par2script::globals::allitems )
+    # create empty item hashes
+    foreach $oneitem ( @par2script::globals::allitems ) {
+    my %items;
+        $par2script::globals::definitions{$oneitem} = \%items;
+    }
+
+    for ( my $i = 0; $i <= $#{$parfilecontent}; $i++ )
     {
-        my $docollect = 0;
-        my $gid = "";
-        my %allitemhash = ();
+    my $line = ${$parfilecontent}[$i];
+    my $oneitem, $gid;
 
-        for ( my $i = 0; $i <= $#{$parfilecontent}; $i++ )
-        {
-            my $line = ${$parfilecontent}[$i];
+    $line =~ /^\s*$/ && next; # skip blank lines
 
-            if ( $line =~ /^\s*$oneitem\s+(\w+)\s*$/ )
-            {
-                $gid = $1;
-                $docollect = 1;
-            }
-            else
-            {
-                $docollect = 0;
-            }
+    # lines should be well formed:
+    if ($line =~ m/^\s*(\w+)\s+(\w+)\s*$/)
+    {
+        $oneitem = $1;
+        $gid = $2;
+    } else {
+        chomp ($line);
+        my $invalid = $line;
+        $invalid =~ s/[\s\w]*//g;
+        par2script::exiter::exit_program("ERROR: malformed par file, invalid character '$invalid', expecting <token> <gid> but saw '$line'", "test_par_syntax");
+    }
+#   print STDERR "line '$line' -> '$oneitem' '$gid'\n";
 
-            if ( $docollect )
-            {
-                my $currentline = $i;
-                my %oneitemhash;
+    # hunt badness variously
+    if ( ! defined $par2script::globals::definitions{$oneitem} )
+    {
+        par2script::exiter::exit_program("ERROR: invalid scp2 fragment item type '$oneitem' in line: '$line'", "test_par_syntax");
+    }
 
-                while (! ( ${$parfilecontent}[$currentline] =~ /^\s*End\s*$/i ) )
-                {
-                    if ( ${$parfilecontent}[$currentline] =~ /^\s*(.+?)\s*\=\s*(.+?)\s*\;\s*$/ )    # only oneliner!
-                    {
-                        $itemkey = $1;
-                        $itemvalue = $2;
+    # no hyphen allowed in gids -> cannot happen here because (\w+) is required for gids
+    if ( $gid =~ /-/ ) { par2script::exiter::exit_program("ERROR: No hyphen allowed in global id: $gid", "test_of_hyphen"); }
 
-                        if ( $oneitem eq "Directory" ) { if ( $itemkey =~ "DosName" ) { $itemkey =~ s/DosName/HostName/; } }
-                        if (( $oneitem eq "Directory" ) || ( $oneitem eq "File" ) || ( $oneitem eq "Unixlink" )) { if ( $itemvalue eq "PD_PROGDIR" ) { $itemvalue = "PREDEFINED_PROGDIR"; }}
-                        if (( $itemkey eq "Styles" ) && ( $itemvalue =~ /^\s*(\w+)(\s*\;\s*)$/ )) { $itemvalue = "($1)$2"; }
+    my %oneitemhash;
 
-                        $oneitemhash{$itemkey} = $itemvalue;
-                    }
+    while (! ( ${$parfilecontent}[$i] =~ /^\s*End\s*$/i ) )
+    {
+        if ( ${$parfilecontent}[$i] =~ /^\s*(.+?)\s*\=\s*(.+?)\s*\;\s*$/ )  # only oneliner!
+        {
+        $itemkey = $1;
+        $itemvalue = $2;
 
-                    $currentline++;
-                }
+        if ( $oneitem eq "Directory" ) { if ( $itemkey =~ "DosName" ) { $itemkey =~ s/DosName/HostName/; } }
+        if (( $oneitem eq "Directory" ) || ( $oneitem eq "File" ) || ( $oneitem eq "Unixlink" )) { if ( $itemvalue eq "PD_PROGDIR" ) { $itemvalue = "PREDEFINED_PROGDIR"; }}
+        if (( $itemkey eq "Styles" ) && ( $itemvalue =~ /^\s*(\w+)(\s*\;\s*)$/ )) { $itemvalue = "($1)$2"; }
 
-                # no hyphen allowed in gids -> cannot happen here because (\w+) is required for gids
-                if ( $gid =~ /-/ ) { par2script::exiter::exit_program("ERROR: No hyphen allowed in global id: $gid", "test_of_hyphen"); }
+        $oneitemhash{$itemkey} = $itemvalue;
+        }
+        $i++;
+    }
 
-                # test of uniqueness
-                if ( exists($allitemhash{$gid}) )
-                {
-                    $multidefinitionerror = 1;
-                    push(@multidefinitiongids, $gid);
-                }
+    my $allitemhash = \$par2script::globals::definitions{$oneitem};
 
-                $allitemhash{$gid} = \%oneitemhash;
-            }
-        }
+    # test of uniqueness
+    if ( defined ($par2script::globals::definitions{$oneitem}->{$gid}) )
+    {
+        $multidefinitionerror = 1;
+        push(@multidefinitiongids, $gid);
+    }
 
-        $par2script::globals::definitions{$oneitem} = \%allitemhash;
+    $par2script::globals::definitions{$oneitem}->{$gid} = \%oneitemhash;
     }
 
-    if ( $multidefinitionerror ) {  par2script::exiter::multidefinitionerror(\@multidefinitiongids); }
+    if ( $multidefinitionerror ) { par2script::exiter::multidefinitionerror(\@multidefinitiongids); }
 
     # foreach $key (keys %par2script::globals::definitions)
     # {
diff --git a/solenv/bin/modules/pre2par/language.pm b/solenv/bin/modules/pre2par/language.pm
index b5dc336ba847..a6025e4fc804 100644
--- a/solenv/bin/modules/pre2par/language.pm
+++ b/solenv/bin/modules/pre2par/language.pm
@@ -27,6 +27,7 @@
 
 package pre2par::language;
 
+use strict;
 use pre2par::existence;
 
 ##############################################################
@@ -71,63 +72,39 @@ sub get_language_string_from_language_block
     return $newstring;
 }
 
-##############################################################
-# Returning the complete block in all languages
-# for a specified string
-##############################################################
-
-sub get_language_block_from_language_file
-{
-    my ($searchstring, $langfile) = @_;
-
-    my @language_block = ();
-
-    for ( my $i = 0; $i <= $#{$langfile}; $i++ )
-    {
-        if ( ${$langfile}[$i] =~ /^\s*\[\s*$searchstring\s*\]\s*$/ )
-        {
-            my $counter = $i;
-
-            push(@language_block, ${$langfile}[$counter]);
-            $counter++;
-
-            while (( $counter <= $#{$langfile} ) && (!( ${$langfile}[$counter] =~ /^\s*\[/ )))
-            {
-                push(@language_block, ${$langfile}[$counter]);
-                $counter++;
-            }
-
-            last;
-        }
-    }
-
-    return \@language_block;
-}
-
 ############################################
-# collecting all replace strings
+# collecting all replace variables
 # in a language file
 ############################################
 
-sub get_all_replace_strings
+sub get_all_replace_variables
 {
     my ($langfile) = @_;
 
-    my @allstrings = ();
+    my %allvars = ();
 
     for ( my $i = 0; $i <= $#{$langfile}; $i++ )
     {
         if ( ${$langfile}[$i] =~ /^\s*\[\s*(.*?)\s*\]\s*$/ )
         {
-            my $replacestring = $1;
-            if (! pre2par::existence::exists_in_array($replacestring, \@allstrings))
-            {
-                push(@allstrings, $replacestring);
-            }
+        my $variable = $1;
+#       print "lang block '$variable'\n";
+        my @lang_block = ();
+        my $counter;
+
+        # Store the complete block in all languages for a specified variable
+            for ( $counter = $i + 1; $counter <= $#{$langfile}; $counter++ ) {
+        my $line = ${$langfile}[$counter];
+        last if ($line =~ /^s*\[/); # next decl.
+        push @lang_block, $line;
+        }
+#       print "$variable = '@lang_block'\n";
+        $allvars{$variable} = \@lang_block;
+        $i = $counter - 1;
         }
     }
 
-    return \@allstrings;
+    return \%allvars;
 }
 
 ############################################
@@ -139,32 +116,30 @@ sub localize
 {
     my ($parfile, $langfile) = @_;
 
-    my $allreplacestrings = get_all_replace_strings($langfile);
+    my $replace_hash = get_all_replace_variables($langfile);
 
+    # parse lines of the form Name (st) = STR_NAME_MODULE_HELPPACK_OC;
+    # for variable substitution
+    my $langlinere = qr/^\s*\w+\s*\(([\w-]+)\)\s*\=\s*([\w-]+)\s*;/;
     for ( my $i = 0; $i <= $#{$parfile}; $i++ )
     {
         my $oneline = ${$parfile}[$i];
 
-        for ( my $j = 0; $j <= $#{$allreplacestrings}; $j++ )
-        {
-            if ( $oneline =~ /\b${$allreplacestrings}[$j]\b/ ) # Not for basic scripts
-            {
-                my $oldstring = ${$allreplacestrings}[$j];
-
-                if ( $oneline =~ /^\s*\w+\s*\(([\w-]+)\)\s*\=/ )
-                {
-                    my $language = $1;   # can be "01" or "en" or "en-US" or ...
+    if ( $oneline =~ $langlinere) {
+        my $language = $1;   # can be "01" or "en" or "en-US" or ...
+        my $variable = $2;
 
-                    my $languageblock = get_language_block_from_language_file($oldstring, $langfile);
-                    my $newstring = get_language_string_from_language_block($languageblock, $language);
+#       print "line '$oneline' split to '$language' '$variable'\n";
 
-                    if ( $newstring eq "" ) { $newstring = "\"" . $oldstring . "\""; }
+        if (defined $replace_hash->{$variable}) {
+                    my $languageblock = $replace_hash->{$variable};
+                    my $newstring = get_language_string_from_language_block($replace_hash->{$variable}, $language);
+                    if ( $newstring eq "" ) { $newstring = "\"" . $variable . "\""; }
 
-                    $oneline =~ s/$oldstring/$newstring/g;
+                    $oneline =~ s/$variable/$newstring/g;
 
                     ${$parfile}[$i] = $oneline;
                 }
-            }
         }
     }
 }
diff --git a/solenv/bin/modules/pre2par/systemactions.pm b/solenv/bin/modules/pre2par/systemactions.pm
index e084d7753f48..0e7b3d8c253a 100644
--- a/solenv/bin/modules/pre2par/systemactions.pm
+++ b/solenv/bin/modules/pre2par/systemactions.pm
@@ -155,7 +155,7 @@ sub copy_one_file
     }
     else
     {
-        $infoline = "Error: Could not copy $source to $dest\n";
+        $infoline = "Error: Could not copy $source to $dest $!\n";
         $returnvalue = 0;
     }
 
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
new file mode 100755
index 000000000000..56825e18e813
--- /dev/null
+++ b/solenv/bin/ooinstall
@@ -0,0 +1,138 @@
+#!/usr/bin/env perl
+
+# This script has three uses:
+# 1. From the command line to install straight into a given directory:
+#    bin/ooinstall /opt/Foo
+# 2. From the command line to link into a given directory:
+#    bin/ooinstall -l /opt/FooLinked
+# 3. When packaging (called from package-ooo), to install to DESTDIR
+
+use File::Find;
+use File::Path qw(mkpath);
+use Cwd;
+
+$path = '';
+$do_link = 0;
+$is_windows = 0;
+my $tmp_dir;
+
+if ($ENV{GUI} eq 'WNT') {
+    $is_windows = 1;
+}
+
+if( defined($ENV{TMPDIR}) ) {
+    $tmp_dir = $ENV{TMPDIR};
+} elsif( defined($ENV{TMP}) ) {
+   $tmp_dir = $ENV{TMP};
+} else {
+   $tmp_dir = '/tmp';
+}
+if (!-d $tmp_dir) {die "Set TMP or TMPDIR!\n";}
+
+# Workaround for system Mozilla
+if ( $ENV{'SYSTEM_MOZILLA'} eq 'YES' ) {
+    $ENV{'LD_LIBRARY_PATH'} = "$ENV{'MOZ_LIB'}:$ENV{'LD_LIBRARY_PATH'}";
+}
+
+# Workaround for the Python
+$ENV{'PYTHONPATH'} = "$ENV{'SRC_ROOT'}/instsetoo_native/$ENV{'INPATH'}/bin:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python/lib-dynload";
+
+for $arg (@ARGV) {
+    if ($arg eq '-l') {
+	$do_link = 1;
+    } elsif ($arg eq '-h' || $arg eq '--help') {
+	$help = 1;
+    } else {
+		# Cwd::realpath does not work if the path does not exist
+		mkpath($ENV{DESTDIR} . $arg) unless -d $ENV{DESTDIR} . $arg;
+		$path = Cwd::realpath( $ENV{DESTDIR} . $arg );
+		if (!$do_link) {
+			my $destdir = Cwd::realpath( $ENV{DESTDIR} );
+			$path =~ s|$destdir||;
+	    }
+    }
+}
+
+$help = 1 if $path eq '';
+
+if ($help) {
+    print "ooinstall [-l] <prefix to install to>\n";
+    print "  -l - performs a linkoo on the installed source\n";
+    exit 1;
+}
+
+my $BUILD=undef;
+my $LAST_MINOR=undef;
+open MINORMK, "$ENV{'SOLARENV'}/inc/minor.mk";
+while (<MINORMK>) {
+	my $t = "\$" . $_;
+	if(/^BUILD/ || /^LAST_MINOR/) {
+		eval $t;
+	}
+}
+close MINORMK;
+$ENV{LAST_MINOR} = $LAST_MINOR;
+$ENV{OUT} = "../$ENV{'INPATH'}";
+$ENV{LOCAL_OUT} = $ENV{OUT};
+$ENV{LOCAL_COMMON_OUT} = $ENV{OUT};
+# FIXME: the following variable helps to install localizations even if some
+# files are not localized (like Japanese, Chinese wordbook), it makes
+# the installer to use the English localization of the file instead.
+$ENV{DEFAULT_TO_ENGLISH_FOR_PACKING} = 1;
+
+my @larr;
+$langs=$ENV{WITH_LANG};
+$langs='en-US' if $langs eq '';
+if ($langs eq 'ALL') {
+    opendir(DIR,$ENV{L10N_MODULE} . "/source");
+    @larr = readdir(DIR);
+    @larr = grep { $_ ne '.' } @larr;
+    @larr = grep { $_ ne '..' } @larr;
+    @larr = (@larr,"en-US");
+    closedir(DIR);
+}
+else {
+    @larr = grep { $_ ne '' } split(/ /, $langs);
+}
+$langs = join (",", @larr);
+
+$destdir='';
+if ( defined $ENV{DESTDIR} &&
+     $ENV{DESTDIR} ne "" ) {
+    $destdir = "-destdir \"$ENV{DESTDIR}\"";
+}
+
+$strip='';
+if ( defined $ENV{DISABLE_STRIP} &&
+     $ENV{DISABLE_STRIP} eq "TRUE" ) {
+    $strip = "-dontstrip";
+}
+
+$msi='';
+if ($is_windows) {
+    $msi = "-msitemplate $ENV{SRC_ROOT}/instsetoo_native/$ENV{INPATH}/misc/openoffice/msi_templates " .
+           "-msilanguage $ENV{SRC_ROOT}/instsetoo_native/$ENV{INPATH}/misc/win_ulffiles";
+}
+
+print "Running LibreOffice installer\n";
+system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
+	"perl -w $ENV{SOLARENV}/bin/make_installer.pl " .
+	"-f openoffice.lst -l $langs -p LibreOffice " .
+	"-u $tmp_dir " .
+	"-buildid $BUILD $destdir $strip $msi " .
+	"-simple $path") && die "Failed to install: $!";
+
+if ($ENV{BUILD_TYPE} =~ m/ODK/) {
+    print "Running SDK installer\n";
+    system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
+	"perl -w $ENV{SOLARENV}/bin/make_installer.pl " .
+	"-f openoffice.lst -l en-US -p LibreOffice_SDK " .
+	"-u $tmp_dir " .
+	"-buildid $BUILD $destdir $strip $msi" .
+	"-simple $path") && die "Failed to install: $!";
+}
+print "Installer finished\n";
+
+if ($do_link && !$is_windows) {
+    `$ENV{SOLARENV}/bin/linkoo $path $ENV{SRC_ROOT}`;
+}
diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl
index 9466110124d2..24bca5c77160 100755
--- a/solenv/bin/packimages.pl
+++ b/solenv/bin/packimages.pl
@@ -356,9 +356,13 @@ sub create_zip_archive
     foreach ( optimize_zip_layout($zip_hash_ref) ) {
         my $path = $zip_hash_ref->{$_} . "/$_";
         print_message("zipping '$path' ...") if $extra_verbose;
-        my $member = $zip->addFile($path, $_);
-        if ( !$member ) {
-            print_error("can't add file '$path' to image zip archive: $!", 5);
+        if ( -e $path) {
+            my $member = $zip->addFile($path, $_, COMPRESSION_STORED);
+            if ( !$member ) {
+                print_error("can't add file '$path' to image zip archive: $!", 5);
+            }
+        } else {
+                print_message("file '$path' not found");
         }
     }
     my $status = $zip->writeToFileNamed($tmp_out_file);
diff --git a/solenv/bin/receditor b/solenv/bin/receditor
index 1b4046010485..d0549c6c79ab 100755
--- a/solenv/bin/receditor
+++ b/solenv/bin/receditor
@@ -3,4 +3,4 @@ if [ x${SOLARENV}x = xx ]; then
     echo No environment found, please use 'configure' or 'setsolar'
     exit 1
 fi
-exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -jar ${SOLARVER}/${INPATH}/bin${UPDMINOREXT}/receditor.jar
+exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -jar ${SOLARVER}/${INPATH}/bin/receditor.jar
diff --git a/solenv/bin/relocate b/solenv/bin/relocate
index 2158d5d7314c..6a5cfb992a3c 100755
--- a/solenv/bin/relocate
+++ b/solenv/bin/relocate
@@ -34,6 +34,8 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
+# written substantially, if not entirely by non-Sun volunteers
+#
 #*************************************************************************
 
 sub sniff_set($)
@@ -43,7 +45,7 @@ sub sniff_set($)
 
     opendir ($dirhandle, $build_dir) || die "Can't open $build_dir";
     while ($fname = readdir ($dirhandle)) {
-	$fname =~ /[Ss]et.sh$/ && last;
+	$fname =~ /Set.sh$/ && last;
     }
     closedir ($dirhandle);
 
@@ -103,39 +105,65 @@ sub rewrite_set($$$)
     $state{'win32_new_root'} = $tmp;
 
     sed_file ("$new_root/$set", \&rewrite_value, \%state);
-
-    my $tcsh_set = $set;
-    $tcsh_set =~ s/\.sh$//;
-
-    print "   $tcsh_set\n";
-
-    sed_file ("$new_root/$tcsh_set", \&rewrite_value, \%state);
 }
 
-sub find_old_root($$)
+sub read_set($$)
 {
     my $new_root = shift;
     my $set = shift;
     my $fname = "$new_root/$set";
-    my $old_root;
     my $file;
+    my %env_keys;
 
     open ($file, $fname) || die "Can't open $fname: $!";
-    
+
     while (<$file>) {
 	if (/\s*([^=]+)\s*=\s*\"([^\"]+)\"/) {
 	    my ($name, $value) = ($1, $2);
 
-	    if ($name eq 'SRC_ROOT') {
-		$old_root = $value;
-		last;
-	    }
+	    $env_keys{$name} = $value;
 	}
     }
-    
+
     close ($file) || die "Failed to close $fname: $!";
 
-    return $old_root;
+    return \%env_keys;
+}
+
+sub sed_file_no_touch($$$)
+{
+    my ($new_root, $old_root, $file) = @_;
+    my ($fin, $fout);
+
+    ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
+     $atime,$mtime,$ctime,$blksize,$blocks) = stat ($file);
+
+    open ($fin, $file) || die "Can't open $fin: $!";
+    open ($fout, ">$file.sed.bak") || die "Can't open $file.sed.bak: $!";
+    while (<$fin>) {
+	s/$old_root/$new_root/g;
+	print $fout $_;
+    }
+    close ($fin);
+    close ($fout);
+    rename ("$file.sed.bak", $file);
+#    print "rename $file.sed.bak to $file\n";
+
+    utime $atime, $mtime, $file;
+}
+
+sub sed_no_touch_recursive ($$$)
+{
+    my ($new_root, $old_root, $dir) = @_;
+    my $dh;
+    opendir ($dh, $dir) || die "Can't open dir: $dir: $!";
+    while (my $entry = readdir ($dh)) {
+	$entry =~ /^\./ && next;
+	my $path = "$dir/$entry";
+	sed_no_touch_recursive ($new_root, $old_root, $path) if (-d $path);
+	sed_file_no_touch ($new_root, $old_root, $path) if (-f $path);
+    }
+    closedir ($dh);
 }
 
 sub rewrite_product_deps($$$)
@@ -151,8 +179,8 @@ sub rewrite_product_deps($$$)
     while ($name = readdir ($misc_dir)) {
 # Should try re-writing these - but perhaps this would
 # screw with timestamps ?
-    if ($name =~ m/\.dpcc$/ || $name =~ m/\.dpslo$/ || $name =~ m/\.dpobj$/) {
-		unlink ("$path/$name");
+	if ($name =~ m/\.dpcc$/ || $name =~ m/\.dpslo$/ || $name =~ m/\.dpobj$/) {
+	    sed_file_no_touch ($new_root, $old_root, "$path/$name");
 	}
     }
     closedir ($misc_dir);
@@ -184,6 +212,35 @@ sub rewrite_dpcc($$)
 	closedir ($sub_dir);
     }
     closedir ($top_dir);
+    print "\n";
+}
+
+sub rewrite_symlinks($$)
+{
+    my $new_root = shift;
+    my $old_root = shift;
+
+    my $dirh;
+    opendir ($dirh, $new_root);
+    while (my $ent = readdir ($dirh)) {
+	$ent =~ /^\./ && next;
+	my $link = "$new_root/$ent";
+	-l $link || next;
+	my $target = readlink ($link);
+	my $newtarget = $target;
+	$newtarget =~ s/$old_root/$new_root/;
+	if ($target =~ m/$new_root/) {
+	    print STDERR "skip correct link $target\n";
+	} elsif ($newtarget eq $target) {
+	    print STDERR "unusual - possibly stale link: $target\n";
+	    if ($target =~ m/\/clone\//) { die "failed to rename link"; }
+	} else {
+	    print "Re-write link $target to $newtarget\n";
+	    unlink ($link);
+	    symlink ($newtarget, $link);
+	}
+    }
+    closedir ($dirh);
 }
 
 sub rewrite_bootstrap($$)
@@ -217,17 +274,29 @@ substr ($OOO_BUILD, 0, 1) eq '/' || die "relocate requires absolute paths";
 my $set;
 
 $set = sniff_set($OOO_BUILD) || die "Can't find env. set";
-$OLD_ROOT = find_old_root($OOO_BUILD, $set);
+my $env_keys = read_set ($OOO_BUILD, $set);
+$OLD_ROOT = $env_keys->{'SRC_ROOT'};
+my $solver = $env_keys->{SOLARVER} . "/" . $env_keys->{INPATH};
 
 print "Relocate: $OLD_ROOT -> $OOO_BUILD\n";
+if ($OLD_ROOT eq $OOO_BUILD) {
+    print "nothing to do\n";
+    exit 0;
+}
 
-print "re-writing environment:\n";
-
-rewrite_set($OOO_BUILD, $OLD_ROOT, $set);
-rewrite_bootstrap($OOO_BUILD, $OLD_ROOT);
+print "re-writing symlinks\n";
+rewrite_symlinks($OOO_BUILD, $OLD_ROOT);
 
 print "re-writing dependencies:\n";
-
 rewrite_dpcc($OOO_BUILD, $OLD_ROOT);
 
+if (-d "$solver/workdir/Dep") {
+    print "re-writing new dependencies:\n";
+    sed_no_touch_recursive ($OOO_BUILD, $OLD_ROOT, "$solver/workdir/Dep");
+}
+
+print "re-writing environment:\n";
+rewrite_set($OOO_BUILD, $OLD_ROOT, $set);
+rewrite_bootstrap($OOO_BUILD, $OLD_ROOT);
+
 print "done.\n";
diff --git a/solenv/bin/remangle32to64.pl b/solenv/bin/remangle32to64.pl
new file mode 100644
index 000000000000..0ed98fbd4d4e
--- /dev/null
+++ b/solenv/bin/remangle32to64.pl
@@ -0,0 +1,327 @@
+#!/usr/bin/perl -w /* -*- indent-tabs-mode: nil -*- */
+
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Novell, Inc
+# Portions created by the Initial Developer are Copyright (C) 2011 Novell,
+# Inc. All Rights Reserved.
+#
+# Contributor(s): Tor Lillqvist <tml@iki.fi>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+# Change MSVC mangled C++ names from 32-bit form to the corresponding
+# 64-bit form.  Each line of input can contain at most one mangled
+# name.
+
+# Based on experimentation with MSVC2008 and the following web pages:
+
+# http://www.geoffchappell.com/viewer.htm?doc=studies/msvc/language/decoration/index.htm
+# Thorough but incomplete. Still, describes details the below sources
+# don't mention.
+
+# http://cvs.winehq.com/cvsweb/wine/dlls/msvcrt/undname.c
+# Wine's __unDname function, presumably the most complete, although
+# not really written to act as "documentation"
+
+# http://mearie.org/documents/mscmangle/
+# Relatively complete but a bit badly structured and terse.
+
+# http://en.wikipedia.org/wiki/Microsoft_Visual_C%2B%2B_Name_Mangling
+# seems to be mostly a ripoff on the mearie.org page
+
+# Example transformation:
+# ??0ORealDynamicLoader@salhelper@@IAE@PAPAV01@ABVOUString@rtl@@1PAX2@Z =>
+# ??0ORealDynamicLoader@salhelper@@IEAA@PEAPEAV01@AEBVOUString@rtl@@1PEAX2@Z
+
+# It should be relatively easy to remove the modification parts of the
+# below code and use the regex for some other task on MSVC mangled
+# names.
+
+# The regular expression below accepts also nonsensical mangled names,
+# so it should not be used to verify correctness of mangled names.
+
+use strict;
+
+my @opstack = ();
+
+sub parse_number($)
+{
+  my ($num) = @_;
+
+  return $num + 1 if ($num eq '0' || ($num ge '1' && $num le '9'));
+
+  $num =~ tr/ABCDEFGHIJKLMNOP@/0123456789ABCDEF /;
+  hex($num);
+}
+
+sub format_number($)
+{
+  my ($num) = @_;
+
+  return $num - 1 if ($num <= 10);
+
+  $num = sprintf("%X", $num);
+  $num =~ tr/0123456789ABCDEF/ABCDEFGHIJKLMNOP/;
+  $num.'@';
+}
+
+sub double_thunk($$)
+{
+  my ($number, $position) = @_;
+
+  my $bytes = parse_number($number);
+  $bytes *= 2;
+  push(@opstack, 'r '.($position - length($number)).' '.length($number).' '.format_number($bytes));
+}
+
+while (<>)
+  {
+    m/
+      # Named subpattern definitions. I use names of the form
+      # __CamelCase__ for the named subpatters so that they are easier
+      # to see.
+      (?(DEFINE)
+        (?<__Number__>
+          \?? ([0-9] | [A-P]+@)
+        )
+        (?<__32BitChecksum__>
+          [A-P]{8}@
+        )
+        (?<__CallingConvention__>
+          (?:
+            [AB]
+            |
+            [C-L]
+              (?{ push(@opstack, 'r '.(pos()-1).' 1 A cdecl'); })
+          )
+        )
+        (?<__StringLiteralText__>
+          (?:
+            [_a-zA-Z0-9]
+            |
+            \?\$[A-P][A-P]
+            |
+            \?[0-9A-Za-z]
+          ){1,20}
+        )
+        (?<__Identifier__>
+          [_a-zA-Z\$][_a-zA-Z0-9\$]*@
+        )
+        (?<__ArgsZTerminated__>
+          (?&__DataTypeInArgs__)+ @? Z
+        )
+        (?<__ArgsNonZTerminated__>
+          (?&__DataTypeInArgs__)+ @?
+        )
+        (?<__TemplateName__>
+          (?&__Identifier__) (?&__ArgsNonZTerminated__)
+        )
+        (?<__Class__>
+          (?:
+            [0-9]
+            |
+            \?\$ (?&__TemplateName__)
+            |
+            (?&__Identifier__)
+          )+@
+        )
+        (?<__DataTypeCommon__>
+          (?:
+            # extended types like _int64, bool and wchar_t
+            _[D-NW]
+            |
+            # simple types
+            [C-KMNOXZ]
+            |
+            # class, struct, union, cointerface
+            [TUVY] (?&__Class__)
+            |
+            # references
+            [AB]
+              (?{ push(@opstack, 'i '.pos().' E reference'); })
+              (?&__ModifiedType__)
+            |
+            # pointers
+            [QRS]
+              (?{ push(@opstack, 'i '.pos().' E pointer'); })
+              (?&__ModifiedType__)
+            |
+            P
+              (?:
+                # function pointer
+                6 (?&__CallingConvention__) (?&__DataTypeNotInArgs__) (?&__ArgsZTerminated__)
+                |
+                # other pointer
+                (?{ push(@opstack, 'i '.pos().' E pointer'); })
+                (?&__ModifiedType__)
+              )
+            |
+            W 4 (?&__Class__)
+            |
+            [0-9]
+            |
+            \$ (?:
+                 [0DQ] (?&__Number__)
+                 |
+                 F (?&__Number__){2}
+                 |
+                 G (?&__Number__){3}
+                 |
+                 \$ [ABCD] (?&__DataTypeNotInArgs__)
+               )
+          )
+        )
+        (?<__ModifiedType__>
+          [ABCD]
+          (?:
+            # multidimensional array
+            Y (?&__Number__)+
+          )?
+          (?&__DataTypeNotInArgs__)
+        )
+        (?<__DataTypeInArgs__>
+          (?:
+            (?&__DataTypeCommon__)
+            |
+            # template parameter
+            \? (?&__Number__)
+          )
+        )
+        (?<__DataTypeNotInArgs__>
+          (?:
+            (?&__DataTypeCommon__)
+            |
+            \? (?&__ModifiedType__)
+          )
+        )
+      )
+
+      # All mangled names start with a question mark
+      \?
+      (?:
+        # Ctors, dtors, operators etc have separate a priori defined
+        # special mangled names like the very simple ?0 for constructor
+        # and ?_R16789 for "RTTI Base Class Descriptor at (6,7,8,9)"
+        # whatever that might mean.
+        (
+          \?
+          ([0-9A-Z]
+           |
+           _(?:
+              # C is for string literals, see below
+              # R is RTTI, see immediately below
+              [0-9ABD-QS-Z]
+              |
+              R0(?&__DataTypeNotInArgs__)
+              |
+              R1(?&__Number__){4}
+              |
+              R[234]
+              |
+              _(?:
+                 E
+               )
+           )
+          )
+        )?
+        (?&__Class__)
+
+        (?:
+          # Static members and normal variables
+          [0-5]
+            (?&__DataTypeNotInArgs__)
+            [ABCD]
+          |
+          # Compiler-generated static
+          [67]
+            [ABCD]
+            (?:
+              @
+              |
+              (?&__Class__)
+            )
+          |
+          # Non-static Methods, implicit 'this'
+          [ABEFIJMNQRUV]
+            [AB]
+            (?{ push(@opstack, 'i '.(pos()-1).' E this'); })
+            (?&__CallingConvention__)
+            (?:
+              @
+              |
+              (?&__DataTypeNotInArgs__)
+            )
+            (?&__ArgsZTerminated__)
+          |
+          # Static methods
+          [CDKLST]
+            (?&__CallingConvention__)
+            (?:
+              @
+              |
+              (?&__DataTypeNotInArgs__)
+            )
+            (?&__ArgsZTerminated__)
+          |
+          # Thunks
+          [GHOPWX]
+            ((?&__Number__))
+            (?{ double_thunk($^N, pos()); })
+            [AB]
+            (?{ push(@opstack, 'i '.(pos()-1).' E this'); })
+            (?&__CallingConvention__)
+            (?:
+              @
+              |
+              (?&__DataTypeNotInArgs__)
+            )
+            (?&__ArgsZTerminated__)
+          |
+          # Functions
+          [YZ]
+            (?&__CallingConvention__)
+            (?:
+              @
+              |
+              (?&__DataTypeNotInArgs__)
+            )
+            (?&__ArgsZTerminated__)
+          |
+          # Template
+          \$ (?&__Identifier__) (?&__ArgsNonZTerminated__)
+        )
+        |
+        # pooled string literals
+        \?_C\@_[01](?&__Number__)(?&__32BitChecksum__)(?&__StringLiteralText__)@
+      )
+      /x;
+
+    while (my $op = pop(@opstack))
+      {
+        # print STDERR "op=$op\n";
+        my @a = split (' ', $op);
+        if ($a[0] eq 'i') {
+          substr($_,$a[1],0) = $a[2];
+        } elsif ($a[0] eq 'r') {
+          substr($_,$a[1],$a[2]) = $a[3];
+        }
+      }
+
+    print;
+  }
diff --git a/solenv/bin/striplanguagetags.sh b/solenv/bin/striplanguagetags.sh
new file mode 100755
index 000000000000..a8834795e28c
--- /dev/null
+++ b/solenv/bin/striplanguagetags.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+#take a .zip containing a flat hierarchy of odf files and strip out the
+#language and country tags in each of them and repack it all up
+#should convert templates so that documents based on them use
+#the default-document-language rather than the hardcoded lang-tag
+
+#All a bit hacky, but it should work
+
+tempfoo=`basename $0`
+
+XSL=`mktemp /tmp/${tempfoo}.XXXXXX`
+if [ $? -ne 0 ]; then
+    echo "$0: Can't create temp file, exiting..."
+    exit 1
+fi
+
+# On Windows, xsltproc is a non-Cygwin program, so we can't pass
+# a Cygwin /tmp path to it
+[ "$COM" == MSC ] && XSL=`cygpath -m -s $XSL`
+
+WRKDIR=`mktemp -d /tmp/${tempfoo}.XXXXXX`
+if [ $? -ne 0 ]; then
+    echo "$0: Can't create temp dir, exiting..."
+    exit 1
+fi
+
+cat > $XSL << EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
+
+<xsl:template match="node()|@*">
+  <xsl:copy>
+    <xsl:apply-templates select="@*|node()"/>
+  </xsl:copy>
+</xsl:template>
+
+<xsl:template match="@fo:language"/>
+<xsl:template match="@fo:country"/>
+
+</xsl:stylesheet>
+EOF
+
+unzip -q $1 -d $WRKDIR
+pushd $WRKDIR
+for a in *; do
+    unzip -qc $a styles.xml > styles.tmp
+    eval "$CALLXSLTPROC -o styles.xml $XSL styles.tmp"
+    zip -qr $a styles.xml
+    rm styles.xml styles.tmp
+done
+popd
+zip -qrj $1 $WRKDIR
+rm -rf $WRKDIR
+rm -f $XSL
diff --git a/solenv/bin/subsequenttests b/solenv/bin/subsequenttests
index ae9b61922bd8..5052523cfb32 100755
--- a/solenv/bin/subsequenttests
+++ b/solenv/bin/subsequenttests
@@ -1,171 +1,29 @@
-eval 'exec "$PERL" -Sw "$0" "$@"'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***********************************************************************/
-
-use lib("$ENV{SOLARENV}/bin/modules");
-use SourceConfig;
-
-my $keep_going = 0;
-my $dry_run = 0;
-my $max_running = 1;
-while (@ARGV) {
-    my $arg = shift(@ARGV);
-    if ($arg =~ /^-P([1-9]\d*)$/) {
-        $max_running = $1;
-    } elsif ($arg eq '--') {
-        last;
-    } else {
-        my $n = substr($arg, 0, 1) eq '-' ? 1 : 0;
-        while ($n && $n < length($arg)) {
-            my $c = substr($arg, $n++, 1);
-            if ($c eq 'k') {
-                $keep_going = 1;
-            } elsif ($c eq 'n') {
-                $dry_run = 1;
-            } else {
-                $n = 0;
-                last;
-            }
-        }
-        if (!$n) {
-            print STDERR "unknown argument \"$arg\"\n";
-            print STDERR "usage: $0 [-kn] [-P<n>] [-- <args>]\n";
-            print STDERR " -k     continue with other dmake invocations upon\n";
-            print STDERR "        failure\n";
-            print STDERR " -n     write directories that would be processed\n";
-            print STDERR "        to standard output\n";
-            print STDERR " -P<n>  number of parallel dmake invocations\n";
-            print STDERR " <args> are passed to dmake invocations\n";
-            exit(1);
-        }
-    }
-}
-
-my @testpaths = ();
-my $sc = SourceConfig->new($ENV{'SOLARSRC'});
-my $module;
-my $gbuildpath = "$ENV{'SOLARSRC'}/GNUmakefile";
-foreach $module ($sc->get_active_modules()) {
-    my $buildlst = $sc->get_module_build_list($module);
-    next unless defined($buildlst);
-    my %deps = ();
-    open(BUILDLST, $buildlst) or die("cannot open $buildlst");
-    while (<BUILDLST>) {
-        next unless
-            /^\s*\w+\s+(\S+)\s+nmake\s+-\s+all\s+(\S+)(\s+(:?\S+\s+)*)NULL\s*$/;
-        my ($dir, $id, $ids) = ($1, $2, $3);
-        $dir =~ s|\\|/|g;
-        $dir =~ s|^[^/]+||;
-        my $path = $sc->get_module_path($module) . $dir;
-        my $makefile = $path . '/makefile.mk';
-        open(MAKEFILE, $makefile) or die("cannot open $makefile");
-        while (<MAKEFILE>) {
-            if (/\bOOO_SUBSEQUENT_TESTS\b/) {
-                push(@testpaths, $path);
-                $deps{$id} = $ids;
-                last;
-            }
-        }
-        close(MAKEFILE);
-    }
-    close(BUILDLST);
-    my $id1;
-    foreach $id1 (keys(%deps)) {
-        my ($id2, $ids);
-        while (($id2, $ids) = each(%deps)) {
-            $ids !~ /\s\Q$id1\E\s/ or die("$module: $id2 depends on $id1");
-        }
-    }
-}
-
-if ($dry_run) {
-    foreach $path (@testpaths) {
-        print "$path\n";
-    }
-    print "$gbuildpath\n";
-    exit(0);
-}
-
-my @failedpaths = ();
-my @gbuildargs = ("-j$max_running", "-s");
-if ($keep_going) {
-    push(@gbuildargs,"-k");
-}
-push(@gbuildargs, "--file=$gbuildpath");
-push(@gbuildargs, "subsequentcheck");
-if (system($ENV{'GNUMAKE'}, @gbuildargs) != 0) {
-	push(@failedpaths,$gbuildpath);
-	@testpaths = () unless $keep_going;
-}
-
-my $cmd = 'dmake';
-foreach (@ARGV) {
-    s/'/'\''/g;
-    $cmd .= " '" . $_ . "'";
-}
-$cmd .= ' 2>&1 |';
-
-my %pids = ();
-my $running = 0;
-my $counter = 0;
-while (@testpaths || $running > 0) {
-    while (@testpaths && $running < $max_running) {
-        my $testpath = shift(@testpaths);
-        ++$counter;
-        print("$counter: make $testpath\n");
-        my $pid = fork();
-        defined($pid) or die("$counter: $!");
-        if ($pid == 0) {
-            chdir($testpath) or die("$counter: $!");
-            $ENV{'OOO_SUBSEQUENT_TESTS'} = 'TRUE';
-            open(OUTPUT, $cmd) or die("$counter: $!");
-            while (<OUTPUT>) {
-                s/\r?\n$//;
-                print("$counter: $_\n");
-            }
-            close(OUTPUT);
-            exit($? == 0 ? 0 : 1);
-        }
-        $pids{$pid} = $testpath;
-        ++$running;
-    }
-    my $pid = wait();
-    $pid != -1 or die($!);
-    my $testpath = delete($pids{$pid});
-    defined($testpath) or die("unmatched PID $pid");
-    if ($? != 0) {
-        push(@failedpaths, $testpath);
-        @testpaths = () unless $keep_going;
-    }
-    --$running;
-}
-my $failedpath;
-foreach $failedpath (@failedpaths) {
-    print STDERR "failed in $failedpath\n";
-}
-exit(scalar(@failedpaths) == 0 ? 0 : 1);
+#!/bin/sh
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+set -e
+${GNUMAKE} -sf ${SOLARSRC}/GNUmakefile.mk subsequentcheck $*
diff --git a/solenv/bin/transform_description.pl b/solenv/bin/transform_description.pl
index b1adb03626dd..ff99df425049 100644
--- a/solenv/bin/transform_description.pl
+++ b/solenv/bin/transform_description.pl
@@ -130,7 +130,7 @@ sub explain
     print STDOUT "\n";
     print STDOUT "  The following transformations are done at the moment:\n";
     print STDOUT "  - duplicate all lines containing #LANG#, for ever token of \$WITH_LANG\n";
-    print STDOUT "    replacing every occurance of \$LANG with a token\n";
+    print STDOUT "    replacing every occurrence of \$LANG with a token\n";
     print STDOUT "\n";
     print STDOUT "  And yes, the functionality of this script should be\n";
     print STDOUT "  - moved to solenv/inc/tg_ext.mk\n";
diff --git a/solenv/bin/update_module_ignore_lists.pl b/solenv/bin/update_module_ignore_lists.pl
deleted file mode 100644
index 88d73a0217d6..000000000000
--- a/solenv/bin/update_module_ignore_lists.pl
+++ /dev/null
@@ -1,255 +0,0 @@
-:
-    eval 'exec perl -S $0 ${1+"$@"}'
-        if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-use Cwd;
-use File::Temp qw/ tempfile tempdir /;
-
-my $verbosity = 1;  # will be adjusted to the value of $Env{VERBOSE} below
-
-# platforms which are not supported anymore, and thus can be filtered from the svn:ignore list
-my %obsolete_platforms = (
-    );
-    # (none so far)
-
-# platforms whose output trees should appear in all modules' svn:ignore list
-my @platforms = (
-        "common",
-        "unxlngi6",
-        "unxlngx6",
-        "unxsols4",
-        "unxsolu4",
-        "unxsoli4",
-        "wntmsci12",
-        "unxmacxi",
-        "unxubit8",
-        "unxaixp",
-        "unxbsda",
-        "unxbsdi2",
-        "unxbsdi",
-        "unxbsds",
-        "unxfbsdi",
-        "unxfbsd",
-        "unxfbsdx",
-        "unxhpgr",
-        "unxhpxr",
-        "unxirgm",
-        "unxirxm3",
-        "unxirxm",
-        "unxlnga",
-        "unxlngm68k",
-        "unxlngmips",
-        "unxlngp",
-        "unxlngppc4",
-        "unxlngppc64",
-        "unxlngppc",
-        "unxlngr",
-        "unxlngs3904",
-        "unxlngs390x",
-        "unxlngs",
-        "unxlnxi",
-        "unxmacxp",
-        "unxsogi",
-        "unxsogs"
-    );
-
-
-# .........................................................................
-# retrieves the repository URL of the SVN working copy in the current directory
-sub retrieve_repo_url
-{
-    open( SVN, "svn info 2>&1 |" );
-    my @result = <SVN>;
-    close( SVN );
-
-    foreach (@result)
-    {
-        chomp;
-        next if ( ! /^URL: / );
-        s/^URL: //;
-        return $_;
-    }
-    return undef;
-}
-
-# .........................................................................
-# gets the "modules" below the given SVN repository URL, by calling "svn list"
-sub get_modules
-{
-    my @modules = ();
-
-    open( SVN, "svn list $_ 2>&1 |" );
-    my @result = <SVN>;
-    close( SVN );
-
-    foreach (@result)
-    {
-        chomp;
-        s/\/$//;
-        push @modules, $_;
-    }
-
-    return @modules;
-}
-
-# .........................................................................
-sub set_ignore_property
-{
-    my ($repo_url, @modules) = @_;
-
-    # max length of a module name
-    my $max_len = 0;
-    foreach ( @modules ) { $max_len = length( $_ ) if ( length( $_ ) > $max_len ); }
-
-    my $updated = 0;
-
-    my $current = 0;
-    my $count = $#modules + 1;
-    foreach $module ( @modules )
-    {
-        ++$current;
-
-        # print progress
-        if ( $verbosity > 1 )
-        {
-            my $progress = "$module ";
-            $progress .= "(" . $current . "/" . $count . ")";
-
-            my $dots = 3 + ( $max_len - length($module) );
-            $dots += int( digits( $count ) ) - int( digits( $current ) );
-
-            $progress .= ( "." x $dots );
-            $progress .= " ";
-
-            print STDOUT $progress;
-        }
-        elsif ( $verbosity > 0 )
-        {
-            print STDOUT ".";
-        }
-
-        # retrieve the current ignore list
-        open( SVN, "svn propget svn:ignore $module 2>&1 |" );
-        my @ignore_list = <SVN>;
-        close( SVN );
-
-        # the last item in the list is an empty string, usually. Don't let it confuse the below
-        # code
-        my $supposed_empty = pop @ignore_list;
-        chomp( $supposed_empty );
-        push( @ignore_list, $supposed_empty ) if ( !( $supposed_empty =~ /^$/ ) );
-
-        # filter out obsolte entries
-        my @stripped_ignore_list = ();
-        foreach $ignore_entry (@ignore_list)
-        {
-            chomp( $ignore_entry );
-            next if ( $ignore_entry =~ /^$/ );
-
-            if  (   ( exists $obsolete_platforms{$ignore_entry} )
-                ||  ( exists $obsolete_platforms{"$ignore_entry.pro"} )
-                )
-            {
-                next;
-            }
-            push @stripped_ignore_list, $ignore_entry;
-        }
-        my $removed = $#ignore_list - $#stripped_ignore_list;
-        @ignore_list = @stripped_ignore_list;
-
-        # append the platforms which should appear in the ignore list
-        my %ignore_list = ();
-        foreach (@ignore_list) { $ignore_list{$_} = 1; }
-        foreach $platform_entry ( @platforms )
-        {
-            $ignore_list{$platform_entry} = 1;
-            $ignore_list{"$platform_entry.pro"} = 1;
-        }
-        my @extended_ignore_list = keys %ignore_list;
-        my $added = $#extended_ignore_list - $#ignore_list;
-        @ignore_list = @extended_ignore_list;
-
-        if ( $removed || $added )
-        {
-            # create a temporary file taking the new content of the svn_ignore property
-            my $temp_dir = tempdir( CLEANUP => 1 );
-            my ($fh, $filename) = tempfile( DIR => $dir );
-            open( IGNORE, ">$filename" );
-            print IGNORE join "\n", @ignore_list;
-            close( IGNORE );
-
-            # actually set the property
-            open( SVN, "svn propset -F $filename svn:ignore $module 2>&1 |" );
-
-            ++$updated;
-        }
-
-        # statistics
-        print STDOUT "done (removed/added: $removed/$added)\n" if $verbosity > 1;
-    }
-
-    print STDOUT "\n" if $verbosity eq 1;
-    print STDOUT "$updated module(s) updated\n" if $verbosity > 0;
-}
-
-# .........................................................................
-sub digits
-{
-    my ($number, $base) = @_;
-    $base = 10 if !defined $base;
-    return log($number)/log($base);
-}
-
-# .........................................................................
-# 'main'
-
-# initialize verbosity
-my $verbose = $ENV{VERBOSE};
-if ( defined $verbose )
-{
-    $verbose = uc( $verbose );
-    $verbosity = 2 if ( $verbose eq "TRUE" );
-    $verbosity = 0 if ( $verbose eq "FALSE" );
-}
-
-# work on the current directory
-my $working_copy_root = cwd();
-die "current directory does not contain an SVN working copy" if !-d $working_copy_root . "/\.svn";
-
-# retrieve repository URL
-my $repo_url = retrieve_repo_url();
-die "unable to retrieve repository URL" if !defined $repo_url;
-print STDOUT "repository URL: $repo_url\n" if $verbosity > 1;
-
-# list modules
-my @modules = get_modules( $repo_url );
-print STDOUT "processing " . ( $#modules + 1 ) . " modules\n" if $verbosity > 0;
-
-# process modules, by setting the svn:ignore property
-set_ignore_property( $repo_url, @modules );
diff --git a/solenv/bin/zipdep.pl b/solenv/bin/zipdep.pl
index f19f79f00e52..b92ee1d6221e 100755
--- a/solenv/bin/zipdep.pl
+++ b/solenv/bin/zipdep.pl
@@ -33,17 +33,6 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 use Cwd;
 
-#### script id #####
-
-( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
-
-$id_str = ' $Revision: 1.12 $ ';
-$id_str =~ /Revision:\s+(\S+)\s+\$/
-  ? ($script_rev = $1) : ($script_rev = "-");
-
-print STDERR "$script_name -- version: $script_rev\n";
-print STDERR "Multi Platform Enabled Edition\n";
-
 #########################
 #                       #
 #   Globale Variablen   #
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
deleted file mode 100644
index 254f3b5f45cc..000000000000
--- a/solenv/config/sdev300.ini
+++ /dev/null
@@ -1,3483 +0,0 @@
-common
-{
-    environment
-    {
-        common
-        {
-            ADDED_MODULES solenv default_images custom_images ooo_custom_images external_images postprocess instset_native instsetoo_native smoketest_native smoketestoo_native
-            BIG_SVX TRUE
-            BMP_WRITES_FLAG TRUE
-            BUILD_SPECIAL TRUE
-            BUILD_STAX YES
-            BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT LIBTEXTCAT LIBTEXTCATDATA AFMS CAIRO
-            CONFIG_PROJECT config_office
-            DIC_ALL TRUE
-            ENABLEUNICODE TRUE
-            ENABLE_AGG YES
-            ENABLE_CUPS TRUE
-            ENABLE_DIRECTX TRUE
-            ENABLE_FONTCONFIG TRUE
-            ENABLE_GTK TRUE
-            ENABLE_MEDIAWIKI YES
-            ENABLE_MINIMIZER YES
-            ENABLE_MYSQLC YES
-            ENABLE_NSS_MODULE YES
-            ENABLE_RANDR TRUE
-            ENABLE_REPORTBUILDER YES
-            ENABLE_SVCTAGS YES
-            ISERVER iserver.germany.sun.com
-            LU_HGFLAG ""
-            LU_NOSOURCE ""
-            LU_RFLAG ""
-            NEW_JAR_PACK TRUE
-            NO_REC_RES TRUE
-            OOODMAKEMODE YES
-            OOO_SHELL /bin/bash
-            PCLEAN_PATH xxx
-            RES_ENUS TRUE
-            RES_GER TRUE
-            rsc_once TRUE
-            SHIPDRIVE /so/install
-            STLPORT4 NO_STLPORT4
-            STLPORT_VER 400
-            WITH_FONTOOO YES
-            WITH_LDAP YES
-            wrapper_override_cc_wrapper TRUE
-            MAXPROC maxproc=15
-            XINERAMA_LINK dynamic
-        }
-        common:0 IF %UPDATER% == YES
-        {
-            DEFAULT_TO_ENGLISH_FOR_PACKING 1
-            DISABLE_SAL_DBGBOX 1
-        }
-        common:1 IF X%CWS_WORK_STAMP%X != XX
-        {
-            CWS_WORK_STAMP_EXT _%CWS_WORK_STAMP%
-        }
-        common:2 IF %UPDATER% == YES
-        {
-            WITH_LANG en-US de
-        }
-        common:3 IF %UPDATER% != YES
-        {
-        }
-        crashdump
-        {
-            ENABLE_CRASHDUMP TRUE
-        }
-        hg
-        {
-            LU_HGFLAG hg_source
-        }
-        maxproc
-        {
-            MAXPROC maxproc=%MAXPROCESS%
-        }
-        minorext
-        {
-            UPDMINOREXT .%UPDMINOR%
-        }
-        nosource
-        {
-            LU_NOSOURCE no_source
-        }
-        pro:0 IF %UPDATER% == YES
-        {
-            product full
-            PROEXT .pro
-            PROFULLSWITCH product=full
-            WITH_LANG en-US de es fr hu it ja ko nl pl pt pt-BR ru sv th tr zh-CN zh-TW ar
-        }
-        pro:1 IF %UPDATER% != YES
-        {
-            product full
-            PROEXT .pro
-            PROFULLSWITCH product=full
-        }
-
-        r_only
-        {
-            LU_RFLAG r_only
-        }
-        tmp
-        {
-            SOL_TMP %SOL_TMP_DIR%
-        }
-        verbose
-        {
-            VERBOSE VERBOSE
-        }
-    }
-    extern
-    {
-        ENVROOT
-        PATH
-        SRC_ROOT
-        UPDATER
-    }
-    order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 tmp crashdump maxproc hg r_only nosource 
-    reset
-    {
-        ALT_L10N_MODULE
-        ENVCFLAGS
-        HOMEDRIVE
-        HOMEPATH
-        JAVAHOME
-        JAVA_HOME
-        LU_HGFLAG
-        LU_NOSOURCE
-        LU_RFLAGS
-        MKDIRHIER
-        PROEXT
-        PROFULLSWITCH
-        SHIPDRIVE
-        SOLARSRC
-        SOLAR_JAVA
-        SPEW
-        STLPORT4
-        UPDMINOREXT
-        WITH_FONTOOO
-    }
-    restore
-    {
-        PATH
-    }
-    standlst
-    {
-        DRIVE_O %WORK_STAMP%/drives/o:/UnixVolume
-        DRIVE_S %WORK_STAMP%/drives/s:/UnixVolume
-    }
-    switches
-    {
-        crashdump
-        cwsname CWS_WORK_STAMP
-        envroot
-        hg
-        minorext
-        nosource
-        pro
-        maxproc MAXPROCESS
-        r_only
-        tmp SOL_TMP_DIR
-        verbose VERBOSE
-        with_lang
-    }
-}
-finish
-{
-    environment
-    {
-        cap
-        {
-            SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-            SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
-        }
-        cax
-        {
-            SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-            SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
-        }
-        common_0:0 IF %OS% == MACOSX
-        {
-            ENABLE_GTK
-            SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% -I%SOLARENV%$/%OUTPATH%$/inc -I%SOLARENV%$/inc %SOLAREXTRAINC%
-        }
-        common_0:3 IF %SOLARINCLUDES% ==
-        {
-            SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% %PSDKINC% -I%COMPATH%$/include -I%SOLARENV%$/inc %SOLAREXTRAINC%
-        }
-        common_1
-        {
-        BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy
-        BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple
-            DPKG %BUILD_TOOLS%$/dpkg
-            OOO_JUNIT_JAR %SOLARROOT%$/btools$/junit-4.8.1.jar
-            PATH .$:$cp(%SOLARENV%$/bin)$:$cp(%COMMON_BUILD_TOOLS%)$:$cp(%BUILD_TOOLS%$/dmake412)$:$cp(%BUILD_TOOLS%)$:$cp(%COMMON_ENV_TOOLS%)$:$cp(%ENV_TOOLS%)$:$cp(%COMPATH%$/bin)$:$cp(%JDKPATH%)$:$cp(%PATHEXTRA%)$:%PATH%
-            PATH_SEPERATOR $;
-            SOLARINC -I%SOLAR_STLPATH% -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/external %SOLARINCLUDES%
-            SOLARLIB -L%SOLARVER%/%INPATH%/lib%UPDMINOREXT% %JDKLIBS% %SOLAREXTRALIB%
-            SOLARSRC %SRC_ROOT%
-            SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
-            ANT_HOME %COMMON_BUILD_TOOLS%$/apache-ant-1.7.1
-            WORKDIR %SOLARVERSION%/%INPATH%/workdir
-            OUTDIR %SOLARVERSION%/%INPATH%
-
-        }
-        common_2:0 IF X%CWS_WORK_STAMP%X == XX
-        {
-            MWS_BUILD TRUE
-            DELIVER_TO_ZIP TRUE
-            gb_MAKETARGET packmodule
-        }
-        common_a
-        {
-            *o: cd %SOLARSRC%
-            ALT_L10N_MODULE $expand(%SOLARSRC%/..)/sun/l10n_so
-            TARFILE_LOCATION %SOURCE_ROOT_DIR%/ext_sources
-            gb_REPOS %SOURCE_ROOT_DIR%/ooo %SOURCE_ROOT_DIR%/sun
-            gb_LOCALBUILDDIR %SOL_TMP%/gb_%CWS_WORK_STAMP%/%WORK_STAMP%
-        }
-        common_setrepo:0 IF X%WITH_LANG%X != XX
-        {
-            gb_REPOS %gb_REPOS% %SOURCE_ROOT_DIR%/l10n 
-            BUILD_TYPE %BUILD_TYPE% L10N
-        }
-        common_jre:0 IF %JREPATH% ==
-        {
-            HIER set
-        }
-        common_jre:1 IF %LD_LIBRARY_PATH% ==
-        {
-            PATH %PATH%$:$cp(%JREPATH%)
-        }
-        cwsname:0 IF X%SOURCE_ROOT_USED%X == XX
-        {
-            *build
-            *deliver
-            DMAKEROOT SOURCE_ROOT_not_used
-            SOLARINC SOURCE_ROOT_not_used
-            SOLARINCLUDE SOURCE_ROOT_not_used
-            SOLARSRC SOURCE_ROOT_not_used
-            SOLARVER SOURCE_ROOT_not_used
-            SOLARVERSION SOURCE_ROOT_not_used
-            SOLAR_SOURCE_ROOT SOURCE_ROOT_not_used
-            SO_GEN_ERROR Error - Using -cwsname without -sourceroot switch is harmful...
-            SO_GEN_ERROR2 ...resetting path to source tree
-            SRC_ROOT SOURCE_ROOT_not_used
-        }
-        cwsname:1 IF X%SOURCE_ROOT%X == XX
-        {
-            *build
-            *deliver
-            DMAKEROOT SOURCE_ROOT_not_set
-            SOLARINC SOURCE_ROOT_not_set
-            SOLARINCLUDE SOURCE_ROOT_not_set
-            SOLARSRC SOURCE_ROOT_not_set
-            SOLARVER SOURCE_ROOT_not_set
-            SOLARVERSION SOURCE_ROOT_not_set
-            SOLAR_SOURCE_ROOT SOURCE_ROOT_not_set
-            SO_GEN_ERROR Error - Using -cwsname without SOURCE_ROOT set is harmful...
-            SO_GEN_ERROR2 ...resetting path to source tree
-            SRC_ROOT SOURCE_ROOT_not_set
-        }
-        cwsname:2 IF X%UPDMINOR%X == XX
-        {
-            *build
-            *deliver
-            DMAKEROOT UPDMINOR_not_used
-            SOLARINC UPDMINOR_not_used
-            SOLARINCLUDE UPDMINOR_not_used
-            SOLARSRC UPDMINOR_not_used
-            SOLARVER UPDMINOR_not_used
-            SOLARVERSION UPDMINOR_not_used
-            SOLAR_SOURCE_ROOT UPDMINOR_not_used
-            SO_GEN_ERROR Error - Using -cwsname without -ver switch is harmful...
-            SO_GEN_ERROR2 ...resetting path to source tree
-            SRC_ROOT UPDMINOR_not_used
-        }
-        jdk14
-        {
-            CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
-            ILIB %LIB%$;%JDKLIB%
-            LIB %LIB%$;%JDKLIB%
-            JAVA_TARGET_FLAG -target 1.4
-        }
-        jdk15
-        {
-            CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
-            ILIB %LIB%$;%JDKLIB%
-            LIB %LIB%$;%JDKLIB%
-            JAVA_TARGET_FLAG -target 1.5
-        }
-        l10n
-        {
-            framework %L10N_framework%
-            L10N-framework %L10N_framework%
-        }
-        ojdk16
-        {
-            CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
-            ILIB %LIB%$;%JDKLIB%
-            LIB %LIB%$;%JDKLIB%
-            JAVA_TARGET_FLAG -target 1.6
-        }
-    }
-    order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 cax cap common_a common_setrepo:0 
-    switches
-    {
-        cwsname CWS_WORK_STAMP
-    }
-}
-unxfbsdi
-{
-    environment
-    {
-        bs_sourceroot
-        {
-            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-            SOURCE_ROOT %SOURCE_ROOT_TMP%
-            SOURCE_ROOT_USED TRUE
-        }
-        cap
-        {
-            COPYALL TRUE
-            COPY_PACKED TRUE
-            DEVROOT %SOL_TMP%$/r
-            PCLEAN_PATH %SOLARROOT%/etools
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-        }
-        cax
-        {
-            COPYALL FALSE
-            DEVROOT %SOL_TMP%$/r
-            PCLEAN_PATH %SOL_TMP%$/r/etools
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-        }
-        common
-        {
-            *build nice perl %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-            *build_client nice perl %SOLARENV%/bin/build_client.pl
-            *copyprj perl %COMMON_ENV_TOOLS%/copyprj.pl
-            *deliver perl %SOLARENV%/bin/deliver.pl
-            *mkout perl %SOLARENV%/bin/mkout.pl
-            *r: cd %SOLARROOT%
-            *s: cd %SOLARVERSION%
-            *zipdep perl %SOLARENV%/bin/zipdep.pl
-            COPYPRJ perl %COMMON_ENV_TOOLS%/copyprj.pl
-            DELIVER perl %SOLARENV%/bin/deliver.pl
-            DMAKEROOT %SOLARENV%/inc/startup
-            LD_LIBRARY_PATH .:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%:%COMPATH%/libexec
-            MKOUT perl %SOLARENV%/bin/mkout.pl
-            PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
-            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
-            SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
-            SOLAR_JAVA TRUE
-            ZIPDEP perl %SOLARENV%/bin/zipdep.pl
-            ENABLE_GCONF YES
-            ENABLE_GNOMEVFS YES
-            SYSTEM_LIBRSVG YES
-            SYSTEM_LIBCROCO YES
-            SYSTEM_GDKPIXBUF YES
-            SYSTEM_GLIB YES
-            SYSTEM_GETTEXT YES
-            SYSTEM_PANGO YES
-            SYSTEM_LIBPNG YES
-            SYSTEM_LIBJPEG YES
-            SYSTEM_LIBGSF YES
-        }
-        common0
-        {
-            SOLAR_ENV_ROOT /so/env
-            SOLAR_SOURCE_ROOT %DRIVE_O%
-        }
-        common1
-        {
-            COMPATH %SOLAR_ENV_ROOT%$/gcc_3.0.1_linux_libc2.11_turbolinux
-            DEVROOT %SOLAR_ENV_ROOT%
-            PKGFORMAT some_dummy
-            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-            SOLARROOT %SOLAR_ENV_ROOT%
-            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.3.1
-            SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2_11
-            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_06
-            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-        }
-        common2
-        {
-            BUILD_TOOLS %SOLARROOT%/bt_unxfbsdi/bin
-            COM GCC
-            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-            COMMON_ENV_TOOLS %SOLARROOT%$/etools
-            CPU I
-            CPUNAME INTEL
-            CVER C300
-            ENV_TOOLS %SOLARROOT%/et_unxfbsdi/bin
-            GUI UNX
-            GUIBASE unx
-            GVER VCL
-            INPATH unxfbsdi%PROEXT%
-            JDK13PATH %SOLAR_JDK13PATH%
-            JDK14PATH %SOLAR_JDK14PATH%
-            JDK15PATH %SOLAR_JDK15PATH%
-            NO_BSYMBOLIC True
-            OS FREEBSD
-            OUTPATH unxfbsdi
-            SOLAR_STLLIBPATH %SOLARVERSION%$/unxfbsdi%PROEXT%$/lib%UPDMINOREXT%
-            SOLAR_STLPATH %SOLARVERSION%$/unxfbsdi%PROEXT%$/inc%UPDMINOREXT%$/stl
-            SYSBASE %SOLAR_SYSBASE_ROOT%
-            TEMP /tmp
-            TMP /tmp
-        }
-        compath
-        {
-            COMPATH %STAR_COMPATH%
-        }
-        debug
-        {
-            LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
-        }
-        distroot:0 if X%DIST_ROOT%X != XX
-        {
-            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-            SOLARVER %DIST_ROOT%/%WORK_STAMP%
-            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-        }
-        envroot:0 IF X%ENV_ROOT%X != XX
-        {
-            SOLAR_ENV_ROOT %ENV_ROOT%
-        }
-        jdk14
-        {
-            JAVA_HOME %JDK14PATH%
-            JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
-            JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/linux
-            JDKLIB %JDK14PATH%/jre/lib:%JDK14PATH%/jre/lib/i386:%JDK14PATH%/jre/lib/i386/client
-            JDKLIBS -L%JDK14PATH%/jre/lib -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/jre/lib/i386/client
-            JDKPATH %JDK14PATH%/bin
-            JDK_VERSION 142
-            XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
-        }
-        jdk14path:0 IF X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK14PATH %JDK_PATH%
-        }
-        jdk15
-        {
-            JAVA_HOME %JDK15PATH%
-            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-            JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/i386:%JDK15PATH%/jre/lib/i386/client
-            JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/jre/lib/i386/client
-            JDKPATH %JDK15PATH%/bin
-            JDK_VERSION 150
-            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-        }
-        jdk15path:0 IF X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK15PATH %JDK_PATH%
-        }
-        pro
-        {
-            PROSWITCH -DPRODUCT
-        }
-        sourceroot:0 IF X%SOURCE_ROOT%X != XX
-        {
-            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-            SOURCE_ROOT_USED TRUE
-        }
-        sysbaseroot
-        {
-            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-        }
-    }
-    extern
-    {
-        DIST_ROOT
-        ENV_ROOT
-        HOME
-        JDK_PATH
-        LOCALINI
-        SOL_TMP
-        SOURCE_ROOT
-        SYSBASE_ROOT
-        USER
-    }
-    order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15 debug
-    reset
-    {
-        CLASSPATH
-        COPYALL
-    }
-    restore
-    {
-        INCLUDE
-    }
-    script
-    {
-        csh 
-        {
-            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            600: umask 002
-            800: rehash
-            820: wrapfetch.sh
-            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-        }
-        sh
-        {
-            400: if [ $COPYALL ]; then
-            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            415: fi
-            600: umask 002
-            800: hash -r
-            820: wrapfetch.sh
-            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-            851: export SO_GEN_ERROR
-            852: fi
-            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-            861: export SO_GEN_ERROR2
-            862: fi
-            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-            871: echo $SO_GEN_ERROR
-            872: fi
-            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-            881: echo $SO_GEN_ERROR2
-            882: fi
-        }
-    }
-    switches
-    {
-        bs_sourceroot SOURCE_ROOT_TMP
-        bsclient
-        cap
-        cax
-        compath STAR_COMPATH
-        debug
-        distroot
-        envroot
-        jdk14
-        jdk14path
-        jdk15
-        jdk15path
-        l10n L10N_framework
-        pro
-        sourceroot
-        sysbaseroot
-    }
-}
-unxlngi6
-{
-    environment
-    {
-        bs_sourceroot
-        {
-            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-            SOURCE_ROOT %SOURCE_ROOT_TMP%
-            SOURCE_ROOT_USED TRUE
-        }
-        cap
-        {
-            COPYALL TRUE
-            COPY_PACKED TRUE
-            DEVROOT %SOL_TMP%$/r
-            PCLEAN_PATH %SOLARROOT%/etools
-            PERL %SOL_TMP%$/r$/bt_linux_libc2.5$/%WORK_STAMP%$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-        }
-        cax
-        {
-            COPYALL FALSE
-            DEVROOT %SOL_TMP%$/r
-            PCLEAN_PATH %SOL_TMP%$/r/etools
-            PERL %SOL_TMP%$/r$/bt_linux_libc2.5$/%WORK_STAMP%$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-        }
-        common
-        {
-            *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-            *build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-            *deliver %PERL% %SOLARENV%/bin/deliver.pl
-            *mkout %PERL% %SOLARENV%/bin/mkout.pl
-            *r: cd %SOLARROOT%
-            *s: cd %SOLARVERSION%
-            *zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-            DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-            DMAKEROOT %SOLARENV%/inc/startup
-            HAVE_GCC_VISIBILITY_FEATURE TRUE
-            HAVE_LD_BSYMBOLIC_FUNCTIONS TRUE
-            HAVE_LD_HASH_STYLE TRUE
-            LIBRARY_PATH %SYSBASE%/usr/lib
-            MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-            PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
-            FREETYPE_CFLAGS -I%SYSBASE%/usr/include/freetype2
-            VALGRIND_CFLAGS -I%SOLARVERSION%$/unxlngi6%PROEXT%$/inc%UPDMINOREXT%/valgrind
-            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
-            SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
-            SOLAR_JAVA TRUE
-            ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-            ENABLE_GCONF TRUE
-            ENABLE_GNOMEVFS TRUE
-            GNUCOPY cp
-            GNUMAKE make
-            SYSTEM_LIBRSVG YES
-            SYSTEM_LIBCROCO YES
-            SYSTEM_GDKPIXBUF YES
-            SYSTEM_GLIB YES
-            SYSTEM_GETTEXT YES
-            SYSTEM_PANGO YES
-            SYSTEM_LIBPNG YES
-            SYSTEM_LIBJPEG YES
-            SYSTEM_LIBGSF YES
-        }
-        common0
-        {
-            SOLAR_ENV_ROOT /so/env
-            SOLAR_SOURCE_ROOT %DRIVE_O%
-            SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.5/glibc2.5
-        }
-        common1
-        {
-            COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.5
-            DEVROOT %SOLAR_ENV_ROOT%
-            LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-            PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.5/%WORK_STAMP%/bin/perl
-            PKGFORMAT rpm
-            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-            SOLARROOT %SOLAR_ENV_ROOT%
-            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.3.1
-            SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2_11
-            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_06
-            SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
-            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-            PKG_CONFIG_LIBDIR %SOLAR_SYSBASE_ROOT%/usr/lib/pkgconfig
-            KDE_ROOT /so/env/kde/linux/kde-3.2.2
-        }
-        common2
-        {
-            ENABLE_GRAPHITE TRUE
-            ENABLE_GSTREAMER TRUE
-            BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.5/%WORK_STAMP%/bin
-            COM GCC
-            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-            COMMON_ENV_TOOLS %SOLARROOT%$/etools
-            CPU I
-            CPUNAME INTEL
-            CVER C432
-            ENABLE_KAB TRUE
-            ENABLE_KDE TRUE
-            ENABLE_EVOAB2 TRUE
-            ENV_TOOLS %SOLARROOT%/et_linux_libc2.5/%WORK_STAMP%/bin
-            GUI UNX
-            GUIBASE unx
-            GVER VCL
-            INPATH unxlngi6%PROEXT%
-            JDK13PATH %SOLAR_JDK13PATH%
-            JDK14PATH %SOLAR_JDK14PATH%
-            JDK15PATH %SOLAR_JDK15PATH%
-            LIBMYSQL_PATH %SOLARROOT%/mysql-connector-c-6.0.2/unxlngi6
-            NO_BSYMBOLIC True
-            OJDK16PATH %SOLAR_OJDK16PATH%
-            OS LINUX
-            OUTPATH unxlngi6
-            RPM %SOLARENV%/bin/rpm-wrapper
-            SOLAR_STLLIBPATH %SOLARVERSION%$/unxlngi6%PROEXT%$/lib%UPDMINOREXT%
-            SOLAR_STLPATH %SOLARVERSION%$/unxlngi6%PROEXT%$/inc%UPDMINOREXT%$/stl
-            SYSBASE %SOLAR_SYSBASE_ROOT%
-            TEMP /tmp
-            TMP /tmp
-            GTK_CFLAGS -I%SOLAR_SYSBASE_ROOT%/usr/include/gtk-2.0 -I%SOLAR_SYSBASE_ROOT%/usr/lib/gtk-2.0/include -I%SOLAR_SYSBASE_ROOT%/usr/include/atk-1.0 -I%SOLAR_SYSBASE_ROOT%/usr/include/cairo -I%SOLAR_SYSBASE_ROOT%/usr/include/pango-1.0 -I%SOLAR_SYSBASE_ROOT%/usr/include/glib-2.0 -I%SOLAR_SYSBASE_ROOT%/usr/lib/glib-2.0/include
-            GTK_LIBS -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
-            KDE_CFLAGS -I%KDE_ROOT%/include -DQT_CLEAN_NAMESPACE
-            KDE_LIBS -L%KDE_ROOT%/lib -lkdeui -lkdecore -lqt-mt
-        }
-        common3:0 IF X%UPDATER%X == XX
-        {
-            FORCE2ARCHIVE TRUE
-        }
-        compath
-        {
-            COMPATH %STAR_COMPATH%
-        }
-        distroot:0 if X%DIST_ROOT%X != XX
-        {
-            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-            SOLARVER %DIST_ROOT%/%WORK_STAMP%
-            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-        }
-        envroot:0 IF X%ENV_ROOT%X != XX
-        {
-            SOLAR_ENV_ROOT %ENV_ROOT%
-        }
-        jdk14
-        {
-            JAVA_HOME %JDK14PATH%
-            JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
-            JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/linux
-            JDKLIB %JDK14PATH%/jre/lib:%JDK14PATH%/jre/lib/i386:%JDK14PATH%/jre/lib/i386/client
-            JDKLIBS -L%JDK14PATH%/jre/lib -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/jre/lib/i386/client
-            JDKPATH %JDK14PATH%/bin
-            JDK_VERSION 142
-            XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
-        }
-        jdk14path:0 IF X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK14PATH %JDK_PATH%
-        }
-        jdk15
-        {
-            JAVA_HOME %JDK15PATH%
-            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-            JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/i386:%JDK15PATH%/jre/lib/i386/client:%JDK15PATH%/jre/lib/i386/xawt
-            JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/jre/lib/i386/client
-            JDKPATH %JDK15PATH%/bin
-            JDK_VERSION 150
-            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-        }
-        jdk15path:0 IF X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK15PATH %JDK_PATH%
-        }
-        ojdk16
-        {
-            JAVA_HOME %OJDK16PATH%
-            JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
-            JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
-            JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/jre/lib/i386/client:%OJDK16PATH%/jre/lib/i386/xawt
-            JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/jre/lib/i386/client
-            JDKPATH %OJDK16PATH%/bin
-            JDK_VERSION 160
-            XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-        }
-        ojdk16path:0 IF X%JDK_PATH%X != XX
-        {
-            SOLAR_OJDK16PATH %JDK_PATH%
-        }
-        pro
-        {
-            PROSWITCH -DPRODUCT
-        }
-        sourceroot:0 IF X%SOURCE_ROOT%X != XX
-        {
-            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-            SOURCE_ROOT_USED TRUE
-        }
-        sysbaseroot
-        {
-            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-        }
-    }
-    extern
-    {
-        DIST_ROOT
-        ENV_ROOT
-        HOME
-        JDK_PATH
-        LOCALINI
-        SOL_TMP
-        SOURCE_ROOT
-        SYSBASE_ROOT
-        USER
-    }
-    order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2 pro common3:0 common jdk14 jdk15 ojdk16
-    reset
-    {
-        CLASSPATH
-        COPYALL
-    }
-    restore
-    {
-        INCLUDE
-    }
-    script
-    {
-        csh 
-        {
-            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            600: umask 002
-            800: rehash
-            820: wrapfetch.sh
-            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-        }
-        sh
-        {
-            400: if [ $COPYALL ]; then
-            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            415: fi
-            600: umask 002
-            800: hash -r
-            820: wrapfetch.sh
-            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-            851: export SO_GEN_ERROR
-            852: fi
-            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-            861: export SO_GEN_ERROR2
-            862: fi
-            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-            871: echo $SO_GEN_ERROR
-            872: fi
-            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-            881: echo $SO_GEN_ERROR2
-            882: fi
-        }
-    }
-    switches
-    {
-        bs_sourceroot SOURCE_ROOT_TMP
-        bsclient
-        cap
-        cax
-        compath STAR_COMPATH
-        debug
-        distroot
-        envroot
-        jdk14
-        jdk14path
-        jdk15
-        jdk15path
-        l10n L10N_framework
-        ojdk16
-        ojdk16path
-        pro
-        sourceroot
-        sysbaseroot
-    }
-}
-
-unxlngx6
-{
-    environment
-    {
-        bs_sourceroot
-        {
-            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-            SOURCE_ROOT %SOURCE_ROOT_TMP%
-            SOURCE_ROOT_USED TRUE
-        }
-        cap
-        {
-            COPYALL TRUE
-            COPY_PACKED TRUE
-            DEVROOT %SOL_TMP%$/r
-            PCLEAN_PATH %SOLARROOT%/etools
-            PERL %SOL_TMP%$/r$/bt_linux64_libc2.5$/%WORK_STAMP%$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-        }
-        cax
-        {
-            COPYALL FALSE
-            DEVROOT %SOL_TMP%$/r
-            PCLEAN_PATH %SOL_TMP%$/r/etools
-            PERL %SOL_TMP%$/r$/bt_linux64_libc2.5$/%WORK_STAMP%$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-        }
-        common
-        {
-            *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-            *build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-            *deliver %PERL% %SOLARENV%/bin/deliver.pl
-            *mkout %PERL% %SOLARENV%/bin/mkout.pl
-            *r: cd %SOLARROOT%
-            *s: cd %SOLARVERSION%
-            *zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-            DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-            DMAKEROOT %SOLARENV%/inc/startup
-            HAVE_GCC_VISIBILITY_FEATURE TRUE
-            HAVE_LD_BSYMBOLIC_FUNCTIONS TRUE
-            HAVE_LD_HASH_STYLE TRUE
-            LIBRARY_PATH %SYSBASE%/usr/lib64
-            MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-            PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
-            FREETYPE_CFLAGS -I%SYSBASE%/usr/include/freetype2
-            VALGRIND_CFLAGS -I%SOLARVERSION%$/unxlngx6%PROEXT%$/inc%UPDMINOREXT%/valgrind
-            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
-            SOLAREXTRALIB -L../lib64 -L%SYSBASE%/lib -L%SYSBASE%/usr/lib64 -L%SOLAR_STLLIBPATH%
-            SOLAR_JAVA TRUE
-            ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-            ENABLE_GCONF TRUE
-            ENABLE_GNOMEVFS TRUE
-            GNUMAKE make
-            SYSTEM_LIBRSVG YES
-            SYSTEM_LIBCROCO YES
-            SYSTEM_GDKPIXBUF YES
-            SYSTEM_GLIB YES
-            SYSTEM_GETTEXT YES
-            SYSTEM_PANGO YES
-            SYSTEM_LIBPNG YES
-            SYSTEM_LIBJPEG YES
-            SYSTEM_LIBGSF YES
-        }
-        common0
-        {
-            SOLAR_ENV_ROOT /so/env
-            SOLAR_SOURCE_ROOT %DRIVE_O%
-            SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc2.5/glibc2.5
-        }
-        common1
-        {
-            COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc2.5
-            DEVROOT %SOLAR_ENV_ROOT%
-            PERL %SOLAR_ENV_ROOT%/bt_linux64_libc2.5/%WORK_STAMP%/bin/perl
-            PKGFORMAT rpm
-            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-            SOLARROOT %SOLAR_ENV_ROOT%
-            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2.32
-            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_15.x64
-            SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-amd64
-            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-            USE_SYSTEM_STL YES
-            XAU_LIBS -lXau
-            PKG_CONFIG_LIBDIR %SOLAR_SYSBASE_ROOT%/usr/lib/pkgconfig
-            KDE_ROOT /so/env/kde/linux-x64/kde-3.5.10
-        }
-        common2
-        {
-            PKG_CONFIG_PATH %COMPATH%/glibc2.5/usr/lib64/pkgconfig
-            ENABLE_GRAPHITE TRUE
-            ENABLE_GSTREAMER TRUE
-            BUILD_TOOLS %SOLARROOT%/bt_linux64_libc2.5/%WORK_STAMP%/bin
-            COM GCC
-            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-            COMMON_ENV_TOOLS %SOLARROOT%$/etools
-            CPU X
-            CPUNAME INTEL
-            CVER C341
-            ENABLE_KAB TRUE
-            ENABLE_KDE TRUE
-            ENV_TOOLS %SOLARROOT%/et_linux64_libc2.5/%WORK_STAMP%/bin
-            GUI UNX
-            GUIBASE unx
-            GUIENV sal
-            GVER VCL
-            INPATH unxlngx6%PROEXT%
-            JDK14PATH %SOLAR_JDK14PATH%
-            JDK15PATH %SOLAR_JDK15PATH%
-            LIBMYSQL_PATH %SOLARROOT%/mysql-connector-c-6.0.2/unxlngx6
-            NO_BSYMBOLIC True
-            OJDK16PATH %SOLAR_OJDK16PATH%
-            OS LINUX
-            OUTPATH unxlngx6
-            PA_VER 18
-            RPM %SOLARENV%/bin/rpm-wrapper
-            SOLARUPD %UPD%
-            SOLAR_STLLIBPATH %SOLARVERSION%$/unxlngx6%PROEXT%$/lib%UPDMINOREXT%
-            SOLAR_STLPATH %SOLARVERSION%$/unxlngx6%PROEXT%$/inc%UPDMINOREXT%$/stl
-            SYSBASE %SOLAR_SYSBASE_ROOT%
-            TEMP /tmp
-            TMP /tmp
-            GTK_CFLAGS -I%SOLAR_SYSBASE_ROOT%/usr/include/gtk-2.0 -I%SOLAR_SYSBASE_ROOT%/usr/lib/gtk-2.0/include -I%SOLAR_SYSBASE_ROOT%/usr/include/atk-1.0 -I%SOLAR_SYSBASE_ROOT%/usr/include/cairo -I%SOLAR_SYSBASE_ROOT%/usr/include/pango-1.0 -I%SOLAR_SYSBASE_ROOT%/usr/include/glib-2.0 -I%SOLAR_SYSBASE_ROOT%/usr/lib/glib-2.0/include
-            GTK_LIBS -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
-            KDE_CFLAGS -I%KDE_ROOT%/include -DQT_CLEAN_NAMESPACE
-            KDE_LIBS -L%KDE_ROOT%/lib64 -L%KDE_ROOT%/lib -lkdeui -lkdecore -lqt-mt
-        }
-        common3:0 IF X%UPDATER%X == XX
-        {
-            FORCE2ARCHIVE TRUE
-        }
-        compath
-        {
-            COMPATH %STAR_COMPATH%
-        }
-        distroot:0 if X%DIST_ROOT%X != XX
-        {
-            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-            SOLARVER %DIST_ROOT%/%WORK_STAMP%
-            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-        }
-        envroot:0 IF X%ENV_ROOT%X != XX
-        {
-            SOLAR_ENV_ROOT %ENV_ROOT%
-        }
-        jdk14
-        {
-            JAVA_HOME %JDK15PATH%
-            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-            JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/amd64:%JDK15PATH%/jre/lib/amd64/server:%JDK15PATH%/jre/lib/amd64/xawt
-            JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/amd64 -L%JDK15PATH%/jre/lib/amd64/server
-            JDKPATH %JDK15PATH%/bin
-            JDK_VERSION 150
-            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-        }
-        jdk14path:0 IF X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK14PATH %JDK_PATH%
-        }
-        jdk15
-        {
-            JAVA_HOME %JDK15PATH%
-            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-            JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/amd64:%JDK15PATH%/jre/lib/amd64/server:%JDK15PATH%/jre/lib/amd64/xawt
-            JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/amd64 -L%JDK15PATH%/jre/lib/amd64/server
-            JDKPATH %JDK15PATH%/bin
-            JDK_VERSION 150
-            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-        }
-        jdk15path:0 IF X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK15PATH %JDK_PATH%
-        }
-        ojdk16
-        {
-            JAVA_HOME %OJDK16PATH%
-            JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
-            JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
-            JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/amd64:%OJDK16PATH%/jre/lib/amd64/server:%OJDK16PATH%/jre/lib/amd64/xawt
-            JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/amd64 -L%OJDK16PATH%/jre/lib/amd64/server
-            JDKPATH %OJDK16PATH%/bin
-            JDK_VERSION 160
-            XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-        }
-        ojdk16path:0 IF X%JDK_PATH%X != XX
-        {
-            SOLAR_OJDK16PATH %JDK_PATH%
-        }
-        pro
-        {
-            PROSWITCH -DPRODUCT
-        }
-        sourceroot:0 IF X%SOURCE_ROOT%X != XX
-        {
-            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-            SOURCE_ROOT_USED TRUE
-        }
-        sysbaseroot
-        {
-            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-        }
-    }
-    extern
-    {
-        DIST_ROOT
-        ENV_ROOT
-        HOME
-        JDK_PATH
-        LOCALINI
-        SOL_TMP
-        SOURCE_ROOT
-        SYSBASE_ROOT
-        USER
-    }
-    order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2  common3:0 pro common jdk14 jdk15 ojdk16
-    reset
-    {
-        CLASSPATH
-        COPYALL
-    }
-    restore
-    {
-        INCLUDE
-    }
-    script
-    {
-        csh 
-        {
-            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            600: umask 002
-            800: rehash
-            820: wrapfetch.sh
-            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-        }
-        sh
-        {
-            400: if [ $COPYALL ]; then
-            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            415: fi
-            600: umask 002
-            800: hash -r
-            820: wrapfetch.sh
-            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-            851: export SO_GEN_ERROR
-            852: fi
-            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-            861: export SO_GEN_ERROR2
-            862: fi
-            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-            871: echo $SO_GEN_ERROR
-            872: fi
-            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-            881: echo $SO_GEN_ERROR2
-            882: fi
-        }
-    }
-    switches
-    {
-        bs_sourceroot SOURCE_ROOT_TMP
-        bsclient
-        cap
-        cax
-        compath STAR_COMPATH
-        debug
-        distroot
-        envroot
-        jdk14
-        jdk14path
-        jdk15
-        jdk15path
-        l10n L10N_framework
-        ojdk16
-        ojdk16path
-        pro
-        sourceroot
-        sysbaseroot
-    }
-}
-
-unxmacxi
-{
-    environment
-    {
-        bs_sourceroot
-        {
-            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-            SOURCE_ROOT %SOURCE_ROOT_TMP%
-            SOURCE_ROOT_USED TRUE
-        }
-        cap
-        {
-            COPYALL TRUE
-            COPY_PACKED TRUE
-            DEVROOT %SOL_TMP%$/r
-            PCLEAN_PATH %SOLARROOT%/etools
-            PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-        }
-        cax
-        {
-            COPYALL FALSE
-            DEVROOT %SOL_TMP%$/r
-            PCLEAN_PATH %SOL_TMP%$/r/etools
-            PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-        }
-        common
-        {
-            *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-            *build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-            *deliver %PERL% %SOLARENV%/bin/deliver.pl
-            *mkout %PERL% %SOLARENV%/bin/mkout.pl
-            *r: cd %SOLARROOT%
-            *s: cd %SOLARVERSION%
-            *zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-            DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-            DMAKEROOT %SOLARENV%/inc/startup
-            HAVE_GCC_VISIBILITY_FEATURE TRUE
-            LIBRARY_PATH %SYSBASE%/usr/lib
-            MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-            PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc
-            VALGRIND_CFLAGS -I%SOLARVERSION%$/unxmacxi%PROEXT%$/inc%UPDMINOREXT%/valgrind
-            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include/c++/4.0.0 -I%SYSBASE%/usr/include/c++/4.0.0/i686-apple-darwin8 -I%SYSBASE%/usr/lib/gcc/i686-apple-darwin8/4.0.1/include -I%SYSBASE%/usr/include/python2.3 -I%SYSBASE%/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin8/4.0.1/include -I%SYSBASE%/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon
-            SOLAREXTRALIB -L%SOLAR_STLLIBPATH%
-            SOLAR_JAVA TRUE
-            ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-            GNUCOPY gnucp
-            GNUMAKE make
-        }
-        common0
-        {
-            GXX_INCLUDE_PATH /so/env/gcc_4.0.1_macosx/usr/include/c++/4.0.0
-            SOLAR_ENV_ROOT /so/env
-            SOLAR_SOURCE_ROOT %DRIVE_O%
-            SOLAR_SYSBASE_ROOT /so/env/gcc_4.0.1_macosx
-            MACDEVSDK /so/env/gcc_4.0.1_macosx/MacOSX10.4u.sdk
-        }
-        common1
-        {
-            BUILD_OS_APPLEOSX TRUE
-            BUILD_OS_MAJOR 10
-            BUILD_OS_MINOR 4
-            BUILD_OS_REV 10
-            COMPATH %SOLAR_ENV_ROOT%$/gcc_4.0.1_macosx
-            DEVROOT %SOLAR_ENV_ROOT%
-            DISABLE_DEPRECATION_WARNING TRUE
-            EXTRA_CDEFS -DBUILD_OS_APPLEOSX -DBUILD_OS_MAJOR=10 -DBUILD_OS_MINOR=4 -DBUILD_OS_REV=10
-            EXTRA_CFLAGS -isysroot %COMPATH%/MacOSX10.4u.sdk
-            EXTRA_LINKFLAGS -Wl,-syslibroot,%COMPATH%/MacOSX10.4u.sdk
-            LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-            LIBXML_CFLAGS -I%COMPATH%/MacOSX10.4u.sdk/usr/include/libxml2
-            LIBXML_LIBS -L%COMPATH%/MacOSX10.4u.sdk/usr/lib -lxml2 -lz -lpthread -liconv -lm
-            LIBXSLT_CFLAGS -I%COMPATH%/MacOSX10.4u.sdk/usr/include/libxml2
-            LIBXSLT_LIBS -L%COMPATH%/MacOSX10.4u.sdk/usr/lib -lxslt -lxml2 -lz -lpthread -liconv -lm
-            MACOSX_DEPLOYMENT_TARGET 10.4
-            OPENSSL_LIBS -lssl -lcrypto
-            PERL %SOLAR_ENV_ROOT%/bt_macosx_intel/%WORK_STAMP%/bin/perl
-            PKGFORMAT dmg
-            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-            SOLARROOT %SOLAR_ENV_ROOT%
-            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/mac_jdk14_unknown
-            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/MacOSX_JDK_1.5.0_07.intel
-            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-            SYSTEM_CURL YES
-            SYSTEM_LIBXML YES
-            SYSTEM_LIBXSLT YES
-            SYSTEM_OPENSSL YES
-            SYSTEM_PYTHON YES
-            SYSTEM_ZLIB YES
-            SYSTEM_LIBGSF YES
-            USE_SYSTEM_STL YES
-            BUILD_PIXMAN YES
-            WITH_MOZILLA YES
-            ENABLE_CAIRO TRUE
-            SYSTEM_LIBRSVG NO
-            SYSTEM_LIBCROCO NO
-            SYSTEM_GDKPIXBUF NO
-            SYSTEM_GLIB NO
-            SYSTEM_GETTEXT NO
-            SYSTEM_PANGO NO
-            SYSTEM_LIBPNG NO
-            SYSTEM_LIBJPEG NO
-        }
-        common2
-        {
-            BUILD_TOOLS %SOLARROOT%/bt_macosx_intel/%WORK_STAMP%/bin
-            COM GCC
-            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-            COMMON_ENV_TOOLS %SOLARROOT%$/etools
-            CPU I
-            CPUNAME INTEL
-            CVER C341
-            ENV_TOOLS %SOLARROOT%/et_macosx_intel/%WORK_STAMP%/bin
-            GUI UNX
-            GUIBASE aqua
-            GVER VCL
-            INPATH unxmacxi%PROEXT%
-            JDK13PATH %SOLAR_JDK13PATH%
-            JDK14PATH %SOLAR_JDK15PATH%
-            JDK15PATH %SOLAR_JDK15PATH%
-            LIBMYSQL_PATH %SOLARROOT%/mysql-connector-c-6.0.2/unxmacxi
-            NO_BSYMBOLIC True
-            OS MACOSX
-            OUTPATH unxmacxi
-            PA_VER 18
-            SOLAR_STLLIBPATH %SOLARVERSION%$/unxmacxi%PROEXT%$/lib%UPDMINOREXT%
-            SOLAR_STLPATH %SOLARVERSION%$/unxmacxi%PROEXT%$/inc%UPDMINOREXT%$/stl
-            SYSBASE %SOLAR_SYSBASE_ROOT%
-            TEMP /tmp
-            TMP /tmp
-        }
-        compath
-        {
-            COMPATH %STAR_COMPATH%
-        }
-        distroot:0 if X%DIST_ROOT%X != XX
-        {
-            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-            SOLARVER %DIST_ROOT%/%WORK_STAMP%
-            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-        }
-        envroot:0 IF X%ENV_ROOT%X != XX
-        {
-            SOLAR_ENV_ROOT %ENV_ROOT%
-        }
-        jdk14
-        {
-            JAVA_HOME %JDK15PATH%
-            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-            JDKLIB %JDK15PATH%/jre/lib
-            JDKLIBS -L%JDK15PATH%/jre/lib
-            JDKPATH %JDK15PATH%/bin
-            JDK_VERSION 150
-            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-        }
-        jdk14path:0 IF X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK14PATH %JDK_PATH%
-        }
-        jdk15
-        {
-            JAVA_HOME %JDK15PATH%
-            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-            JDKLIB %JDK15PATH%/jre/lib
-            JDKLIBS -L%JDK15PATH%/jre/lib
-            JDKPATH %JDK15PATH%/bin
-            JDK_VERSION 150
-            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-        }
-        jdk15path:0 IF X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK15PATH %JDK_PATH%
-        }
-        pro
-        {
-            PROSWITCH -DPRODUCT
-        }
-        sourceroot:0 IF X%SOURCE_ROOT%X != XX
-        {
-            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-            SOURCE_ROOT_USED TRUE
-        }
-        sysbaseroot
-        {
-            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-        }
-    }
-    extern
-    {
-        DIST_ROOT
-        ENV_ROOT
-        HOME
-        JDK_PATH
-        LOCALINI
-        SOL_TMP
-        SOURCE_ROOT
-        SYSBASE_ROOT
-        USER
-    }
-    order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15
-    reset
-    {
-        CLASSPATH
-        COPYALL
-    }
-    restore
-    {
-        INCLUDE
-    }
-    script
-    {
-        csh 
-        {
-            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            600: umask 002
-            800: rehash
-            820: wrapfetch.sh
-            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-        }
-        sh
-        {
-            400: if [ $COPYALL ]; then
-            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            415: fi
-            600: umask 002
-            800: hash -r
-            820: wrapfetch.sh
-            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-            851: export SO_GEN_ERROR
-            852: fi
-            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-            861: export SO_GEN_ERROR2
-            862: fi
-            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-            871: echo $SO_GEN_ERROR
-            872: fi
-            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-            881: echo $SO_GEN_ERROR2
-            882: fi
-        }
-    }
-    switches
-    {
-        bs_sourceroot SOURCE_ROOT_TMP
-        bsclient
-        cap
-        cax
-        compath STAR_COMPATH
-        debug
-        distroot
-        envroot
-        jdk14
-        jdk14path
-        jdk15
-        jdk15path
-        l10n L10N_framework
-        pro
-        sourceroot
-        sysbaseroot
-    }
-}
-unxsoli4
-{
-    environment
-    {
-        bs_sourceroot
-        {
-            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-            SOURCE_ROOT %SOURCE_ROOT_TMP%
-            SOURCE_ROOT_USED TRUE
-        }
-        cap
-        {
-            COPYALL TRUE
-            COPY_PACKED TRUE
-            DEVROOT %SOL_TMP%$/r
-            PCLEAN_PATH %SOLARROOT%/etools
-            PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-        }
-        cax
-        {
-            COPYALL FALSE
-            DEVROOT %SOL_TMP%$/r
-            PCLEAN_PATH %SOL_TMP%$/r/etools
-            PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-        }
-        common
-        {
-            *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-            *build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-            *deliver %PERL% %SOLARENV%/bin/deliver.pl
-            *mkout %PERL% %SOLARENV%/bin/mkout.pl
-            *r: cd %SOLARROOT%
-            *s: cd %SOLARVERSION%
-            *zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-            DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-            DMAKEROOT %SOLARENV%/inc/startup
-            MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-            PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
-            FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
-            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
-            SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L%SYSBASE%/usr/sfw/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
-            SOLAR_JAVA TRUE
-            ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-            __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
-            ENABLE_GCONF TRUE
-            ENABLE_GNOMEVFS TRUE
-            GNUCOPY gnucp
-            GNUMAKE gmake
-            SYSTEM_LIBRSVG YES
-            SYSTEM_LIBCROCO YES
-            SYSTEM_GDKPIXBUF YES
-            SYSTEM_GLIB YES
-            SYSTEM_GETTEXT YES
-            SYSTEM_PANGO YES
-            SYSTEM_LIBPNG YES
-            SYSTEM_LIBJPEG YES
-            SYSTEM_LIBGSF YES
-        }
-        common0
-        {
-            SOLAR_ENV_ROOT /so/env
-            SOLAR_SOURCE_ROOT %DRIVE_O%
-            SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_intel
-            OOO_SYSBASE_SYS_RELEASE 5.10
-        }
-        common1
-        {
-            COMPATH /so/env/compilers/SUNWS12_p/intel/SUNWspro
-            DEVROOT %SOLAR_ENV_ROOT%
-            LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-            PERL %SOLAR_ENV_ROOT%/bt_solaris_intel/bin/perl
-            PKGFORMAT pkg
-            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-            SOLARROOT %SOLAR_ENV_ROOT%
-            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.3.1_01.intel
-            SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.4.2_11.intel
-            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_06.intel
-            SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-i586
-            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-            SOLAR_GTK_ROOT /so/env/gnome/solaris_intel/cinnabar_b15
-        }
-        common2
-        {
-            BUILD_TOOLS %SOLARROOT%/bt_solaris_intel/%WORK_STAMP%/bin
-            COM C52
-            COMEX 4
-            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-            COMMON_ENV_TOOLS %SOLARROOT%$/etools
-            CPU I
-            CPUNAME INTEL
-            CVER C52
-            ENABLE_EVOAB2 TRUE
-            ENV_TOOLS %SOLARROOT%/et_solaris_intel/%WORK_STAMP%/bin
-            GUI UNX
-            GUIBASE unx
-            GVER VCL
-            INPATH unxsoli4%PROEXT%
-            JDK13PATH %SOLAR_JDK13PATH%
-            JDK14PATH %SOLAR_JDK14PATH%
-            JDK15PATH %SOLAR_JDK15PATH%
-            LIBMYSQL_PATH %SOLARROOT%/mysql-connector-c-6.0.2/unxsoli4
-            OJDK16PATH %SOLAR_OJDK16PATH%
-            OS SOLARIS
-            OUTPATH unxsoli4
-            SOLAR_STLLIBPATH %SOLARVERSION%$/unxsoli4%PROEXT%$/lib%UPDMINOREXT%
-            SOLAR_STLPATH %SOLARVERSION%$/unxsoli4%PROEXT%$/inc%UPDMINOREXT%$/stl
-            SYSBASE %SOLAR_SYSBASE_ROOT%
-            TEMP /var/tmp
-            TMP /var/tmp
-            GTK_CFLAGS -I%SOLAR_GTK_ROOT%/usr/include/gtk-2.0 -I%SOLAR_GTK_ROOT%/usr/lib/gtk-2.0/include -I%SOLAR_GTK_ROOT%/usr/include/atk-1.0 -I%SOLAR_GTK_ROOT%/usr/include/pango-1.0 -I/usr/openwin/include -I%SOLAR_GTK_ROOT%/usr/sfw/include -I%SOLAR_GTK_ROOT%/usr/sfw/include/freetype2 -I%SOLAR_GTK_ROOT%/usr/include/glib-2.0 -I%SOLAR_GTK_ROOT%/usr/lib/glib-2.0/include
-            GTK_LIBS -L%SOLAR_GTK_ROOT%/usr/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
-        }
-        compath
-        {
-            COMPATH %STAR_COMPATH%
-        }
-        distroot:0 if X%DIST_ROOT%X != XX
-        {
-            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-            SOLARVER %DIST_ROOT%/%WORK_STAMP%
-            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-        }
-        envroot:0 if X%ENV_ROOT%X != XX
-        {
-            SOLAR_ENV_ROOT %ENV_ROOT%
-        }
-        jdk14
-        {
-            JAVA_HOME %JDK14PATH%
-            JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
-            JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/solaris
-            JDKLIB %JDK14PATH%/jre/lib/i386:%JDK14PATH%/lib:%JDK14PATH%/jre/lib/i386/native_threads:%JDK14PATH%/jre/plugin/i386:%JDK14PATH%/jre/lib/i386/motif21
-            JDKLIBS -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/lib -L%JDK14PATH%/jre/lib/i386/native_threads -L%JDK14PATH%/jre/plugin/i386 -L%JDK14PATH%/jre/lib/i386/motif21
-            JDKPATH %JDK14PATH%/bin
-            JDK_VERSION 142
-            XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
-        }
-        jdk14path:0 if X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK14PATH %JDK_PATH%
-        }
-        jdk15
-        {
-            JAVA_HOME %JDK15PATH%
-            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
-            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
-            JDKLIB %JDK15PATH%/jre/lib/i386:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/i386/native_threads:%JDK15PATH%/jre/plugin/i386:%JDK15PATH%/jre/lib/i386/motif21
-            JDKLIBS -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/i386/native_threads -L%JDK15PATH%/jre/plugin/i386 -L%JDK15PATH%/jre/lib/i386/motif21
-            JDKPATH %JDK15PATH%/bin
-            JDK_VERSION 150
-            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-        }
-        jdk15path:0 if X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK15PATH %JDK_PATH%
-        }
-        ojdk16
-        {
-            JAVA_HOME %OJDK16PATH%
-            JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
-            JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/solaris
-            JDKLIB %OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/lib:%OJDK16PATH%/jre/lib/i386/native_threads:%OJDK16PATH%/jre/plugin/i386:%OJDK16PATH%/jre/lib/i386/xawt
-            JDKLIBS -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/lib -L%OJDK16PATH%/jre/lib/i386/native_threads -L%OJDK16PATH%/jre/plugin/i386 -L%OJDK16PATH%/jre/lib/i386/xawt
-            JDKPATH %OJDK16PATH%/bin
-            JDK_VERSION 160
-            XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-        }
-        ojdk16path:0 if X%JDK_PATH%X != XX
-        {
-            SOLAR_OJDK16PATH %JDK_PATH%
-        }
-        pro
-        {
-            PROSWITCH -DPRODUCT
-        }
-        sourceroot:0 if X%SOURCE_ROOT%X != XX
-        {
-            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-            SOURCE_ROOT_USED TRUE
-        }
-        sysbaseroot
-        {
-            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-            OOO_SYSBASE_SYS_RELEASE
-        }
-    }
-    extern
-    {
-        DIST_ROOT
-        ENV_ROOT
-        HOME
-        JDK_PATH
-        LOCALINI
-        SOL_TMP
-        SOURCE_ROOT
-        SYSBASE_ROOT
-        USER
-    }
-    order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath common2 pro common jdk14 jdk15 ojdk16
-    reset
-    {
-        CLASSPATH
-    }
-    script
-    {
-        csh 
-        {
-            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            600: umask 002
-            800: rehash
-            820: wrapfetch.sh
-            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-        }
-        sh
-        {
-            400: if [ $COPYALL ]; then
-            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            415: fi
-            600: umask 002
-            800: hash -r
-            820: wrapfetch.sh
-            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-            851: export SO_GEN_ERROR
-            852: fi
-            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-            861: export SO_GEN_ERROR2
-            862: fi
-            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-            871: echo $SO_GEN_ERROR
-            872: fi
-            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-            881: echo $SO_GEN_ERROR2
-            882: fi
-        }
-    }
-    switches
-    {
-        bs_sourceroot SOURCE_ROOT_TMP
-        bsclient
-        cap
-        cax
-        compath STAR_COMPATH
-        distroot
-        envroot
-        jdk14
-        jdk14path
-        jdk15
-        jdk15path
-        l10n L10N_framework
-        ojdk16
-        ojdk16path
-        pro
-        sourceroot
-        sysbaseroot
-    }
-}
-unxsols4
-{
-    environment
-    {
-        bs_sourceroot
-        {
-            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-            SOURCE_ROOT %SOURCE_ROOT_TMP%
-            SOURCE_ROOT_USED TRUE
-        }
-        cap
-        {
-            COPYALL TRUE
-            COPY_PACKED TRUE
-            DEVROOT %SOL_TMP%$/r
-            PCLEAN_PATH %SOLARROOT%/etools
-            PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-        }
-        cax
-        {
-            COPYALL FALSE
-            DEVROOT %SOL_TMP%$/r
-            PCLEAN_PATH %SOL_TMP%$/r/etools
-            PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-        }
-        common
-        {
-            *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-            *build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-            *deliver %PERL% %SOLARENV%/bin/deliver.pl
-            *mkout %PERL% %SOLARENV%/bin/mkout.pl
-            *r: cd %SOLARROOT%
-            *s: cd %SOLARVERSION%
-            *zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-            DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-            DMAKEROOT %SOLARENV%/inc/startup
-            MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-            PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
-            FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
-            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
-            SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L%SYSBASE%/usr/sfw/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
-            SOLAR_JAVA TRUE
-            ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-            __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
-            ENABLE_GCONF TRUE
-            ENABLE_GNOMEVFS TRUE
-            GNUCOPY gnucp
-            GNUMAKE gmake
-            SYSTEM_LIBRSVG YES
-            SYSTEM_LIBCROCO YES
-            SYSTEM_GDKPIXBUF YES
-            SYSTEM_GLIB YES
-            SYSTEM_GETTEXT YES
-            SYSTEM_PANGO YES
-            SYSTEM_LIBPNG YES
-            SYSTEM_LIBJPEG YES
-            SYSTEM_LIBGSF YES
-        }
-        common0
-        {
-            SOLAR_ENV_ROOT /so/env
-            SOLAR_LICENSE_FILE /opt/SUNWspro/license_dir/sunpro.lic,1
-            SOLAR_SOURCE_ROOT %DRIVE_O%
-            SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
-            OOO_SYSBASE_SYS_RELEASE 5.10
-        }
-        common1
-        {
-            COMPATH /so/env/compilers/SUNWS12_p/sparc/SUNWspro
-            DEVROOT %SOLAR_ENV_ROOT%
-            LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-            PERL %SOLAR_ENV_ROOT%/bt_solaris_sparc/bin/perl
-            PKGFORMAT pkg
-            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-            SOLARROOT %SOLAR_ENV_ROOT%
-            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.3.1_01.sparc
-            SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.4.2_11.sparc
-            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_06.sparc
-            SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-sparc
-            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-            SOLAR_GTK_ROOT /so/env/gnome/solaris_sparc/cinnabar_b15
-        }
-        common2
-        {
-            BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
-            COM C52
-            COMEX 4
-            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-            COMMON_ENV_TOOLS %SOLARROOT%$/etools
-            CPU S
-            CPUNAME SPARC
-            CVER C52
-            ENABLE_EVOAB2 TRUE
-            ENV_TOOLS %SOLARROOT%/et_solaris_sparc/%WORK_STAMP%/bin
-            GUI UNX
-            GUIBASE unx
-            GVER VCL
-            INPATH unxsols4%PROEXT%
-            JDK13PATH %SOLAR_JDK13PATH%
-            JDK14PATH %SOLAR_JDK14PATH%
-            JDK15PATH %SOLAR_JDK15PATH%
-            LIBMYSQL_PATH %SOLARROOT%/mysql-connector-c-6.0.2/unxsols4
-            LM_LICENSE_FILE %SOLAR_LICENSE_FILE%
-            OJDK16PATH %SOLAR_OJDK16PATH%
-            OS SOLARIS
-            OUTPATH unxsols4
-            SOLAR_STLLIBPATH %SOLARVERSION%$/unxsols4%PROEXT%$/lib%UPDMINOREXT%
-            SOLAR_STLPATH %SOLARVERSION%$/unxsols4%PROEXT%$/inc%UPDMINOREXT%$/stl
-            SYSBASE %SOLAR_SYSBASE_ROOT%
-            TEMP /var/tmp
-            TMP /var/tmp
-            GTK_CFLAGS -I%SOLAR_GTK_ROOT%/usr/include/gtk-2.0 -I%SOLAR_GTK_ROOT%/usr/lib/gtk-2.0/include -I%SOLAR_GTK_ROOT%/usr/include/atk-1.0 -I%SOLAR_GTK_ROOT%/usr/include/pango-1.0 -I/usr/openwin/include -I%SOLAR_GTK_ROOT%/usr/sfw/include -I%SOLAR_GTK_ROOT%/usr/sfw/include/freetype2 -I%SOLAR_GTK_ROOT%/usr/include/glib-2.0 -I%SOLAR_GTK_ROOT%/usr/lib/glib-2.0/include
-            GTK_LIBS -L%SOLAR_GTK_ROOT%/usr/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
-        }
-        common:3 IF %UPDATER% == YES
-        {
-            TEMP /tmp
-            TMP /tmp
-        }
-        compath
-        {
-            COMPATH %STAR_COMPATH%
-        }
-        distroot:0 if X%DIST_ROOT%X != XX
-        {
-            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-            SOLARVER %DIST_ROOT%/%WORK_STAMP%
-            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-        }
-        envroot:0 if X%ENV_ROOT%X != XX
-        {
-            SOLAR_ENV_ROOT %ENV_ROOT%
-        }
-        jdk14
-        {
-            JAVA_HOME %JDK14PATH%
-            JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
-            JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/solaris
-            JDKLIB %JDK14PATH%/jre/lib/sparc:%JDK14PATH%/lib:%JDK14PATH%/jre/lib/sparc/native_threads:%JDK14PATH%/jre/plugin/sparc:%JDK14PATH%/jre/lib/sparc/motif21
-            JDKLIBS -L%JDK14PATH%/jre/lib/sparc -L%JDK14PATH%/lib -L%JDK14PATH%/jre/lib/sparc/native_threads -L%JDK14PATH%/jre/plugin/sparc -L%JDK14PATH%/jre/lib/sparc/motif21
-            JDKPATH %JDK14PATH%/bin
-            JDK_VERSION 142
-            XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
-        }
-        jdk14path:0 if X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK14PATH %JDK_PATH%
-        }
-        jdk15
-        {
-            JAVA_HOME %JDK15PATH%
-            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
-            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
-            JDKLIB %JDK15PATH%/jre/lib/sparc:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/sparc/native_threads:%JDK15PATH%/jre/plugin/sparc:%JDK15PATH%/jre/lib/sparc/motif21
-            JDKLIBS -L%JDK15PATH%/jre/lib/sparc -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/sparc/native_threads -L%JDK15PATH%/jre/plugin/sparc -L%JDK15PATH%/jre/lib/sparc/motif21
-            JDKPATH %JDK15PATH%/bin
-            JDK_VERSION 150
-            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-        }
-        jdk15path:0 if X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK15PATH %JDK_PATH%
-        }
-        ojdk16
-        {
-            JAVA_HOME %OJDK16PATH%
-            JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
-            JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/solaris
-            JDKLIB %OJDK16PATH%/jre/lib/sparc:%OJDK16PATH%/lib:%OJDK16PATH%/jre/lib/sparc/native_threads:%OJDK16PATH%/jre/plugin/sparc:%OJDK16PATH%/jre/lib/sparc/xawt
-            JDKLIBS -L%OJDK16PATH%/jre/lib/sparc -L%OJDK16PATH%/lib -L%OJDK16PATH%/jre/lib/sparc/native_threads -L%OJDK16PATH%/jre/plugin/sparc -L%OJDK16PATH%/jre/lib/sparc/xawt
-            JDKPATH %OJDK16PATH%/bin
-            JDK_VERSION 160
-            XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-        }
-        ojdk16path:0 if X%JDK_PATH%X != XX
-        {
-            SOLAR_OJDK16PATH %JDK_PATH%
-        }
-        pro
-        {
-            PROSWITCH -DPRODUCT
-        }
-        sourceroot:0 if X%SOURCE_ROOT%X != XX
-        {
-            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-            SOURCE_ROOT_USED TRUE
-        }
-        sysbaseroot
-        {
-            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-            OOO_SYSBASE_SYS_RELEASE
-        }
-    }
-    extern
-    {
-        DIST_ROOT
-        ENV_ROOT
-        HOME
-        JDK_PATH
-        LM_LICENSE_FILE
-        LOCALINI
-        SOL_TMP
-        SOURCE_ROOT
-        SYSBASE_ROOT
-        USER
-    }
-    order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0  sysbaseroot cap cax compath common2 common:3 pro common jdk14 jdk15 ojdk16
-    reset
-    {
-        CLASSPATH
-    }
-    script
-    {
-        csh 
-        {
-            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            600: umask 002
-            800: rehash
-            820: wrapfetch.sh
-            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-        }
-        sh
-        {
-            400: if [ $COPYALL ]; then
-            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            415: fi
-            600: umask 002
-            800: hash -r
-            820: wrapfetch.sh
-            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-            851: export SO_GEN_ERROR
-            852: fi
-            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-            861: export SO_GEN_ERROR2
-            862: fi
-            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-            871: echo $SO_GEN_ERROR
-            872: fi
-            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-            881: echo $SO_GEN_ERROR2
-            882: fi
-        }
-    }
-    switches
-    {
-        bs_sourceroot SOURCE_ROOT_TMP
-        bsclient
-        cap
-        cax
-        compath STAR_COMPATH
-        distroot
-        envroot
-        jdk14
-        jdk14path
-        jdk15
-        jdk15path
-        l10n L10N_framework
-        ojdk16
-        ojdk16path
-        pro
-        sourceroot
-        sysbaseroot
-    }
-}
-unxsolu4
-{
-    environment
-    {
-        bs_sourceroot
-        {
-            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-            SOURCE_ROOT %SOURCE_ROOT_TMP%
-            SOURCE_ROOT_USED TRUE
-        }
-        cap
-        {
-            COPYALL TRUE
-            COPY_PACKED TRUE
-            DEVROOT %SOL_TMP%$/r
-            PCLEAN_PATH %SOLARROOT%/etools
-            PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-        }
-        cax
-        {
-            COPYALL FALSE
-            DEVROOT %SOL_TMP%$/r
-            PCLEAN_PATH %SOL_TMP%$/r/etools
-            PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-        }
-        common
-        {
-            *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-            *build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-            *deliver %PERL% %SOLARENV%/bin/deliver.pl
-            *mkout %PERL% %SOLARENV%/bin/mkout.pl
-            *r: cd %SOLARROOT%
-            *s: cd %SOLARVERSION%
-            *zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-            DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-            DMAKEROOT %SOLARENV%/inc/startup
-            FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
-            FREETYPE_LIBS -L%SYSBASE%/usr/sfw/lib/sparcv9 -lfreetype
-            LIBXML_CFLAGS -I%SYSBASE%/usr/include/libxml2
-            LIBXML_LIBS -L%SYSBASE%/usr/lib/sparcv9 -lxml2 -lpthread -lz -lm -lsocket -lnsl
-            LIBXSLT_CFLAGS -I%SYSBASE%/usr/include/libxml2
-            LIBXSLT_LIBS -L%SYSBASE%/usr/lib/sparcv9 -lxslt -lxml2 -lpthread -lz -lm -lsocket -lnsl
-            MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-            PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
-            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
-            SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
-            SOLAR_JAVA TRUE
-            SYSTEM_FREETYPE YES
-            SYSTEM_LIBXML YES
-            SYSTEM_LIBXSLT YES
-            ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-            __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
-            ENABLE_GCONF TRUE
-#           ENABLE_GNOMEVFS TRUE
-            GNUMAKE gmake
-            SYSTEM_LIBRSVG YES
-            SYSTEM_LIBCROCO YES
-            SYSTEM_GDKPIXBUF YES
-            SYSTEM_GLIB YES
-            SYSTEM_GETTEXT YES
-            SYSTEM_PANGO YES
-            SYSTEM_LIBPNG YES
-            SYSTEM_LIBJPEG YES
-            SYSTEM_LIBGSF YES
-        }
-        common0
-        {
-            SOLAR_ENV_ROOT /so/env
-            SOLAR_SOURCE_ROOT %DRIVE_O%
-            SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
-            OOO_SYSBASE_SYS_RELEASE 5.10
-        }
-        common1
-        {
-            COMPATH /so/env/compilers/SUNWS12m1/sparc/SUNWspro
-            DEVROOT %SOLAR_ENV_ROOT%
-            PERL %SOLAR_ENV_ROOT%/bt_solaris_sparc/bin/perl
-            PKGFORMAT pkg
-            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-            SOLARROOT %SOLAR_ENV_ROOT%
-            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_15.sparc
-            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-            USE_SYSTEM_STL YES
-        }
-        common2
-        {
-            BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
-            COM C52
-            COMEX 4
-            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-            COMMON_ENV_TOOLS %SOLARROOT%$/etools
-            CPU U
-            CPUNAME SPARC
-            CVER C52
-            ENV_TOOLS %SOLARROOT%/et_solaris_sparc/%WORK_STAMP%/bin
-            GUI UNX
-            GUIBASE unx
-            GVER VCL
-            INPATH unxsolu4%PROEXT%
-            JDK15PATH %SOLAR_JDK15PATH%
-            OS SOLARIS
-            OUTPATH unxsolu4
-            SOLAR_STLLIBPATH %SOLARVERSION%$/unxsolu4%PROEXT%$/lib%UPDMINOREXT%
-            SOLAR_STLPATH %SOLARVERSION%$/unxsolu4%PROEXT%$/inc%UPDMINOREXT%$/stl
-            SYSBASE %SOLAR_SYSBASE_ROOT%
-            TEMP /var/tmp
-            TMP /var/tmp
-        }
-        common:3 IF %UPDATER% == YES
-        {
-            TEMP /tmp
-            TMP /tmp
-        }
-        compath
-        {
-            COMPATH %STAR_COMPATH%
-        }
-        distroot:0 if X%DIST_ROOT%X != XX
-        {
-            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-            SOLARVER %DIST_ROOT%/%WORK_STAMP%
-            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-        }
-        envroot:0 if X%ENV_ROOT%X != XX
-        {
-            SOLAR_ENV_ROOT %ENV_ROOT%
-        }
-        jdk15
-        {
-            JAVA_HOME %JDK15PATH%
-            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
-            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
-            JDKLIB %JDK15PATH%/jre/lib/sparcv9:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/sparcv9/native_threads:%JDK15PATH%/jre/lib/sparcv9/server:%JDK15PATH%/jre/plugin/sparcv9:%JDK15PATH%/jre/lib/sparcv9/motif21
-            JDKLIBS -L%JDK15PATH%/jre/lib/sparcv9 -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/sparcv9/native_threads -L%JDK15PATH%/jre/lib/sparcv9/server -L%JDK15PATH%/jre/plugin/sparcv9 -L%JDK15PATH%/jre/lib/sparcv9/motif21
-            JDKPATH %JDK15PATH%/bin/sparcv9
-            JDK_VERSION 150
-            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-        }
-        jdk15path:0 if X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK15PATH %JDK_PATH%
-        }
-        pro
-        {
-            PROSWITCH -DPRODUCT
-        }
-        sourceroot:0 if X%SOURCE_ROOT%X != XX
-        {
-            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-            SOURCE_ROOT_USED TRUE
-        }
-        sysbaseroot
-        {
-            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-            OOO_SYSBASE_SYS_RELEASE
-        }
-    }
-    extern
-    {
-        DIST_ROOT
-        ENV_ROOT
-        HOME
-        JDK_PATH
-        LM_LICENSE_FILE
-        LOCALINI
-        SOL_TMP
-        SOURCE_ROOT
-        SYSBASE_ROOT
-        USER
-    }
-    order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath common2 common:3 pro common jdk15
-    reset
-    {
-        CLASSPATH
-    }
-    script
-    {
-        csh
-        {
-            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            600: umask 002
-            800: rehash
-            820: wrapfetch.sh
-            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-        }
-        sh
-        {
-            400: if [ $COPYALL ]; then
-            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            415: fi
-            600: umask 002
-            800: hash -r
-            820: wrapfetch.sh
-            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-            851: export SO_GEN_ERROR
-            852: fi
-            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-            861: export SO_GEN_ERROR2
-            862: fi
-            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-            871: echo $SO_GEN_ERROR
-            872: fi
-            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-            881: echo $SO_GEN_ERROR2
-            882: fi
-        }
-    }
-    switches
-    {
-        bs_sourceroot SOURCE_ROOT_TMP
-        bsclient
-        cap
-        cax
-        compath STAR_COMPATH
-        distroot
-        envroot
-        jdk15
-        jdk15path
-        l10n L10N_framework
-        pro
-        sourceroot
-        sysbaseroot
-    }
-}
-wntgcci1
-{
-    environment
-    {
-        bs_sourceroot
-        {
-            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-            SOURCE_ROOT %SOURCE_ROOT_TMP%
-            SOURCE_ROOT_USED TRUE
-        }
-        cap
-        {
-            COMPATH %SOL_TMP%$/r$/MinGW
-            COPYALL TRUE
-            COPY_PACKED TRUE
-            DEVROOT %SOL_TMP%$/r
-            FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
-            NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-            PCLEAN_PATH %SOLARROOT%$/etw
-            PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-            PSDK %SOL_TMP%$/r$/MinGW$/w32api
-            SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-        }
-        cax
-        {
-            COMPATH %SOL_TMP%$/r$/MinGW
-            COPYALL FALSE
-            FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
-            NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-            PCLEAN_PATH %SOL_TMP%$/r$/etw
-            PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-            PSDK %SOL_TMP%$/r$/MinGW$/w32api
-            SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-        }
-        common
-        {
-            *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
-            *build_client %PERL% %SOLARENV%$/bin$/build_client.pl
-            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-            *deliver %PERL% %SOLARENV%$/bin$/deliver.pl
-            *dmake *dmake %PROFULLSWITCH%
-            *mkout %PERL% %SOLARENV%$/bin$/mkout.pl
-            *o cd %SOLARENV%$/..
-            *r cd %SOLARROOT%
-            *s cd %SOLARVERSION%
-            *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-            BIG_SVX
-            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-            DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
-            DMAKEROOT %SOLARENV%$/inc$/startup
-            ILIB .$:%UPDMINOREXT%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/lib$:%FSDK%$/lib$:%COMPATH%$/lib$:
-            JDK13PATH %SOLAR_JDK13PATH%
-            JDK14PATH %SOLAR_JDK14PATH%
-            JDK15PATH %SOLAR_JDK15PATH%
-            LIB .$:%UPDMINOREXT%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/lib$:%PSDK%$/lib$/x86$:%FSDK%$/lib$:%COMPATH%$/lib$:%SOLAR_STLLIBPATH%
-            MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
-            PATH %PATH%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%SHARED_COM_SDK_PATH%$:%PSDK%$/bin$:%FSDK%$/bin
-            PSDKINC -I%PSDK%$/include
-            SOLAREXTRAINC -I%COMPATH%$/lib$/gcc-lib$/mingw32$/3.2$/include -I%DSDK%$/include
-            SOLAR_JAVA TRUE
-            XCLASSPATH .
-            ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
-            GNUMAKE make
-            SYSTEM_LIBRSVG YES
-            SYSTEM_LIBCROCO YES
-            SYSTEM_GDKPIXBUF YES
-            SYSTEM_GLIB YES
-            SYSTEM_GETTEXT YES
-            SYSTEM_PANGO YES
-            SYSTEM_LIBPNG YES
-            SYSTEM_LIBJPEG YES
-            SYSTEM_LIBGSF YES
-        }
-        common0
-        {
-            SOLAR_ENV_ROOT r:
-            SOLAR_SOURCE_ROOT o:
-        }
-        common1
-        {
-            COMPATH %SOLAR_ENV_ROOT%$/MinGW
-            #           FSDK %SOLAR_ENV_ROOT%$/msvc7net$/FrameworkSDK
-            DEVROOT %SOLAR_ENV_ROOT%
-            NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
-            PERL %SOLAR_ENV_ROOT%$/btw$/perl$/bin$/perl
-            PKGFORMAT some_dummy
-            PSDK %SOLAR_ENV_ROOT%$/MinGW$/w32api
-            SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc7net$/Common7$/ide
-            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-            SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOLAR_ENV_ROOT%
-            SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-            SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-            SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
-            SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-        }
-        common2
-        {
-            ENABLE_GRAPHITE TRUE
-            BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
-            CALL_CDECL TRUE
-            CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-            COM GCC
-            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-            COMMON_ENV_TOOLS %SOLARROOT%$/etools
-            COMP_ENV wntgcci1
-            CPU I
-            CPUNAME INTEL
-            CVER M1300
-            DYNAMIC_CRT TRUE
-            ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
-            GUI WNT
-            GUIBASE WIN
-            GVER NT351
-            INPATH wntgcci1%PROEXT%
-            OS WNT
-            OUTPATH wntgcci1
-            SET_EXEPTIONS TRUE
-            SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
-            SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
-            SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
-            SOLAR_STLPATH %SOLARVERSION%$/wntgcci1%PROEXT%$/inc%UPDMINOREXT%$/stl
-            SORT sort -T %TMP%
-            use_shl_versions TRUE
-        }
-        compath
-        {
-            COMPATH %STAR_COMPATH%
-        }
-        distroot:0 if X%DIST_ROOT%X != XX
-        {
-            SHARED_SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
-            SOLARVER %DIST_ROOT%$/%WORK_STAMP%
-            SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
-        }
-        envroot:0 IF X%ENV_ROOT%X != XX
-        {
-            SOLAR_ENV_ROOT %ENV_ROOT%
-        }
-        jdk14
-        {
-            HOMEDRIVE %DEVROOT%
-            HOMEPATH $/jdk141
-            JAVAHOME %JDK14PATH%
-            JAVA_HOME %JDK14PATH%
-            JDKINC %JDK14PATH%$/include$/win32$:%JDK14PATH%$/include
-            JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
-            JDKLIB -L%JDK14PATH%$/lib
-            JDKLIBS -L%JDK14PATH%$/lib
-            JDKPATH %JDK14PATH%$/bin
-            JDK_VERSION 142
-            JREPATH %JDK14PATH%$/jre$/bin$/client
-            XCLASSPATH .$:%JDK14PATH%$/jre$/lib$/rt.jar
-        }
-        jdk14path:0 if X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK14PATH %JDK_PATH%
-        }
-        jdk15
-        {
-            HOMEDRIVE %DEVROOT%
-            HOMEPATH $/jdk151
-            JAVAHOME %JDK15PATH%
-            JAVA_HOME %JDK15PATH%
-            JDKINC %JDK15PATH%$/include$/win32$:%JDK15PATH%$/include
-            JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
-            JDKLIB -L%JDK15PATH%$/lib
-            JDKLIBS -L%JDK15PATH%$/lib
-            JDKPATH %JDK15PATH%$/bin
-            JDK_VERSION 150
-            JREPATH %JDK15PATH%$/jre$/bin$/client
-            XCLASSPATH .$:%JDK15PATH%$/jre$/lib$/rt.jar
-        }
-        jdk15path:0 if X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK15PATH %JDK_PATH%
-        }
-        psdk
-        {
-            PSDK %STAR_PSDK%
-        }
-        sourceroot:0 if X%SOURCE_ROOT%X != XX
-        {
-            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-            SOURCE_ROOT_USED TRUE
-        }
-    }
-    extern
-    {
-        COMSPEC
-        DIST_ROOT
-        ENV_ROOT
-        JDK_PATH
-        LOCALINI
-        SOL_TMP
-        SOURCE_ROOT
-    }
-    order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
-    reset
-    {
-        COPYALL
-        NSIS_PATH
-        SOLAR_ENV_ROOT
-        WST
-    }
-    script
-    {
-        csh
-        {
-            150: setenv MYENV_PATH $PATH
-            160: setenv PATH $SSX_PATH
-            200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            260: setenv PATH $MYENV_PATH
-            270: unsetenv MYENV_PATH
-            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-        }
-        sh
-        {
-            150: export MYENV_PATH=$PATH
-            160: export PATH=$SSX_PATH
-            260: export PATH=$MYENV_PATH
-            270: unset MYENV_PATH
-            400: if [ $COPYALL ]; then
-            410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            415: fi
-            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-            851: export SO_GEN_ERROR
-            852: fi
-            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-            861: export SO_GEN_ERROR
-            862: fi
-            870: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-            871: echo $SO_GEN_ERROR
-            872: fi
-            880: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-            881: echo $SO_GEN_ERROR
-            882: fi
-        }
-    }
-    switches
-    {
-        bs_sourceroot SOURCE_ROOT_TMP
-        bsclient
-        cap
-        cax
-        compath STAR_COMPATH
-        distroot
-        envroot
-        jdk14
-        jdk14path
-        jdk15
-        jdk15path
-        l10n L10N_framework
-        pro
-        psdk STAR_PSDK
-        sourceroot
-    }
-}
-wntmsci11
-{
-    environment
-    {
-        bs_sourceroot
-        {
-            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-            SOURCE_ROOT %SOURCE_ROOT_TMP%
-            SOURCE_ROOT_USED TRUE
-        }
-        cap
-        {
-            COMPATH %SOL_TMP%$/r$/msvc8p
-            COMPROOT %SOL_TMP%$/r$/msvc8p
-            COPYALL TRUE
-            COPY_PACKED TRUE
-            DEVROOT %SOL_TMP%$/r
-            DSDK %SOL_TMP%$/r$/msvc8p$/DirectXSDK
-            FSDK %SOL_TMP%$/r$/msvc8p$/Sdk$/v2.0
-            PCLEAN_PATH %SOLARROOT%$/etw
-            PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-            PSDK %SOL_TMP%$/r$/msvc8p$/PlatformSDK
-            SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc8p$/Common7$/ide
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-        }
-        cax
-        {
-            COMPATH %SOL_TMP%$/r$/msvc8p
-            COMPROOT %SOL_TMP%$/r$/msvc8p
-            COPYALL FALSE
-            DSDK %COMPATH%$/DirectXSDK
-            FSDK %COMPATH%$/Sdk$/v2.0
-            PCLEAN_PATH %SOL_TMP%$/r$/etw
-            PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-            PSDK %COMPATH%$/PlatformSDK
-            SHARED_COM_SDK_PATH %COMPATH%$/Common7$/ide
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-        }
-        common
-        {
-            *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
-            *build_client %PERL% %SOLARENV%$/bin$/build_client.pl
-            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-            *deliver %PERL% %SOLARENV%$/bin$/deliver.pl
-            *mkout %PERL% %SOLARENV%$/bin$/mkout.pl
-            *mwscommit %PERL% %COMMON_ENV_TOOLS%/mwscommit.pl
-            *o cdd %SOLARENV%$/..
-            *r cdd %SOLARROOT%
-            *s cdd %SOLARVERSION%
-            *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-            BIG_SVX
-            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-            DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
-            DMAKEROOT %SOLARENV%$/inc$/startup
-            ILIB .$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/vc$/lib$:%PSDK%$/lib$:%FSDK%$/lib$:%DSDK%$/lib$/x86
-            JDK13PATH %SOLAR_JDK13PATH%
-            JDK14PATH %SOLAR_JDK14PATH%
-            JDK15PATH %SOLAR_JDK15PATH%
-            LIB .$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/vc$/lib$:%PSDK%$/lib$:%FSDK%$/lib$:%DSDK%$/lib$/x86$:%SOLAR_STLLIBPATH%
-            MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
-            MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%/mwscommit.pl
-            PATH %PATH%$:%SHARED_COM_SDK_PATH%$:%PSDK%$/vc$/bin$:%PSDK%$/bin$:%FSDK%$/bin$:%DSDK%$/bin$/Utilities$/bin$/x86$:%PACKMS%
-            PROF_EDITION TRUE
-            PSDKINC -I%PSDK%$/vc$/include -I%PSDK%$/include -I%COMPATH%$/PlatformSDK_VC8$/include
-            SOLAREXTRAINC -I%DSDK%$/include
-            SOLAR_JAVA TRUE
-            TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
-            VISTA_MANIFEST TRUE
-            WINDOWS_VISTA_PSDK TRUE
-            XCLASSPATH .
-            ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
-            SYSTEM_LIBRSVG YES
-            SYSTEM_LIBCROCO YES
-            SYSTEM_GDKPIXBUF YES
-            SYSTEM_GLIB YES
-            SYSTEM_GETTEXT YES
-            SYSTEM_PANGO YES
-            SYSTEM_LIBPNG YES
-            SYSTEM_LIBJPEG YES
-            SYSTEM_LIBGSF YES
-        }
-        common0
-        {
-            BS_ROOT n:
-            SOLAR_ENV_ROOT r:
-            SOLAR_SOURCE_ROOT o:
-        }
-        common1
-        {
-            COMPATH %SOLAR_ENV_ROOT%$/msvc8p
-            COMPROOT %SOLAR_ENV_ROOT%$/msvc8p
-            DEVROOT %SOLAR_ENV_ROOT%
-            DSDK %SOLAR_ENV_ROOT%$/msvc8p$/DirectXSDK
-            FSDK %SOLAR_ENV_ROOT%$/msvc8p$/Sdk$/v2.0
-            PERL %SOLAR_ENV_ROOT%$/btw$/perl$/bin$/perl
-            PKGFORMAT msi
-            PSDK %SOLAR_ENV_ROOT%$/msvc8p$/PlatformSDK
-            SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc8p$/Common7$/ide
-            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-            SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOLAR_ENV_ROOT%
-            SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-            SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-            SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
-            SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-        }
-        common2
-        {
-            ENABLE_GRAPHITE TRUE
-            BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
-            CALL_CDECL TRUE
-            CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-            COM MSC
-            COMEX 11
-            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-            COMMON_ENV_TOOLS %SOLARROOT%$/etools
-            COMP_ENV wntmsci11
-            CPU I
-            CPUNAME INTEL
-            CVER M1400
-            DYNAMIC_CRT TRUE
-            ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
-            GUI WNT
-            GUIBASE WIN
-            GVER NT351
-            INPATH wntmsci11%PROEXT%
-            OS WNT
-            OUTPATH wntmsci11
-            PACKMS %SO_PACK%$/wntmsci11$/MS
-            SET_EXEPTIONS TRUE
-            SHIPDRIVE %BS_ROOT%$/ship$/install
-            SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
-            SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
-            SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
-            SOLAR_STLPATH %SOLARVERSION%$/wntmsci11%PROEXT%$/inc%UPDMINOREXT%$/stl
-            SORT sort -T %TMP%
-            use_shl_versions TRUE
-        }
-        compath
-        {
-            COMPATH %STAR_COMPATH%
-        }
-        distroot:0 if X%DIST_ROOT%X != XX
-        {
-            SHARED_SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
-            SOLARVER %DIST_ROOT%$/%WORK_STAMP%
-            SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
-        }
-        envroot:0 IF X%ENV_ROOT%X != XX
-        {
-            SOLAR_ENV_ROOT %ENV_ROOT%
-        }
-        jdk14
-        {
-            HOMEDRIVE %DEVROOT%
-            HOMEPATH $/jdk141
-            JAVAHOME %JDK14PATH%
-            JAVA_HOME %JDK14PATH%
-            JDKINC %JDK14PATH%$/include$/win32$:%JDK14PATH%$/include
-            JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
-            JDKLIB %JDK14PATH%$/lib
-            JDKLIBS %JDK14PATH%$/lib
-            JDKPATH %JDK14PATH%$/bin
-            JDK_VERSION 142
-            JREPATH %JDK14PATH%$/jre$/bin$/client
-            XCLASSPATH .$:%JDK14PATH%$/jre$/lib$/rt.jar
-        }
-        jdk14path:0 if X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK14PATH %JDK_PATH%
-        }
-        jdk15
-        {
-            HOMEDRIVE %DEVROOT%
-            HOMEPATH $/jdk151
-            JAVAHOME %JDK15PATH%
-            JAVA_HOME %JDK15PATH%
-            JDKINC %JDK15PATH%$/include$/win32$:%JDK15PATH%$/include
-            JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
-            JDKLIB %JDK15PATH%$/lib
-            JDKLIBS %JDK15PATH%$/lib
-            JDKPATH %JDK15PATH%$/bin
-            JDK_VERSION 150
-            JREPATH %JDK15PATH%$/jre$/bin$/client
-            XCLASSPATH .$:%JDK15PATH%$/jre$/lib$/rt.jar
-        }
-        jdk15path:0 if X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK15PATH %JDK_PATH%
-        }
-        psdk
-        {
-            PSDK %STAR_PSDK%
-        }
-        sourceroot:0 if X%SOURCE_ROOT%X != XX
-        {
-            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-            SOURCE_ROOT_USED TRUE
-        }
-    }
-    extern
-    {
-        COMSPEC
-        DIST_ROOT
-        ENV_ROOT
-        JDK_PATH
-        LOCALINI
-        SOL_TMP
-        SOURCE_ROOT
-    }
-    order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
-    reset
-    {
-        COPYALL
-        SOLAR_ENV_ROOT
-        WST
-    }
-    script
-    {
-        post
-        {
-            150: set MYENV_PATH=%PATH
-            160: set PATH=%SSX_PATH
-            200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %BTARGET% $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            260: set PATH=%MYENV_PATH
-            270: unset MYENV_PATH
-            400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR%
-            401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2%
-        }
-    }
-    switches
-    {
-        bs_sourceroot SOURCE_ROOT_TMP
-        bsclient
-        cap
-        cax
-        compath STAR_COMPATH
-        distroot
-        envroot
-        jdk14
-        jdk14path
-        jdk15
-        jdk15path
-        l10n L10N_framework
-        pro
-        psdk STAR_PSDK
-        sourceroot
-    }
-}
-wntmsci12
-{
-    environment
-    {
-        bs_sourceroot
-        {
-            SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
-            SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
-            SOURCE_ROOT_USED TRUE
-        }
-        cap
-        {
-            BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
-            COMPATH %SOL_TMP%$/r$/msvc9p
-            COMPROOT %SOL_TMP%$/r$/msvc9p
-            COPYALL TRUE
-            COPY_PACKED TRUE
-            DEVROOT %SOL_TMP%$/r
-            DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
-            ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
-            FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
-            F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-            NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-            PCLEAN_PATH %SOLARROOT%$/etw
-            PERL %SOL_TMP%$/r$/%PERLDIR%
-            PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/v6.1
-            SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-#           TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
-
-        }
-        cax
-        {
-            BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
-            COMPATH %SOL_TMP%$/r$/msvc9p
-            COMPROOT %SOL_TMP%$/r$/msvc9p
-            COPYALL FALSE
-            DSDK %COMPATH%$/DirectXSDK
-            ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
-            FSDK %COMPATH%$/Sdk$/v3.5
-            F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-            NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-            PCLEAN_PATH %SOL_TMP%$/r$/etw
-            PERL %SOL_TMP%$/r$/%PERLDIR%
-            PSDK %COMPATH%$/PlatformSDK$/v6.1
-            SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-#           TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
-        }
-        common
-        {
-            *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
-            *build_client %PERL% %SOLARENV%$/bin$/build_client.pl
-            *copyprj %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
-            *deliver %PERL% %SOLARENV%$/bin$/deliver.pl
-            *mkout %PERL% %SOLARENV%$/bin$/mkout.pl
-            *mwscommit %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
-            *o cd %SOLARENV%$/..
-            *r cd %SOLARROOT%
-            *s cd %SOLARVERSION%
-            *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-            *z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
-            BIG_SVX
-            COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
-            CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
-            DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
-            DMAKEROOT %SOLARENV%$/inc$/startup
-            ENABLE_PCH TRUE
-            ILIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86
-            JDK13PATH %SOLAR_JDK13PATH%
-            JDK14PATH %SOLAR_JDK14PATH%
-            JDK15PATH %SOLAR_JDK15PATH%
-            LIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86;%SOLAR_STLLIBPATH%
-            LIBMGR_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/lib.exe
-            LINK_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/link.exe
-            MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
-            MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
-            OJDK16PATH %SOLAR_OJDK16PATH%
-            PATH $cp(%PSDK%$/Bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
-            PROF_EDITION TRUE
-            PSDKINC -I%PSDK%$/include
-            SOLAREXTRAINC -I%DSDK%$/include
-            SOLAR_JAVA TRUE
-            TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
-            USE_DIRECTX5 TRUE
-            WINDOWS_VISTA_PSDK TRUE
-            SYSBASE TRUE
-            WITH_VC_REDIST TRUE
-            XCLASSPATH .
-            ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
-            BUILD_X64 TRUE
-            CHECK_LUCENCE_INDEXER_OUTPUT TRUE
-            GNUCOPY cp
-            GNUMAKE make
-            SYSTEM_LIBRSVG NO
-            SYSTEM_LIBCROCO NO
-            SYSTEM_GDKPIXBUF NO
-            SYSTEM_GLIB NO
-            SYSTEM_GETTEXT NO
-            SYSTEM_PANGO NO
-            SYSTEM_LIBPNG NO
-            SYSTEM_LIBJPEG NO
-            SYSTEM_LIBGSF NO
-        }
-        common0
-        {
-            BS_ROOT n:
-            SOLAR_ENV_ROOT r:
-            SOLAR_SOURCE_ROOT o:
-            BTOOLDIR %WORK_STAMP%$/cygtools
-            PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
-        }
-        common02
-        {
-            PERL perl
-        }
-        common1
-        {
-            COMPATH %SOLAR_ENV_ROOT%$/msvc9p
-            COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
-            DEVROOT %SOLAR_ENV_ROOT%
-            DSDK %SOLAR_ENV_ROOT%$/msvc9p$/DirectXSDK
-            FSDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v3.5
-            F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0
-            NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
-            PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
-            PKGFORMAT msi
-            PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/v6.1
-            SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
-            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-            SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOLAR_ENV_ROOT%
-            SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-            SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-            SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
-            SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-#           TEMP $dp(%TEMP%)
-#           TMP $dp(%TMP%)
-        }
-        common2
-        {
-            ENABLE_GRAPHITE TRUE
-            BUILD_PIXMAN TRUE
-            BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
-            CALL_CDECL TRUE
-            CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%)
-            COM MSC
-            COMEX 12
-            COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools)
-            COMMON_ENV_TOOLS %SOLARROOT%$/etools
-            COMP_ENV wntmsci12
-            CPU I
-            CPUNAME INTEL
-            CVER M1500
-            DYNAMIC_CRT TRUE
-            ENABLE_CAIRO TRUE
-            ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
-            GUI WNT
-            GUIBASE WIN
-            GVER NT351
-            INPATH wntmsci12%PROEXT%
-            LIBMYSQL_PATH %SOLARROOT%$/mysql-connector-c-6.0.2$/wntmsci12
-            MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
-            OS WNT
-            OUTPATH wntmsci12
-            PACKMS %SO_PACK%$/wntmsci12$/MS
-            SET_EXEPTIONS TRUE
-            SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install
-            SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
-            SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
-            SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
-            SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586
-            SOLAR_STLPATH %SOLARVERSION%$/wntmsci12%PROEXT%$/inc%UPDMINOREXT%$/stl
-            SORT sort -T %TMP%
-#           TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe
-            use_shl_versions TRUE
-        }
-        common:3 IF %UPDATER% == YES
-        {
-            SHIPDRIVE %BS_ROOT%$/ship$/install
-        }
-        compath
-        {
-            COMPATH $dp(%STAR_COMPATH%)
-        }
-        distroot:0 if X%DIST_ROOT%X != XX
-        {
-            SHARED_SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
-            SOLARVER $dp(%DIST_ROOT%$/%WORK_STAMP%)
-            SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
-        }
-        envroot:0 IF X%ENV_ROOT%X != XX
-        {
-            SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
-        }
-        jdk14
-        {
-#           HOMEDRIVE %DEVROOT%
-#           HOMEPATH $/jdk141
-            JAVAHOME %JDK14PATH%
-            JAVA_HOME %JDK14PATH%
-            JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include
-            JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
-            JDKLIB %JDK14PATH%$/lib
-            JDKLIBS %JDK14PATH%$/lib
-            JDKPATH %JDK14PATH%$/bin
-            JDK_VERSION 142
-            JREPATH %JDK14PATH%$/jre$/bin$/client
-            XCLASSPATH .;%JDK14PATH%$/jre$/lib$/rt.jar
-        }
-        jdk14path:0 if X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK14PATH $dp(%JDK_PATH%)
-        }
-        jdk15
-        {
-#           HOMEDRIVE %DEVROOT%
-#           HOMEPATH $/jdk151
-            JAVAHOME %JDK15PATH%
-            JAVA_HOME %JDK15PATH%
-            JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include
-            JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
-            JDKLIB %JDK15PATH%$/lib
-            JDKLIBS %JDK15PATH%$/lib
-            JDKPATH %JDK15PATH%$/bin
-            JDK_VERSION 150
-            JREPATH %JDK15PATH%$/jre$/bin$/client
-            XCLASSPATH .;%JDK15PATH%$/jre$/lib$/rt.jar
-        }
-        jdk15path:0 if X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK15PATH $dp(%JDK_PATH%)
-        }
-        ojdk16
-        {
-#           HOMEDRIVE %DEVROOT%
-#           HOMEPATH $/openjdk-6-b08-windows-i586
-            JAVA_HOME %OJDK16PATH%
-            JDKINC %OJDK16PATH%$/include$/win32;%OJDK16PATH%$/include
-            JDKINCS -I%OJDK16PATH%$/include -I%OJDK16PATH%$/include$/win32
-            JDKLIB %OJDK16PATH%$/lib
-            JDKLIBS %OJDK16PATH%$/lib
-            JDKPATH %OJDK16PATH%$/bin
-            JDK_VERSION 160
-            JREPATH %OJDK16PATH%$/jre$/bin$/client
-            XCLASSPATH .;%OJDK16PATH%$/jre$/lib$/rt.jar
-        }
-        ojdk16path:0 if X%JDK_PATH%X != XX
-        {
-            SOLAR_OJDK16PATH $dp(%JDK_PATH%)
-        }
-        pro
-        {
-            RES_ENUS TRUE
-        }
-        psdk
-        {
-            PSDK $dp(%STAR_PSDK%)
-        }
-        sourceroot:0 if X%SOURCE_ROOT%X != XX
-        {
-            SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
-            SOURCE_ROOT_USED TRUE
-        }
-        tmp
-        {
-            SOL_TMP $dp(%SOL_TMP_DIR%)
-        }
-    }
-    extern
-    {
-        COMSPEC
-        DIST_ROOT
-        ENV_ROOT
-        JDK_PATH
-        LOCALINI
-        OSTYPE
-        $dp(SOL_TMP)
-        $dp(SOURCE_ROOT)
-        $dp(TMP)
-        $dp(TEMP)
-    }
-    order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
-    reset
-    {
-        COPYALL
-        CXX_X64_BINARY
-        DB2IMP
-        GCRINC
-        GCRLIB
-        GCRPATH
-        LIBMGR_X64_BINARY
-        LINK_X64_BINARY
-        NSIS_PATH
-        OLD_CHAOS
-        PERLDIR
-        SOLAR_ENV_ROOT
-        TFDEF
-        TFDIR
-        WST
-    }
-    script
-    {
-         sh
-            {
-            400: if [ $COPYALL ]; then
-            410:    perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            415: fi
-            600: umask 002
-            800: hash -r
-            820: wrapfetch.sh
-            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-            851:       export SO_GEN_ERROR
-            852: fi
-            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-            861:       export SO_GEN_ERROR2
-            862: fi
-            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-            871:       echo $SO_GEN_ERROR
-            872: fi
-            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-            881:       echo $SO_GEN_ERROR2
-            882: fi
-        }
-    }
-    switches
-    {
-        bs_sourceroot SOURCE_ROOT_TMP
-        bsclient
-        cap
-        cax
-        compath STAR_COMPATH
-        distroot
-        envroot
-        jdk14
-        jdk14path
-        jdk15
-        jdk15path
-        l10n L10N_framework
-        ojdk16
-        ojdk16path
-        pro
-        psdk STAR_PSDK
-        sourceroot
-        tmp SOL_TMP_DIR
-    }
-}
-wntmsci13
-{
-    environment
-    {
-        bs_sourceroot
-        {
-            SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
-            SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
-            SOURCE_ROOT_USED TRUE
-        }
-        cap
-        {
-            BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
-            COMPATH %SOL_TMP%$/r$/msvc9p
-            COMPROOT %SOL_TMP%$/r$/msvc9p
-            COPYALL TRUE
-            COPY_PACKED TRUE
-            DEVROOT %SOL_TMP%$/r
-            DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
-            ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
-            FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
-            F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-            NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-            PCLEAN_PATH %SOLARROOT%$/etw
-            PERL %SOL_TMP%$/r$/%PERLDIR%
-            PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/v6.1
-            SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-#           TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
-
-        }
-        cax
-        {
-            BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
-            COMPATH %SOL_TMP%$/r$/msvc9p
-            COMPROOT %SOL_TMP%$/r$/msvc9p
-            COPYALL FALSE
-            DSDK %COMPATH%$/DirectXSDK
-            ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
-            FSDK %COMPATH%$/Sdk$/v3.5
-            F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-            NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-            PCLEAN_PATH %SOL_TMP%$/r$/etw
-            PERL %SOL_TMP%$/r$/%PERLDIR%
-            PSDK %COMPATH%$/PlatformSDK$/v6.1
-            SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOL_TMP%$/r
-            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-#           TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
-        }
-        common
-        {
-            *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
-            *build_client %PERL% %SOLARENV%$/bin$/build_client.pl
-            *copyprj %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
-            *deliver %PERL% %SOLARENV%$/bin$/deliver.pl
-            *mkout %PERL% %SOLARENV%$/bin$/mkout.pl
-            *mwscommit %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
-            *o cd %SOLARENV%$/..
-            *r cd %SOLARROOT%
-            *s cd %SOLARVERSION%
-            *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-            *z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
-            BIG_SVX
-            COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
-            CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
-            DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
-            DMAKEROOT %SOLARENV%$/inc$/startup
-            ENABLE_PCH TRUE
-            ILIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86
-            JDK13PATH %SOLAR_JDK13PATH%
-            JDK14PATH %SOLAR_JDK14PATH%
-            JDK15PATH %SOLAR_JDK15PATH%
-            LIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86;%SOLAR_STLLIBPATH%
-            LIBMGR_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/lib.exe
-            LINK_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/link.exe
-            MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
-            MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
-            OJDK16PATH %SOLAR_OJDK16PATH%
-            PATH $cp(%PSDK%$/Bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
-            PROF_EDITION TRUE
-            PSDKINC -I%PSDK%$/include
-            SOLAREXTRAINC -I%DSDK%$/include
-            SOLAR_JAVA TRUE
-            TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
-            USE_DIRECTX5 TRUE
-            WINDOWS_VISTA_PSDK TRUE
-            SYSBASE TRUE
-            WITH_VC_REDIST TRUE
-            XCLASSPATH .
-            ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
-            BUILD_X64 TRUE
-            GNUCOPY cp
-            GNUMAKE make
-            SYSTEM_LIBRSVG NO
-            SYSTEM_LIBCROCO NO
-            SYSTEM_GDKPIXBUF NO
-            SYSTEM_GLIB NO
-            SYSTEM_GETTEXT NO
-            SYSTEM_PANGO NO
-            SYSTEM_LIBPNG NO
-            SYSTEM_LIBJPEG NO
-            SYSTEM_LIBGSF NO
-        }
-        common0
-        {
-            BS_ROOT n:
-            SOLAR_ENV_ROOT r:
-            SOLAR_SOURCE_ROOT o:
-            BTOOLDIR %WORK_STAMP%$/cygtools
-            PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
-        }
-        common02
-        {
-            PERL perl
-        }
-        common1
-        {
-            COMPATH %SOLAR_ENV_ROOT%$/msvc9p
-            COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
-            DEVROOT %SOLAR_ENV_ROOT%
-            DSDK %SOLAR_ENV_ROOT%$/msvc9p$/DirectXSDK
-            FSDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v3.5
-            F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0
-            NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
-            PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
-            PKGFORMAT msi
-            PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/v6.1
-            SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
-            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-            SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-            SOLARROOT %SOLAR_ENV_ROOT%
-            SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-            SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-            SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
-            SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-#           TEMP $dp(%TEMP%)
-#           TMP $dp(%TMP%)
-        }
-        common2
-        {
-            ENABLE_GRAPHITE TRUE
-            BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
-            CALL_CDECL TRUE
-            CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%)
-            COM MSC
-            COMEX 12
-            COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools)
-            COMMON_ENV_TOOLS %SOLARROOT%$/etools
-            COMP_ENV wntmsci13
-            CPU I
-            CPUNAME INTEL
-            CVER M1500
-            DYNAMIC_CRT TRUE
-            ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
-            GUI WNT
-            GUIBASE WIN
-            GVER NT351
-            INPATH wntmsci13%PROEXT%
-            MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
-            OS WNT
-            OUTPATH wntmsci13
-            PACKMS %SO_PACK%$/wntmsci13$/MS
-            SET_EXEPTIONS TRUE
-            SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install
-            SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
-            SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
-            SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
-            SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586
-            SOLAR_STLPATH %SOLARVERSION%$/wntmsci13%PROEXT%$/inc%UPDMINOREXT%$/stl
-            SORT sort -T %TMP%
-#           TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe
-            use_shl_versions TRUE
-        }
-        common:3 IF %UPDATER% == YES
-        {
-            SHIPDRIVE %BS_ROOT%$/ship$/install
-        }
-        compath
-        {
-            COMPATH $dp(%STAR_COMPATH%)
-        }
-        distroot:0 if X%DIST_ROOT%X != XX
-        {
-            SHARED_SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
-            SOLARVER $dp(%DIST_ROOT%$/%WORK_STAMP%)
-            SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
-        }
-        envroot:0 IF X%ENV_ROOT%X != XX
-        {
-            SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
-        }
-        jdk14
-        {
-#           HOMEDRIVE %DEVROOT%
-#           HOMEPATH $/jdk141
-            JAVAHOME %JDK14PATH%
-            JAVA_HOME %JDK14PATH%
-            JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include
-            JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
-            JDKLIB %JDK14PATH%$/lib
-            JDKLIBS %JDK14PATH%$/lib
-            JDKPATH %JDK14PATH%$/bin
-            JDK_VERSION 142
-            JREPATH %JDK14PATH%$/jre$/bin$/client
-            XCLASSPATH .;%JDK14PATH%$/jre$/lib$/rt.jar
-        }
-        jdk14path:0 if X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK14PATH $dp(%JDK_PATH%)
-        }
-        jdk15
-        {
-#           HOMEDRIVE %DEVROOT%
-#           HOMEPATH $/jdk151
-            JAVAHOME %JDK15PATH%
-            JAVA_HOME %JDK15PATH%
-            JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include
-            JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
-            JDKLIB %JDK15PATH%$/lib
-            JDKLIBS %JDK15PATH%$/lib
-            JDKPATH %JDK15PATH%$/bin
-            JDK_VERSION 150
-            JREPATH %JDK15PATH%$/jre$/bin$/client
-            XCLASSPATH .;%JDK15PATH%$/jre$/lib$/rt.jar
-        }
-        jdk15path:0 if X%JDK_PATH%X != XX
-        {
-            SOLAR_JDK15PATH $dp(%JDK_PATH%)
-        }
-        ojdk16
-        {
-#           HOMEDRIVE %DEVROOT%
-#           HOMEPATH $/openjdk-6-b08-windows-i586
-            JAVA_HOME %OJDK16PATH%
-            JDKINC %OJDK16PATH%$/include$/win32;%OJDK16PATH%$/include
-            JDKINCS -I%OJDK16PATH%$/include -I%OJDK16PATH%$/include$/win32
-            JDKLIB %OJDK16PATH%$/lib
-            JDKLIBS %OJDK16PATH%$/lib
-            JDKPATH %OJDK16PATH%$/bin
-            JDK_VERSION 160
-            JREPATH %OJDK16PATH%$/jre$/bin$/client
-            XCLASSPATH .;%OJDK16PATH%$/jre$/lib$/rt.jar
-        }
-        ojdk16path:0 if X%JDK_PATH%X != XX
-        {
-            SOLAR_OJDK16PATH $dp(%JDK_PATH%)
-        }
-        pro
-        {
-            RES_ENUS TRUE
-        }
-        psdk
-        {
-            PSDK $dp(%STAR_PSDK%)
-        }
-        sourceroot:0 if X%SOURCE_ROOT%X != XX
-        {
-            SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
-            SOURCE_ROOT_USED TRUE
-        }
-        tmp
-        {
-            SOL_TMP $dp(%SOL_TMP_DIR%)
-        }
-    }
-    extern
-    {
-        COMSPEC
-        DIST_ROOT
-        ENV_ROOT
-        JDK_PATH
-        LOCALINI
-        OSTYPE
-        $dp(SOL_TMP)
-        $dp(SOURCE_ROOT)
-        $dp(TMP)
-        $dp(TEMP)
-    }
-    order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
-    reset
-    {
-        COPYALL
-        CXX_X64_BINARY
-        DB2IMP
-        GCRINC
-        GCRLIB
-        GCRPATH
-        LIBMGR_X64_BINARY
-        LINK_X64_BINARY
-        NSIS_PATH
-        OLD_CHAOS
-        PERLDIR
-        SOLAR_ENV_ROOT
-        TFDEF
-        TFDIR
-        WST
-    }
-    script
-    {
-         sh
-            {
-            400: if [ $COPYALL ]; then
-            410:    perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            415: fi
-            600: umask 002
-            800: hash -r
-            820: wrapfetch.sh
-            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-            851:       export SO_GEN_ERROR
-            852: fi
-            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-            861:       export SO_GEN_ERROR2
-            862: fi
-            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-            871:       echo $SO_GEN_ERROR
-            872: fi
-            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-            881:       echo $SO_GEN_ERROR2
-            882: fi
-        }
-    }
-    switches
-    {
-        bs_sourceroot SOURCE_ROOT_TMP
-        bsclient
-        cap
-        cax
-        compath STAR_COMPATH
-        distroot
-        envroot
-        jdk14
-        jdk14path
-        jdk15
-        jdk15path
-        l10n L10N_framework
-        ojdk16
-        ojdk16path
-        pro
-        psdk STAR_PSDK
-        sourceroot
-        tmp SOL_TMP_DIR
-    }
-}
-
diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
deleted file mode 100644
index 3694c225973c..000000000000
--- a/solenv/config/ssolar.cmn
+++ /dev/null
@@ -1,336 +0,0 @@
-common
-{
-	switches
-	{
-		pro
-		bsclient
-	}
-	extern
-	{
-		PATH
-		TMP
-		VCSID
-	}
-	reset
-	{
-        *o:
-        *r:
-        *s:
-		*mkout
-		*deliver
-        *dmake
-        *copyprj
-		__mgrdir
-        gb_LOCALBUILDDIR
-		product
-        rsc_once
-        wrapper_override_cc_wrapper
-        *zipdep
-		ALT_L10N_MODULE
-        AWK
-		BIG_SVX
-		BIG_TOOLS
-		BISON_HAIRY
-        BISON_PKGDATADIR
-		BISON_SIMPLE
-		BMP_WRITES_FLAG
-		bndchk
-		BSCLIENT
-		BTARGET
-		BUILD_OS_APPLEOSX
-		BUILD_OS_MINOR
-		BUILD_OS_REV
-		BUILD_OS_MAJOR
-		BUILD_PIXMAN
-		BUILD_TOOLS
-        BUILD_TYPE
-		BUILD_SPECIAL
-		BUILD_STAX
-        BUILD_X64
-		CLASSPATH
-		CALL_CDECL
-		CHECK_LUCENCE_INDEXER_OUTPUT
-		COMEX
-		common_build
-		COMMON_OUTDIR
-		COPYALL
-        COPY_PACKED
-        CVS_HEAD
-		CVSROOT
-        CWS_WORK_STAMP
-        CWS_WORK_STAMP_EXT
-		DB2IMP
-		DB2INC
-		DB2LIB
-		DB2PATH
-        DEFAULT_TO_ENGLISH_FOR_PACKING
-        DIRECTX_SUPPORT
-		DISABLE_ADO
-		DISABLE_ATL
-        DISABLE_ENHANCED_COMID
-		DISABLE_JAVA
-		DISABLE_SAL_DBGBOX
-		DELIVER
-		DIC_ALL
-		DPKG
-		DYLD_LIBRARY_PATH
-		LD_LIBRARY_PATH
-		DMAKE_INC
-		DMAKE
-		DRIVE_O
-		DRIVE_S
-		DYNAMIC_CRT
-		ENABLE_AGG
-		ENABLE_CRASHDUMP
-		ENABLE_CUPS
-        ENABLE_DIRECTX
-        ENABLE_EVOAB2
-		ENABLE_FONTCONFIG
-        ENABLE_GTK
-        ENABLE_GCONF
-        ENABLE_GNOMEVFS
-        ENABLE_KDE
-        ENABLE_MEDIAWIKI
-		ENABLE_MINIMIZER
-		ENABLE_NSS_MODULE
-        ENABLE_PASF
-        ENABLE_RANDR
-        ENABLE_REPORTBUILDER
-		ENABLE_REPORTDESIGN
-        ENABLE_SVCTAGS
-		FORCE2ARCHIVE
-		PA_VER
-        ENABLE_NAS
-		ENABLE_PCH
-		SYSTEM_CURL
-        SYSTEM_CPPUNIT
-        SYSTEM_FREETYPE
-        FREETYPE_CFLAGS
-        FREETYPE_LIBS
-		SYSTEM_LIBXML
-        LIBXML_CFLAGS
-        LIBXML_LIBS
-        SYSTEM_LIBXSLT
-        LIBXSLT_CFLAGS
-        LIBXSLT_LIBS
-		SYSTEM_ZLIB
-		SYSTEM_PYTHON
-		SYSTEM_PORTAUDIO
-		SYSTEM_SNDFILE
-		ENABLEUNICODE
-		ENVCDEFS
-        HAVE_GCC_VISIBILITY_FEATURE
-		GCRINC
-		GCRLIB
-		GCRPATH
-		GLIBC
-		GNUCOPY
-		GXX_INCLUDE_PATH
-		HBTOOLKIT
-		HOMEDRIVE
-		HOMEPATH
-		IENV
-		INCLUDE
-		JAVA_HOME
-		JAVAHOME
-		JDK_VERSION
-		JDKINC
-		JDKINCS
-		JDKLIB
-		JDKLIBS
-		JDKPATH
-		JDK_PATH
-        L10N-framework
-        L10N_framework
-        LFS_CFLAGS
-		LOCALINI
-		MACOSX_DEPLOYMENT_TARGET
-		MK_UNROLL
-		MKDIR
-		MKOUT
-		MKSPATH
-		MULTITHREAD_OBJ
-        MWS_BUILD
-		NEW_JAR_PACK
-		NO_BSYMBOLIC
-		NO_HIDS
-		NO_DEFAULT_STL
-		NO_REC_RES
-		no_transex
-		NOSOLAR_JAVA
-		NSIS_PATH
-		ODBCINC
-		ODBCLIB
-		ODBCPATH
-		ODBCVER
-		OLD_CHAOS
-        OOO_JUNIT_JAR
-        OOO_SHELL
-        OOO_SYSBASE_SYS_RELEASE
-		PACKMS
-		PCLEAN_PATH
-        PKGCONFIG_ROOT
-        PKG_CONFIG_PATH
-        PKGFORMAT
-		PRE
-	    PREBUILD_MOZAB
-        PRODUCTENVCACHE
-		PRODUCTNAME
-		PROEXT
-		PROF_EDITION
-		PROFILE
-		profile
-        PROSWITCH
-        PTHREAD_CFLAGS
-		REMOTE_BUILD_FLAG
-		RES_ARAB
-		RES_CHINSIM
-		RES_CHINTRAD
-		RES_DAN
-		RES_DTCH
-		RES_ENUS
-		RES_FREN
-		RES_GER
-		RES_GREEK
-		RES_ITAL
-		RES_JAPN
-		RES_KOREAN
-		RES_POL
-		RES_PORT
-		RES_RUSS
-		RES_SPAN
-		RES_SWED
-		RES_THAI
-		RES_TURK
-	   	RES_HINDI
-		RES_PORTBR
-		RES_HEBREW
-        RES_HUNG
-		RPM
-		WITH_LANG
-		WITH_MOZILLA
-		ROOTDIR
-		RSCRES
-		SCPLINKVERSION
-		SET_EXCEPTIONS
-		SHARED_SOLARVERSION
-        SO_PACK
-		SOLAR_JAVA
-		SOLAR_PLUGIN
-		SOLARINC
-		SOLARLIB
-        SOLARUPD
-		SOLARVERSION
-        SOURCE_ROOT_USED
-        SOURCE_ROOT_DIR
-		STAR_REGISTRY
-        STAR_RESOURCEPATH
-		STLPORT4
-		STLPORT_VER
-		SYSPATH
-        TARFILE_LOCATION
-		TF_CAPELLA
-		TF_CFG
-		TF_CFGDATA
-		TF_CNTEX
-		TF_FILTER
-		TF_FILEURL
-		TF_NEWEX
-		TF_SDBAPI
-		TF_UCB
-		TF_SVDATA
-		TFDEF
-		TFDIR
-		TIMELOG
-		truetime
-		TRUSTED_MANIFEST_LOCATION
-		UDKSTAMP
-		URD_ONLY
-		USE_DIRECTX5
-		USE_MAPFILES
-		USE_NEW_SDK
-        USE_PCH
-        USE_SYSTEM_STL
-		use_cygcp
-		use_shl_versions
-        VCL
-        VERBOSE
-		VISTA_MANIFEST
-        XAU_LIBS
-		WINDOWS_VISTA_PSDK
-        WITH_LDAP
-        WITH_VC_REDIST
-		WST
-		XCLASSPATH
-        XSLTPROC
-        ZIPDEP
-		ZIPSOURCE
-        AGG_VERSION
-        ANT_HOME
-        ANT_LIB
-        ANT
-        AWTLIB
-        CC
-        CXX
-        EXCEPTIONS
-        GXX_INCLUDE_PATH
-        EXTERNAL_WARNINGS_NOT_ERRORS
-        GNUMAKE
-        HAVE_LD_HASH_STYLE
-        JAVACOMPILER
-        JAVADOC
-        JAVAIFLAGS
-        JDK
-        NO_HIDS
-        PAM_LINK
-        PAM
-        PSPRINT
-        PYTHONHOME
-        PYTHONPATH
-        SOLAR_PLUGIN
-        URE_BOOTSTRAP
-        USE_FT_EMBOLDEN
-        USE_XINERAMA
-        XINERAMA_LINK
-	}
-	restore
-	{
-		PATH
-	}
-	order pro common bsclient
-	environment
-	{
-		pro
-		{
-			PROEXT .pro
-		}
-		common
-		{
-            SO_GEN_ERROR
-            SO_GEN_ERROR2
-            CVS_HEAD DEV300
-		}
-		bsclient
-		{
-			BSCLIENT TRUE
-			DISABLE_SAL_DBGBOX TRUE
-		}
-	}
-}
-
-unxsogs
-{
-}
-
-unxfbsdi
-{
-}
-
-unxsols4
-{
-}
-
-unxmacxp
-{
-}
-
diff --git a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
index 97ca9b252789..2b65f3fce66e 100644
--- a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
@@ -20,7 +20,6 @@ static const Path GBUILDDIR;
 static const Path INPATH;
 static const Path JAVA_HOME;
 static const Path UPD;
-static const String CVER;
 static const String LIBXML_CFLAGS;
 static const String OS;
 static const String STLPORT_VER;
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index ccd574ba7c93..fe4f30649da2 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -25,31 +25,50 @@
 #
 #*************************************************************************
 
+
+# Overview of dependencies and tasks of SrsTarget
+#
+# target                task                depends on
+# SrsTarget             joining the parts   SrsPartTarget
+#                                           SrsTemplateTarget
+# SrsPartTarget         preprocessing       SrsPartMergeTarget (with l10n)
+#                                           source file (without l10n)
+# SrsTemplateTarget     handling templates  SrsTemplatePartTarget
+# SrsTemplatePartTarget handling template   SrsPartMergeTarget
+# SrsPartMergeTarget    merging/transex     source file (only needed with l10n)
+
+# Overview of dependencies and tasks of AllLangResTarget
+#
+# target                task                depends on
+# AllLangResTarget      nothing             ResTarget for all active langs
+# ResTarget             running rsc         SrsTarget, resources
+
+
 # SrsPartMergeTarget class
 
 gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target,transex3)
 # gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms
 
 gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
-gb_SrsPartMergeTarget_SDFLOCATION := $(LOCDIR)/l10n/$(INPATH)/misc/sdf/
+gb_SrsPartMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
 gb_SrsPartMergeTarget_REPOS := $(gb_REPOS)
 
 define gb_SrsPartMergeTarget__command
 $(call gb_Output_announce,$(3),$(true),srs,1)
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) && \
-    $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
-        -p $(firstword $(subst /, ,$(2))) \
-        -i $(3) \
-        -o $(1) \
-        -m $(SDF) \
-        -l all)
+	mkdir -p $(dir $(1)) && \
+	$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
+		-p $(firstword $(subst /, ,$(2))) \
+		-i $(realpath $(3)) \
+		-o $(1) \
+		-m $(SDF) \
+		-l all)
 
 endef
 
 define gb_SrsPartMergeTarget__rules
 $$(call gb_SrsPartMergeTarget_get_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY) | $$(gb_SrsPartMergeTarget_TRANSEXTARGET)
-    $$(if $$(SDF),$$(call gb_SrsPartMergeTarget__command,$$@,$$*,$$<),mkdir -p $$(dir $$@) && cp $$< $$@)
+	$$(if $$(SDF),$$(call gb_SrsPartMergeTarget__command,$$@,$$*,$$<),mkdir -p $$(dir $$@) && cp $$< $$@)
 
 endef
 
@@ -65,29 +84,29 @@ gb_SrsPartTarget_REPOS := $(gb_REPOS)
 
 define gb_SrsPartTarget__command
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) && \
-    RESPONSEFILE=`$(gb_MKTEMP)` && \
-    echo "-s \
-        $(INCLUDE) \
-        -I$(dir $(3)) \
-        $(DEFS) \
-        -fp=$(1) \
-        $(if $(MERGEDFILE),$(MERGEDFILE),$<)" > $${RESPONSEFILE} && \
-    $(gb_SrsPartTarget_RSCCOMMAND) -presponse @$${RESPONSEFILE} && \
-    rm -rf $${RESPONSEFILE})
+	mkdir -p $(dir $(1)) && \
+	RESPONSEFILE=`$(gb_MKTEMP)` && \
+	echo "-s \
+		$(INCLUDE) \
+		-I$(realpath $(dir $(3))) \
+		$(DEFS) \
+		-fp=$(1) \
+		$(realpath $(if $(MERGEDFILE),$(MERGEDFILE),$<))" > $${RESPONSEFILE} && \
+	$(gb_SrsPartTarget_RSCCOMMAND) -presponse @$${RESPONSEFILE} && \
+	rm -rf $${RESPONSEFILE})
 
 endef
 
 define gb_SrsPartTarget__rules
 $$(call gb_SrsPartTarget_get_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY) | $$(gb_SrsPartTarget_RSCTARGET)
-    $$(call gb_SrsPartTarget__command_dep,$$*,$$<)
-    $$(call gb_SrsPartTarget__command,$$@,$$*,$$<)
+	$$(call gb_SrsPartTarget__command_dep,$$*,$$<)
+	$$(call gb_SrsPartTarget__command,$$@,$$*,$$<)
 
 ifeq ($(gb_FULLDEPS),$(true))
 $$(call gb_SrsPartTarget_get_dep_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY)
-    $$(call gb_Helper_abbreviate_dirs,\
-        mkdir -p $$(dir $$@) && \
-        echo '$$(call gb_SrsPartTarget_get_target,$$*) : $$(gb_Helper_PHONY)' > $$@)
+	$$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $$(dir $$@) && \
+		echo '$$(call gb_SrsPartTarget_get_target,$$*) : $$(gb_Helper_PHONY)' > $$@)
 endif
 
 endef
@@ -96,7 +115,7 @@ $(foreach repo,$(gb_SrsPartTarget_REPOS),$(eval $(call gb_SrsPartTarget__rules,$
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_SrsPartTarget_get_dep_target,%) :
-    $(eval $(call gb_Output_error,Unable to find resource definition file $* in repositories: $(gb_SrsPartTarget_REPOS)))
+	$(eval $(call gb_Output_error,Unable to find resource definition file $* in repositories: $(gb_SrsPartTarget_REPOS)))
 endif
 
 
@@ -111,6 +130,72 @@ endif
 
 endef
 
+# SrsTemplatePartTarget class
+
+define gb_SrsTemplatePartTarget_SrsTemplatePartTarget
+$(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_get_target,$(1))
+	$$(call gb_Helper_abbreviate_dirs,\
+	    mkdir -p $$(dir $$@) && \
+	    cp $$< $$@)
+ifneq ($(strip $(WITH_LANG)),)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : $$(SDF)
+endif
+endef
+
+# SrsTemplateTarget class
+
+define gb_SrsTemplateTarget__command
+	$(call gb_Helper_abbreviate_dirs,\
+	    mkdir -p $(dir $(1)) && \
+	    touch $(1))
+endef
+
+gb_SrsTemplateTarget__get_merged_target = $(call gb_SrsTemplateTarget_get_target,$(1))_merged_last
+gb_SrsTemplateTarget__get_unmerged_target = $(call gb_SrsTemplateTarget_get_target,$(1))_unmerged_last
+
+ifeq ($(strip $(WITH_LANG)),)
+gb_SrsTemplateTarget__get_target = $(call gb_SrsTemplateTarget__get_unmerged_target,$(1))
+gb_SrsTemplateTarget__get_update_target = $(call gb_SrsTemplateTarget__get_merged_target,$(1))
+else
+gb_SrsTemplateTarget__get_target = $(call gb_SrsTemplateTarget__get_merged_target,$(1))
+gb_SrsTemplateTarget__get_update_target = $(call gb_SrsTemplateTarget__get_unmerged_target,$(1))
+endif
+
+define gb_SrsTemplateTarget_SrsTemplateTarget
+$(call gb_SrsTemplateTarget_get_target,$(1)) : PARTS :=
+$(call gb_SrsTemplateTarget_get_clean_target,$(1)) : PARTS :=
+$(call gb_SrsTemplateTarget_get_target,$(1)) : $(call gb_SrsTemplateTarget__get_target,$(1))
+$(call gb_SrsTemplateTarget__get_target,$(1)) : $(call gb_SrsTemplateTarget__get_update_target,$(1))
+endef
+
+.PHONY : $(call gb_SrsTemplateTarget_get_target,%_last)
+$(call gb_SrsTemplateTarget_get_target,%_last) :
+	$(call gb_SrsTemplateTarget__command,$@)
+
+.PHONY : $(call gb_SrsTemplateTarget_get_target,%)
+$(call gb_SrsTemplateTarget_get_target,%) :
+	$(if $(strip $(PARTS)),$(call gb_Output_announce,$*,$(true),SRT,4))
+	$(call gb_SrsTemplateTarget__command,$@)
+
+.PHONY : $(call gb_SrsTemplateTarget_get_clean_target,%)
+$(call gb_SrsTemplateTarget_get_clean_target,%) :
+	$(if $(strip $(PARTS)),$(call gb_Output_announce,$*,$(false),SRT,4))
+	-$(call gb_Helper_abbreviate_dirs,\
+	    rm -f $(call gb_SrsTemplateTarget_get_target,$*) \
+		    $(call gb_SrsTemplateTarget__get_merged_target,$*) \
+		    $(call gb_SrsTemplateTarget__get_unmerged_target,$*) \
+		    $(foreach part,$(PARTS),$(call gb_SrsTemplatePartTarget_get_target,$(part))) \
+		    $(foreach part,$(PARTS),$(call gb_SrsPartMergeTarget_get_target,$(part))))
+
+define gb_SrsTemplateTarget_add_file
+$(call gb_SrsTemplatePartTarget_SrsTemplatePartTarget,$(2))
+$(call gb_SrsTemplateTarget_get_target,$(1)) : PARTS += $(2)
+$(call gb_SrsTemplateTarget_get_clean_target,$(1)) : PARTS += $(2)
+$(call gb_SrsTemplateTarget__get_target,$(1)) : $(call gb_SrsTemplatePartTarget_get_target,$(2))
+$(call gb_SrsTemplatePartTarget_get_target,$(2)) : $(call gb_SrsTemplateTarget__get_update_target,$(1))
+$(call gb_SrsPartMergeTarget_get_target,$(2)) : $(call gb_SrsTemplateTarget__get_update_target,$(1))
+endef
 
 # SrsTarget class
 
@@ -118,40 +203,43 @@ gb_SrsTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
 
 .PHONY : $(call gb_SrsTarget_get_clean_target,%)
 $(call gb_SrsTarget_get_clean_target,%) :
-    $(call gb_Output_announce,$*,$(false),SRS,1)
-    -$(call gb_Helper_abbreviate_dirs,\
-        rm -f $(call gb_SrsTarget_get_target,$*) \
-            $(call gb_SrsTarget_get_dep_target,$*) \
-            $(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_target,$(part))) \
-            $(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_dep_target,$(part))) \
-            $(foreach part,$(PARTS),$(call gb_SrsPartMergeTarget_get_target,$(part))))
+	$(call gb_Output_announce,$*,$(false),SRS,1)
+	-$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_SrsTarget_get_target,$*) \
+			$(call gb_SrsTarget_get_dep_target,$*) \
+			$(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_target,$(part))) \
+			$(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_dep_target,$(part))) \
+			$(foreach part,$(PARTS),$(call gb_SrsPartMergeTarget_get_target,$(part))))
 
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_SrsTarget__command_dep
 $(call gb_Output_announce,SRS:$(2),$(true),DEP,1)
 $(call gb_Helper_abbreviate_dirs,\
-    mkdir -p $(dir $(1)) && \
-    cat $(3) > $(1))
+	mkdir -p $(dir $(1)) && \
+	cat $(3) > $(1))
 endef
 endif
 
 $(call gb_SrsTarget_get_target,%) :
-    $(call gb_SrsTarget__command_dep,$(call gb_SrsTarget_get_dep_target,$*),$*,$(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_dep_target,$(part))))
-    $(call gb_Output_announce,$*,$(true),SRS,1)
-    $(call gb_Helper_abbreviate_dirs,\
-        mkdir -p $(dir $@) && \
-        cat $^ > $@)
+	$(call gb_SrsTarget__command_dep,$(call gb_SrsTarget_get_dep_target,$*),$*,$(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_dep_target,$(part))))
+	$(call gb_Output_announce,$*,$(true),SRS,1)
+	$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@) && \
+		cat $^ > $@)
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_SrsTarget_get_dep_target,%) :
-    $(call gb_SrsTarget__command_dep,$@,$*,$^)
+	$(call gb_SrsTarget__command_dep,$@,$*,$^)
 endif
 
 define gb_SrsTarget_SrsTarget
+$(call gb_SrsTemplateTarget_SrsTemplateTarget,$(1))
 $(call gb_SrsTarget_get_target,$(1)) : DEFS := $(gb_SrsTarget_DEFAULTDEFS)
 $(call gb_SrsTarget_get_target,$(1)) : INCLUDE := $(SOLARINC)
 $(call gb_SrsTarget_get_clean_target,$(1)) : PARTS :=
 $(call gb_SrsTarget_get_target,$(1)) : PARTS :=
+$(call gb_SrsTarget_get_target,$(1)) : $(call gb_SrsTemplateTarget_get_target,$(1))
+$(call gb_SrsTarget_get_clean_target,$(1)) : $(call gb_SrsTemplateTarget_get_clean_target,$(1))
 ifeq ($(gb_FULLDEPS),$(true))
 ifneq ($(wildcard $(call gb_SrsTarget_get_dep_target,$(1))),)
 include $(call gb_SrsTarget_get_dep_target,$(1))
@@ -184,6 +272,7 @@ $(call gb_SrsTarget_get_dep_target,$(1)) : $(call gb_SrsPartTarget_get_dep_targe
 endif
 $(call gb_SrsPartTarget_SrsPartTarget,$(2))
 $(call gb_SrsTarget_get_target,$(1)) : $(call gb_SrsPartTarget_get_target,$(2))
+$(call gb_SrsPartTarget_get_target,$(2)) :| $(call gb_SrsTemplateTarget_get_target,$(1))
 $(call gb_SrsTarget_get_clean_target,$(1)) : PARTS += $(2)
 $(call gb_SrsTarget_get_target,$(1)) : PARTS += $(2)
 
@@ -194,46 +283,55 @@ $(foreach file,$(2),$(call gb_SrsTarget_add_file,$(1),$(file)))
 
 endef
 
+define gb_SrsTarget_add_template
+$(call gb_SrsTemplateTarget_add_file,$(1),$(2))
+endef
+
+define gb_SrsTarget_add_templates
+$(foreach template,$(2),$(eval $(call gb_SrsTarget_add_template,$(1),$(template))))
+endef
+
 
 # ResTarget
 
 gb_ResTarget_RSCTARGET := $(gb_SrsPartTarget_RSCTARGET)
 gb_ResTarget_RSCCOMMAND := $(gb_SrsPartTarget_RSCCOMMAND)
-gb_ResTarget_DEFIMAGESLOCATION := $(SRCDIR)/default_images/
+gb_ResTarget_DEFIMAGESLOCATION := $(realpath $(SRCDIR)/default_images)/
 
 $(call gb_ResTarget_get_clean_target,%) :
-    $(call gb_Output_announce,$*,$(false),RES,2)
-    $(call gb_Helper_abbreviate_dirs,\
-        rm -f $(call gb_ResTarget_get_target,$*) $(call gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*) $(call gb_ResTarget_get_outdir_imagelist_target,$*))
+	$(call gb_Output_announce,$*,$(false),RES,2)
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_ResTarget_get_target,$*) $(call gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*) $(call gb_ResTarget_get_outdir_imagelist_target,$*))
 
 $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) | $(gb_ResTarget_RSCTARGET)
-    $(call gb_Output_announce,$*,$(true),RES,2)
-    $(call gb_Helper_abbreviate_dirs_native,\
-        mkdir -p $(dir $@) $(OUTDIR)/bin \
-            $(dir $(call gb_ResTarget_get_imagelist_target,$*)) && \
-        RESPONSEFILE=`$(gb_MKTEMP)` && \
-        echo "-r -p \
-            -lg$(LANGUAGE) \
-            -fs=$@ \
-            -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/$(LIBRARY)) \
-            -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst/$(LANGUAGE)) \
-            -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst) \
-            -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res/$(LANGUAGE)) \
-            -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res) \
-            -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)) \
-            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)res/$(LANGUAGE) \
-            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)res \
-            -subMODULE=$(dir $(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION))) \
-            -subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \
-            -oil=$(dir $(call gb_ResTarget_get_imagelist_target,$*)) \
-            $(filter-out $(gb_Helper_MISCDUMMY),$^)" > $${RESPONSEFILE} && \
-        $(gb_ResTarget_RSCCOMMAND) @$${RESPONSEFILE} && \
-        rm -f $${RESPONSEFILE})
+	$(call gb_Output_announce,$*,$(true),RES,2)
+	$(call gb_Helper_abbreviate_dirs_native,\
+		mkdir -p $(dir $@) $(OUTDIR)/bin \
+			$(dir $(call gb_ResTarget_get_imagelist_target,$*)) && \
+		RESPONSEFILE=`$(gb_MKTEMP)` && \
+		echo "-r -p \
+			-lg$(LANGUAGE) \
+			-fs=$@ \
+			-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/$(LIBRARY)) \
+			-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst/$(LANGUAGE)) \
+			-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst) \
+			-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res/$(LANGUAGE)) \
+			-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res/imagelst) \
+			-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res) \
+			-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)) \
+			-lip=$(gb_ResTarget_DEFIMAGESLOCATION)res/$(LANGUAGE) \
+			-lip=$(gb_ResTarget_DEFIMAGESLOCATION)res \
+			-subMODULE=$(dir $(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION))) \
+			-subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \
+			-oil=$(dir $(call gb_ResTarget_get_imagelist_target,$*)) \
+			$(filter-out $(gb_Helper_MISCDUMMY),$^)" > $${RESPONSEFILE} && \
+		$(gb_ResTarget_RSCCOMMAND) @$${RESPONSEFILE} && \
+		rm -f $${RESPONSEFILE})
 
 $(call gb_ResTarget_get_outdir_target,%) :
-    $(call gb_Helper_abbreviate_dirs,\
-        $(call gb_Deliver_deliver,$<,$@) && \
-        $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(ILSTTARGET)),$(ILSTTARGET)))
+	$(call gb_Helper_abbreviate_dirs,\
+		$(call gb_Deliver_deliver,$<,$@) && \
+		$(call gb_Deliver_deliver,$(dir $<)/$(notdir $(ILSTTARGET)),$(ILSTTARGET)))
 
 define gb_ResTarget_ResTarget
 $(call gb_ResTarget_get_target,$(1)) : LIBRARY = $(2)
@@ -263,13 +361,13 @@ endef
 
 define gb_ResTarget_add_files
 $(foreach file,$(2),\
-    $(call gb_ResTarget_add_file,$(1),$(file)))
+	$(call gb_ResTarget_add_file,$(1),$(file)))
 
 endef
 
 define gb_ResTarget_add_srs
 $(foreach srs,$(2),\
-    $(call gb_ResTarget_add_one_srs,$(1),$(srs)))
+	$(call gb_ResTarget_add_one_srs,$(1),$(srs)))
 
 endef
 
@@ -288,36 +386,36 @@ gb_AllLangResTarget_LANGS := $(1)
 endef
 
 $(call gb_AllLangResTarget_get_clean_target,%) :
-    $(call gb_Helper_abbreviate_dirs,\
-        rm -f $(call gb_AllLangResTarget_get_target,$*))
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_AllLangResTarget_get_target,$*))
 
 $(call gb_AllLangResTarget_get_target,%) :
-    $(call gb_Helper_abbreviate_dirs,\
-        mkdir -p $(dir $@) && touch $@)
+	$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@) && touch $@)
 
 define gb_AllLangResTarget_AllLangResTarget
 $(foreach lang,$(gb_AllLangResTarget_LANGS),\
-    $(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang)))
+	$(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang)))
 $$(eval $$(call gb_Module_register_target,$(call gb_AllLangResTarget_get_target,$(1)),$(call gb_AllLangResTarget_get_clean_target,$(1))))
 
 endef
 
 define gb_AllLangResTarget_add_one_srs
 $(foreach lang,$(gb_AllLangResTarget_LANGS),\
-    $(call gb_ResTarget_add_one_srs,$(1)$(lang),$(2)))
+	$(call gb_ResTarget_add_one_srs,$(1)$(lang),$(2)))
 
 endef
 
 define gb_AllLangResTarget_add_srs
 $(foreach srs,$(2),\
-    $(call gb_AllLangResTarget_add_one_srs,$(1),$(srs)))
+	$(call gb_AllLangResTarget_add_one_srs,$(1),$(srs)))
 
 endef
 
 define gb_AllLangResTarget_set_reslocation
 $(foreach lang,$(gb_AllLangResTarget_LANGS),\
-    $(call gb_ResTarget_set_reslocation,$(1)$(lang),$(2)))
+	$(call gb_ResTarget_set_reslocation,$(1)$(lang),$(2)))
 
 endef
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index e31712016f7f..daa40c1d304e 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -29,6 +29,7 @@
 SOLARINC += $(JDKINCS)
 
 OUTDIR := $(SOLARVERSION)/$(INPATH)
+OUTDIR_FOR_BUILD := $(SOLARVERSION)/$(INPATH_FOR_BUILD)
 WORKDIR := $(SOLARVERSION)/$(INPATH)/workdir
 
 # Override for SetupLocal
@@ -42,9 +43,10 @@ endif
 
 # HACK
 # unixify windoze paths
-ifeq ($(OS),WNT)
+ifeq ($(OS_FOR_BUILD),WNT)
 override WORKDIR := $(shell cygpath -u $(WORKDIR))
 override OUTDIR := $(shell cygpath -u $(OUTDIR))
+override OUTDIR_FOR_BUILD := $(shell cygpath -u $(OUTDIR_FOR_BUILD))
 override gb_REPOS := $(shell cygpath -u $(gb_REPOS))
 endif
 
@@ -56,4 +58,4 @@ $(eval $(call gb_Output_error,The initial makefile $(realpath $(firstword $(MAKE
 endif
 endif
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index b0f50718364e..ef24e18201b6 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -33,10 +33,10 @@ gb_ComponentTarget_get_source = $(1)/$(2).component
 define gb_ComponentTarget__command
 $(call gb_Output_announce,$(3),$(true),CMP,1)
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) && \
-    $(gb_XSLTPROC) --nonet --stringparam uri \
-        '$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \
-        $(gb_ComponentTarget_XSLTCOMMANDFILE) $(2))
+	mkdir -p $(dir $(1)) && \
+	$(gb_XSLTPROC) --nonet --stringparam uri \
+		'$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \
+		$(gb_ComponentTarget_XSLTCOMMANDFILE) $(realpath $(2)))
 endef
 
 # creates 2 componentfiles: the first is for the installation set,
@@ -61,22 +61,20 @@ $(call gb_ComponentTarget_get_clean_target,%) :
 $(foreach repo,$(gb_ComponentTarget_REPOS),$(eval $(call gb_ComponentTarget__rules,$(repo))))
 
 $(call gb_ComponentTarget_get_target,%) :
-    $(eval $(call gb_Outpt_error,Unable to find component file $(call gb_ComponentTarget_get_source,,$*) in the repositories: $(gb_ComponentTarget_REPOS) or xlstproc is missing.))
+	$(eval $(call gb_Outpt_error,Unable to find component file $(call gb_ComponentTarget_get_source,,$*) in the repositories: $(gb_ComponentTarget_REPOS) or xsltproc is missing.))
 
 $(call gb_ComponentTarget_get_external_target,%) :
-    $(call gb_Deliver_deliver,$<,$@)
+	$(call gb_Deliver_deliver,$<,$@)
 
 define gb_ComponentTarget_ComponentTarget
-$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3)
+$(call gb_ComponentTarget_get_target,$(4)) : LIBFILENAME := $(3)
 $(call gb_ComponentTarget_get_inbuild_target,$(1)) : LIBFILENAME := $(3)
-$(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2)
+$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(4))
 $(call gb_ComponentTarget_get_inbuild_target,$(1)) : \
 	COMPONENTPREFIX := $(call gb_Library__get_layer_componentprefix,NONE)
-$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1))
 $(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)) : $(call gb_ComponentTarget_get_inbuild_target,$(1))
-$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)))
 $(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)),$(call gb_ComponentTarget_get_inbuild_target,$(1)))
 
 endef
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index abe4ceb3167f..f9dea5440c6d 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -32,24 +32,58 @@
 DBGSV_ERROR_OUT := shell
 export DBGSV_ERROR_OUT
 
+ifeq ($(strip $(DEBUGCPPUNIT)),TRUE)
+gb_CppunitTest_GDBTRACE := gdb -nx --command=$(SOLARENV)/bin/gdbtrycatchtrace-stdout -return-child-result --args
+else ifneq ($(strip $(GDBCPPUNITTRACE)),)
+gb_CppunitTest_GDBTRACE := $(GDBCPPUNITTRACE)
+gb_CppunitTest__interactive := $(true)
+endif
+
+ifneq ($(strip $(VALGRIND)),)
+gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50
+ifeq ($(strip $(VALGRIND)),memcheck)
+gb_CppunitTest_VALGRINDTOOL += --leak-check=yes
+G_SLICE := always-malloc
+export G_SLICE
+endif
+endif
+
 # defined by platform
 #  gb_CppunitTest_TARGETTYPE
 #  gb_CppunitTest_get_filename
-gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunittester)
-gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) $(gb_CppunitTest_CPPTESTTARGET)
+gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunit/cppunittester)
+gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTTARGET)
 gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1))
 
+# TODO: move this to platform under suitable name
+gb_CppunitTarget__make_url = file://$(if $(filter WNT,$(OS)),/)$(1)
+
+gb_CppunitTest__get_uno_type_target = $(OUTDIR)/bin/$(1).rdb
+define gb_CppunitTest__make_args
+$(ARGS) \
+$(if $(strip $(UNO_TYPES)),\
+	"-env:UNO_TYPES=$(foreach rdb,udkapi $(UNO_TYPES),\
+		$(call gb_CppunitTarget__make_url,$(call gb_CppunitTest__get_uno_type_target,$(rdb))))") \
+$(if $(strip $(UNO_SERVICES)),\
+	"-env:UNO_SERVICES=$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/ure/services.rdb) \
+		$(foreach rdb,$(UNO_SERVICES),\
+			$(call gb_CppunitTarget__make_url,$(call gb_RdbTarget_get_target,$(rdb))))") \
+$(if $(URE),\
+	$(foreach dir,URE_INTERNAL_LIB_DIR OOO_BASE_DIR BRAND_BASE_DIR,\
+		-env:$(dir)=file://$(if $(filter WNT,$(OS)),/$(OUTDIR)/bin,$(OUTDIR)/lib)))
+endef
+
 .PHONY : $(call gb_CppunitTest_get_clean_target,%)
 $(call gb_CppunitTest_get_clean_target,%) :
-    $(call gb_Helper_abbreviate_dirs,\
-        rm -f $(call gb_CppunitTest_get_target,$*) $(call gb_CppunitTest_get_target,$*).log)
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_CppunitTest_get_target,$*) $(call gb_CppunitTest_get_target,$*).log)
 
 .PHONY : $(call gb_CppunitTest_get_target,%)
-$(call gb_CppunitTest_get_target,%) : $(gb_CppunitTest_CPPTESTTARGET)
-    $(call gb_Output_announce,$*,$(true),CUT,2)
-    $(call gb_Helper_abbreviate_dirs_native,\
-        mkdir -p $(dir $@) && \
-        $(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) > $@.log 2>&1 || (cat $@.log && false))
+$(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTTARGET)
+	$(call gb_Output_announce,$*,$(true),CUT,2)
+	$(call gb_Helper_abbreviate_dirs_native,\
+		mkdir -p $(dir $@) && \
+		$(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) $(call gb_CppunitTest__make_args,$(ARGS),$(UNO_SERVICES),$(UNO_TYPES)) $(if $(gb_CppunitTest__interactive),,> $@.log 2>&1 || (cat $@.log && false)))
 
 define gb_CppunitTest_CppunitTest
 $(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest__get_linktargetname,$(1)))
@@ -63,49 +97,95 @@ $(call gb_LinkTarget_add_defs,$(2),\
 	$(gb_CppunitTest_DEFS) \
 )
 $(call gb_LinkTarget_add_linked_libs,$(2),cppunit)
+$(call gb_LinkTarget_add_includes,$(2),$(filter -I%,$(CPPUNIT_CFLAGS)))
+$(call gb_LinkTarget_set_defs,$(2), \
+    $$(DEFS) \
+    $(filter-out -I%,$(CPPUNIT_CFLAGS)) \
+)
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
 $(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_CppunitTest_CppunitTest_platform,$(1),$(2),$(gb_CppunitTest_DLLDIR)/$(call gb_CppunitTest_get_libfilename,$(1)))
+$(call gb_CppunitTest_get_target,$(1)) : ARGS :=
+$(call gb_CppunitTest_get_target,$(1)) : URE := $(false)
+$(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES :=
+$(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES :=
 $$(eval $$(call gb_Module_register_target,$(call gb_CppunitTest_get_target,$(1)),$(call gb_CppunitTest_get_clean_target,$(1))))
 
 endef
 
+define gb_CppunitTest_set_args
+$(call gb_CppunitTest_get_target,$(1)) : ARGS := $(2)
+
+endef
+
+# TODO: Once we build the services.rdb with gbuild we should use its *_get_target method
+define gb_CppunitTest_uses_ure
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_CppunitTest__get_uno_type_target,udkapi)
+$(call gb_CppunitTest_get_target,$(1)) : $(OUTDIR)/xml/ure/services.rdb
+$(call gb_CppunitTest_get_target,$(1)) : URE := $(true)
+
+endef
+
+define gb_CppunitTest_add_type_rdb
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_CppunitTest__get_uno_type_target,$(2))
+$(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES += $(2)
+endef
+
+define gb_CppunitTest_add_type_rdbs
+$(foreach rdb,$(2),$(eval $(call gb_CppunitTest_add_type_rdb,$(1),$(rdb))))
+endef
+
+define gb_CppunitTest_add_service_rdb
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_RdbTarget_get_target,$(2))
+$(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_RdbTarget_get_clean_target,$(2))
+$(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES += $(2)
+endef
+
+define gb_CppunitTest_add_service_rdbs
+$(foreach rdb,$(2),$(eval $(call gb_CppunitTest_add_service_rdb,$(1),$(rdb))))
+endef
+
 define gb_CppunitTest__forward_to_Linktarget
 gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest__get_linktargetname,$$(1)),$$(2),$$(3))
 
 endef
 
 $(eval $(foreach method,\
-    add_cobject \
-    add_cobjects \
-    add_cxxobject \
-    add_cxxobjects \
-    add_objcxxobject \
-    add_objcxxobjects \
-    add_exception_objects \
-    add_noexception_objects \
+	add_cobject \
+	add_cobjects \
+	add_cxxobject \
+	add_cxxobjects \
+	add_exception_objects \
+	add_executable_objects \
+	add_library_objects \
+	add_linked_libs \
+	add_linked_static_libs \
+	add_noexception_objects \
+	add_objcobject \
+	add_objcobjects \
+	add_objcxxobject \
+	add_objcxxobjects \
+	add_package_headers \
+	add_precompiled_header \
+	add_sdi_headers \
 	add_cflags \
-    set_cflags \
+	set_cflags \
 	add_cxxflags \
 	set_yaccflags \
 	add_objcxxflags \
-    set_objcxxflags \
 	add_defs \
-    set_defs \
-    set_include \
+	set_defs \
+	set_include \
 	add_ldflags \
-    set_ldflags \
+	set_ldflags \
 	add_libs \
-    set_library_path_flags \
-    add_linked_libs \
-    add_linked_static_libs \
+	set_library_path_flags \
+	set_objcflags \
+	set_objcxxflags \
 	use_external \
 	use_externals \
-    add_package_headers \
-    add_sdi_headers \
-    add_precompiled_header \
 ,\
-    $(call gb_CppunitTest__forward_to_Linktarget,$(method))\
+	$(call gb_CppunitTest__forward_to_Linktarget,$(method))\
 ))
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 6f65308f7dc9..0cb6b971a710 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -30,9 +30,9 @@ gb_CustomTarget_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES)
 # N.B.: putting the "+" there at the start activates the GNU make job server
 define gb_CustomTarget__command
 +$(call gb_Helper_abbreviate_dirs,\
-    mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
-    $(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
-    touch $(1))
+	mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
+	$(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
+	touch $(1))
 
 endef
 
@@ -42,9 +42,9 @@ $(call gb_CustomTarget_get_target,%) :
 
 .PHONY: $(call gb_CustomTarget_get_clean_target,%)
 $(call gb_CustomTarget_get_clean_target,%) :
-    $(call gb_Output_announce,$*,$(false),MAK,3)
-    $(call gb_Helper_abbreviate_dirs,\
-        rm -rf $(call gb_CustomTarget_get_workdir,$*) && \
+	$(call gb_Output_announce,$*,$(false),MAK,3)
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -rf $(call gb_CustomTarget_get_workdir,$*) && \
 		rm -f $(call gb_CustomTarget_get_target,$*))
 
 define gb_CustomTarget__get_makefile
@@ -81,4 +81,4 @@ $(foreach dependency,$(2),$(call gb_CustomTarget_add_outdir_dependency,$(1),$(de
 
 endef
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk
index 2af490e3a517..42707c0f8484 100644
--- a/solenv/gbuild/Deliver.mk
+++ b/solenv/gbuild/Deliver.mk
@@ -39,17 +39,17 @@ endef
 
 define gb_Deliver_add_deliverable
 gb_Deliver_DELIVERABLES += $$(patsubst $(REPODIR)/%,%,$(2)):$$(patsubst $(REPODIR)/%,%,$(1))
-$(if $(gb_HIRESTIME),,.LOW_RESOLUTION_TIME : $(1))
+$(if $(gb_LOWRESTIME),.LOW_RESOLUTION_TIME : $(1),)
 
 endef
 
 ifeq ($(strip $(gb_Deliver_GNUCOPY)),)
 define gb_Deliver__deliver
-mkdir -p $(dir $(2)) && $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) cp -f $(1) $(2) && touch -r $(1) $(2)
+mkdir -p $(dir $(2)) && $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -f) $(1) $(2) && touch -r $(1) $(2)
 endef
 else
 define gb_Deliver__deliver
-mkdir -p $(dir $(2)) && $(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) --force --preserve=timestamps $(1) $(2)
+mkdir -p $(dir $(2)) && $(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) $(if $(gb_Deliver_HARDLINK),--link) --force --preserve=timestamps $(1) $(2)
 endef
 endif
 
@@ -72,7 +72,7 @@ deliverlog : COMMAND := \
  mkdir -p $$(OUTDIR)/inc/$$(strip $$(gb_Module_ALLMODULES)) \
  && RESPONSEFILE=$$(call var2file,$(shell $(gb_MKTEMP)),100,$$(sort $$(gb_Deliver_DELIVERABLES))) \
  && $(gb_AWK) -f $$(GBUILDDIR)/processdelivered.awk < $$$${RESPONSEFILE} \
-        > $$(OUTDIR)/inc/$$(strip $(gb_Module_ALLMODULES))/gb_deliver.log \
+		> $$(OUTDIR)/inc/$$(strip $(gb_Module_ALLMODULES))/gb_deliver.log \
  && rm -f $$$${RESPONSEFILE}
 else
 $$(eval $$(call gb_Output_announce,more than one module - creating no deliver.log,$$(true),LOG,1))
@@ -84,8 +84,8 @@ endef
 # deliver.log format is broken in that case anyway
 .PHONY : deliverlog showdeliverables
 deliverlog:
-    $(eval $(call gb_Deliver_setdeliverlogcommand))
-    $(call gb_Helper_abbreviate_dirs, $(COMMAND))
+	$(eval $(call gb_Deliver_setdeliverlogcommand))
+	$(call gb_Helper_abbreviate_dirs, $(COMMAND))
 
 # all : deliverlog
 
@@ -94,8 +94,8 @@ $(info $(1) $(patsubst $(OUTDIR)/%,%,$(2)))
 endef
 
 showdeliverables :
-    $(eval MAKEFLAGS := s)
-    $(foreach deliverable,$(sort $(gb_Deliver_DELIVERABLES)),\
-            $(call gb_Deliver_print_deliverable,$(REPODIR)/$(firstword $(subst :, ,$(deliverable))),$(REPODIR)/$(lastword $(subst :, ,$(deliverable)))))
-    true
-# vim: set noet sw=4 ts=4:
+	$(eval MAKEFLAGS := s)
+	$(foreach deliverable,$(sort $(gb_Deliver_DELIVERABLES)),\
+			$(call gb_Deliver_print_deliverable,$(REPODIR)/$(firstword $(subst :, ,$(deliverable))),$(REPODIR)/$(lastword $(subst :, ,$(deliverable)))))
+	true
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 511fdf659945..283d39d5499c 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -32,14 +32,14 @@
 
 .PHONY : $(call gb_Executable_get_clean_target,%)
 $(call gb_Executable_get_clean_target,%) :
-    $(call gb_Helper_abbreviate_dirs,\
-        rm -f $(call gb_Executable_get_target,$*) \
-            $(AUXTARGETS))
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_Executable_get_target,$*) \
+			$(AUXTARGETS))
 
 $(call gb_Executable_get_target,%) :
-    $(call gb_Helper_abbreviate_dirs,\
-        $(call gb_Deliver_deliver,$<,$@) \
-            $(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
+	$(call gb_Helper_abbreviate_dirs,\
+		$(call gb_Deliver_deliver,$<,$@) \
+			$(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
 
 define gb_Executable_Executable
 $(call gb_Executable__Executable_impl,$(1),Executable/$(1)$(gb_Executable_EXT))
@@ -64,42 +64,46 @@ endef
 
 
 define gb_Executable_forward_to_Linktarget
-gb_Executable_$(1) = $$(call gb_LinkTarget_$(1),Executable/$$(1)$$(gb_Executable_EXT),$$(2),$$(3))
+gb_Executable_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_Executable_get_linktargetname,$$(1)),$$(2),$$(3))
 
 endef
 
 $(eval $(foreach method,\
-    add_cobject \
-    add_cobjects \
-    add_cxxobject \
-    add_cxxobjects \
-    add_objcxxobject \
-    add_objcxxobjects \
-    add_exception_objects \
-    add_noexception_objects \
-    add_generated_exception_objects \
+	add_cobject \
+	add_cobjects \
+	add_cxxobject \
+	add_cxxobjects \
+	add_objcobject \
+	add_objcobjects \
+	add_objcxxobject \
+	add_objcxxobjects \
+	add_exception_objects \
+	add_noexception_objects \
+	add_generated_cxxobjects \
+	add_generated_exception_objects \
 	add_cflags \
-    set_cflags \
+	set_cflags \
 	add_cxxflags \
-    set_cxxflags \
+	set_cxxflags \
 	add_objcxxflags \
-    set_objcxxflags \
+	set_objcflags \
+	set_objcxxflags \
 	add_defs \
-    set_defs \
-    set_include \
+	set_defs \
+	set_include \
 	add_ldflags \
-    set_ldflags \
+	set_ldflags \
 	add_libs \
-    set_library_path_flags \
-    add_linked_libs \
-    add_linked_static_libs \
+	set_library_path_flags \
+	add_linked_libs \
+	add_linked_static_libs \
 	use_external \
 	use_externals \
-    add_package_headers \
-    add_sdi_headers \
-    add_precompiled_header \
+	add_package_headers \
+	add_sdi_headers \
+	add_precompiled_header \
 ,\
-    $(call gb_Executable_forward_to_Linktarget,$(method))\
+	$(call gb_Executable_forward_to_Linktarget,$(method))\
 ))
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index e8b6226f54ce..990eb37243ff 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -1,3 +1,4 @@
+# -*- Mode: GNUmakefile; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,14 +30,6 @@ gb_Helper_NULLFILE := /dev/null
 
 gb_Helper_MISC := $(WORKDIR)/Misc
 
-ifeq ($(JAVACOMPILER),)
-JAVACOMPILER := javac
-endif
-
-ifeq ($(JAVAINTERPRETER),)
-JAVAINTERPRETER := java
-endif
-
 # general propose phony target
 gb_Helper_PHONY := $(gb_Helper_MISC)/PHONY
 
@@ -47,7 +40,7 @@ gb_Helper_REPOSITORYNAMES :=
 
 .PHONY : $(WORKDIR)/Misc/PHONY
 $(gb_Helper_MISCDUMMY) :
-    @mkdir -p $(dir $@) && touch $@
+	@mkdir -p $(dir $@) && touch $@
 
 define gb_Helper_abbreviate_dirs
 R=$(REPODIR) && \
@@ -73,19 +66,19 @@ endef
 
 define gb_Helper_make_clean_targets
 $(foreach targettype,$(1),\
-    $(call gb_Helper_make_clean_target,$(targettype)))
+	$(call gb_Helper_make_clean_target,$(targettype)))
 
 endef
 
 define gb_Helper_make_outdir_clean_targets
 $(foreach targettype,$(1),\
-    $(call gb_Helper_make_outdir_clean_target,$(targettype)))
+	$(call gb_Helper_make_outdir_clean_target,$(targettype)))
 
 endef
 
 define gb_Helper_make_dep_targets
 $(foreach targettype,$(1),\
-    $(call gb_Helper_make_dep_target,$(targettype)))
+	$(call gb_Helper_make_dep_target,$(targettype)))
 
 endef
 
@@ -118,7 +111,7 @@ endef
 
 define gb_Helper_init_registries
 gb_Executable_VALIDGROUPS := UREBIN SDK OOO BRAND NONE
-gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS STLLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS
+gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS
 gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
 
 $$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group) :=))
@@ -184,4 +177,11 @@ gb_StaticLibrary_$(1) += $(2)
 
 endef
 
+define gb_Helper_execute
+$(call gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1)
+endef
+
+export gb_Helper_set_ld_path
+export gb_Helper_execute
+
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index ba9e445026fb..00aefb4ee9c6 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -30,11 +30,11 @@ gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER)
 
 define gb_JavaClassSet__command
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) && \
-	$(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call gb_JavaClassSet_get_classdir,$(2)) $(if $(filter-out $(JARDEPS),$(3)),\
+	mkdir -p $(dir $(1)) && \
+	$(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call gb_JavaClassSet_get_classdir,$(2)) $(if $(filter-out $(JARDEPS),$(3)),\
 			$(filter-out $(JARDEPS),$(3)),\
-			$(filter-out $(JARDEPS),$(4))) &&\
-    touch $(1))
+			$(filter-out $(JARDEPS),$(4))) &&) \
+	touch $(1))
 
 endef
 
@@ -44,8 +44,8 @@ $(call gb_JavaClassSet_get_clean_target,%) :
 
 $(call gb_JavaClassSet_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),JCS,3)
-    $(call gb_Helper_abbreviate_dirs,\
-        rm -rf $(dir $(call gb_JavaClassSet_get_target,$*)))
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -rf $(dir $(call gb_JavaClassSet_get_target,$*)))
 
 # no initialization of scoped variable CLASSPATH as it is "inherited" from controlling instance (e.g. JUnitTest, Jar)
 # UGLY: cannot use target local variable for REPO because it's needed in prereq
@@ -110,4 +110,4 @@ define gb_JavaClassSet_use_externals
 $(foreach external,$(2),$(call gb_JavaClassSet_use_external,$(1),$(external)))
 endef
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 5c84726958f2..eb6124be3d14 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -29,6 +29,7 @@
 # JunitTest class
 
 gb_JunitTest_JAVACOMMAND := $(JAVAINTERPRETER) $(JAVAIFLAGS)
+gb_JunitTest_HEADLESS := $(true)
 
 # in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell
 DBGSV_ERROR_OUT := shell
@@ -36,18 +37,26 @@ export DBGSV_ERROR_OUT
 
 .PHONY : $(call gb_JunitTest_get_clean_target,%)
 $(call gb_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,$(call gb_JunitTest_get_classsetname,%))
-    $(call gb_Helper_abbreviate_dirs,\
-        rm -f $@ $@.log)
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -f $@ $@.log)
 
-.PHONY : $(call gb_JunitTest_get_target,$(1))
+ifneq (,$(strip $(OOO_JUNIT_JAR)))
+
+.PHONY : $(call gb_JunitTest_get_target,%)
 $(call gb_JunitTest_get_target,%) :
-    $(call gb_Output_announce,$*,$(true),JUT,2)
-    $(call gb_Helper_abbreviate_dirs_native,\
-        rm -rf $(call gb_JunitTest_get_userdir,$*) && \
-        mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
-        $(gb_JunitTest_JAVACOMMAND) -cp "$(CLASSPATH)" $(DEFS) org.junit.runner.JUnitCore $(CLASSES) 2>&1 > $@.log || (cat $@.log && false) && \
-        rm -rf $(call gb_JunitTest_get_userdir,$*))
-    $(CLEAN_CMD)
+	$(call gb_Output_announce,$*,$(true),JUT,2)
+	$(call gb_Helper_abbreviate_dirs_native,\
+		mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
+		$(gb_JunitTest_JAVACOMMAND) \
+            -cp "$(CLASSPATH)" \
+            $(if $(strip $(gb_JunitTest_HEADLESS)),\
+                -Dorg.openoffice.test.arg.headless=$(gb_JunitTest_HEADLESS)) \
+            $(if $(strip $(gb_JunitTest_DEBUGCOMMAND)),\
+                '-Dorg.openoffice.test.arg.debugcommand=$(gb_JunitTest_DEBUGCOMMAND)') \
+            $(DEFS) \
+            org.junit.runner.JUnitCore \
+            $(CLASSES) 2>&1 > $@.log || (cat $@.log && false))
+	$(CLEAN_CMD)
 
 define gb_JunitTest_JunitTest
 $(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(value XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib
@@ -100,4 +109,26 @@ define gb_JunitTest_add_jars
 $(foreach jar,$(2),$(call gb_JunitTest_add_jar,$(1),$(jar)))
 
 endef
-# vim: set noet sw=4 ts=4:
+
+else # OOO_JUNIT_JAR
+
+.PHONY : $(call gb_JunitTest_get_target,$(1))
+$(call gb_JunitTest_get_target,%) :
+	$(call gb_Output_announce,$* (skipped - no Junit),$(true),JUT,2)
+	@true
+
+define gb_JunitTest_JunitTest
+$(eval $(call gb_Module_register_target,$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1))))
+endef
+
+gb_JunitTest_set_defs :=
+gb_JunitTest_add_classes :=
+gb_JunitTest_add_class :=
+gb_JunitTest_add_sourcefile :=
+gb_JunitTest_add_sourcefiles :=
+gb_JunitTest_set_classpath :=
+gb_JunitTest_add_jar :=
+gb_JunitTest_add_jars :=
+
+endif # OOO_JUNIT_JAR
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index a5e5eb08fa90..9e6d54352fab 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -39,20 +39,19 @@
 #  gb_Library_Library_platform
 #  gb_Library_TARGETS
 
-gb_Library__get_linktargetname = Library/$(call gb_Library_get_filename,$(1))
 
 # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
 .PHONY : $(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT)
 $(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT) :
-    $(call gb_Helper_abbreviate_dirs,\
-        rm -f $(OUTDIR)/lib/$*$(gb_Library_PLAINEXT) \
-            $(AUXTARGETS))
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(OUTDIR)/lib/$*$(gb_Library_PLAINEXT) \
+			$(AUXTARGETS))
 
 # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
 $(gb_Library_OUTDIRLOCATION)/%$(gb_Library_PLAINEXT) : 
-    $(call gb_Helper_abbreviate_dirs,\
-        $(call gb_Deliver_deliver,$<,$@) \
-            $(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
+	$(call gb_Helper_abbreviate_dirs,\
+		$(call gb_Deliver_deliver,$<,$@) \
+			$(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
 
 define gb_Library_Library
 ifeq (,$$(findstring $(1),$$(gb_Library_KNOWNLIBS)))
@@ -60,7 +59,7 @@ $$(eval $$(call gb_Output_info,Currently known libraries are: $(sort $(gb_Librar
 $$(eval $$(call gb_Output_error,Library $(1) must be registered in Repository.mk))
 endif
 $(call gb_Library_get_target,$(1)) : AUXTARGETS :=
-$(call gb_Library__Library_impl,$(1),$(call gb_Library__get_linktargetname,$(1)))
+$(call gb_Library__Library_impl,$(1),$(call gb_Library_get_linktargetname,$(1)))
 $(call gb_Library_add_default_nativeres,$(1),default)
 
 endef
@@ -69,7 +68,7 @@ define gb_Library__Library_impl
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),Library)
 $(call gb_LinkTarget_add_defs,$(2),\
-    $(gb_Library_DEFS) \
+	$(gb_Library_DEFS) \
 )
 $(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
 $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
@@ -80,24 +79,24 @@ $(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_L
 endef
 
 define gb_Library_set_componentfile
-$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Library__get_componentprefix,$(1)),$(call gb_Library_get_runtime_filename,$(1)))
+$(call gb_ComponentTarget_ComponentTarget,$(or $(strip $(3)),$(strip $(2))),$(call gb_Library__get_componentprefix,$(1)),$(call gb_Library_get_runtime_filename,$(1)),$(2))
 $(call gb_Library_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2)) $(call gb_ComponentTarget_get_outdir_inbuild_target,$(2))
-$(call gb_Library_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2))
+$(call gb_Library_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(or $(strip $(3)),$(strip $(2))))
 
 endef
 
 gb_Library__get_componentprefix = \
-    $(call gb_Library__get_layer_componentprefix,$(call \
-        gb_Library_get_layer,$(1)))
+	$(call gb_Library__get_layer_componentprefix,$(call \
+		gb_Library_get_layer,$(1)))
 
 gb_Library__get_layer_componentprefix = \
-    $(patsubst $(1):%,%,$(or \
-        $(filter $(1):%,$(gb_Library_COMPONENTPREFIXES)), \
-        $(call gb_Output_error,no ComponentTarget native prefix for layer '$(1)')))
+	$(patsubst $(1):%,%,$(or \
+		$(filter $(1):%,$(gb_Library_COMPONENTPREFIXES)), \
+		$(call gb_Output_error,no ComponentTarget native prefix for layer '$(1)')))
 
 
 define gb_Library__forward_to_Linktarget
-gb_Library_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_Library__get_linktargetname,$$(1)),$$(2),$$(3))
+gb_Library_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_Library_get_linktargetname,$$(1)),$$(2),$$(3))
 
 endef
 
@@ -105,37 +104,42 @@ gb_Library_get_runtime_filename = \
  $(or $(call gb_Library_get_dllname,$(1)),$(call gb_Library_get_filename,$(1)))
 
 $(eval $(foreach method,\
-    add_cobject \
-    add_cobjects \
-    add_cxxobject \
-    add_cxxobjects \
-    add_objcxxobject \
-    add_objcxxobjects \
-    add_exception_objects \
-    add_noexception_objects \
-    add_generated_exception_objects \
+	add_cobject \
+	add_cobjects \
+	add_cxxobject \
+	add_cxxobjects \
+	add_objcobject \
+	add_objcobjects \
+	add_objcxxobject \
+	add_objcxxobjects \
+	add_exception_objects \
+	add_noexception_objects \
+	add_generated_cxxobjects \
+	add_generated_exception_objects \
 	add_cflags \
-    set_cflags \
+	set_cflags \
 	add_cxxflags \
-    set_cxxflags \
+	set_cxxflags \
 	add_objcxxflags \
-    set_objcxxflags \
+	set_objcflags \
+	set_objcxxflags \
 	add_defs \
-    set_defs \
-    set_include \
+	set_defs \
+	set_include \
 	add_ldflags \
-    set_ldflags \
+	set_ldflags \
 	add_libs \
-    set_library_path_flags \
-    add_linked_libs \
-    add_linked_static_libs \
+	set_library_path_flags \
+	add_linked_libs \
+	add_linked_static_libs \
 	use_external \
 	use_externals \
-    add_package_headers \
-    add_sdi_headers \
-    add_precompiled_header \
+	add_package_headers \
+	add_sdi_headers \
+	add_precompiled_header \
+	export_objects_list \
 ,\
-    $(call gb_Library__forward_to_Linktarget,$(method))\
+	$(call gb_Library__forward_to_Linktarget,$(method))\
 ))
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 7af90355e656..20f99db06752 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -43,6 +43,35 @@ CXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
 OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
 endif
 
+# Overview of dependencies and tasks of LinkTarget
+#
+# target                      task                         depends on
+# LinkTarget                  linking                      CObject CxxObject GenCxxObject ObjCObject ObjCxxObject
+#                                                          LinkTarget/headers
+# LinkTarget/dep              joined dep file              CObject/dep CxxObject/dep GenCxxObject/dep ObjCObject/dep ObjCxxObject/dep
+#                                                          | LinkTarget/headers
+# LinkTarget/headers          all headers available        LinkTarget/external_headers PCH
+#                              including own generated     own generated headers
+# PCH                         precompiled headers (win)    LinkTarget/external_headers
+# LinkTarget/external_headers all external headers avail.  header files of linked libs
+#
+# CObject                     plain c compile              | LinkTarget/headers
+# CxxObject                   c++ compile                  | LinkTarget/headers
+# GenCxxObject                C++ compile from             | LinkTarget/headers
+#                              generated source
+# ObjCObject                  objective c compile          | LinkTarget/headers
+# ObjCxxObject                objective c++ compile        | LinkTarget/headers
+#
+# CObject/dep                 dependencies                 these targets generate empty dep files
+# CxxObject/dep               dependencies                 that are populated upon compile
+# GenCxxObject/dep            dependencies
+# ObjCObject/dep            dependencies
+# ObjCxxObject/dep            dependencies
+
+# LinkTarget/headers means gb_LinkTarget_get_headers_target etc.
+# dependencies prefixed with | are build-order only dependencies
+
+
 
 # For every object there is a dep file (if gb_FULLDEPS is active).
 # The dep file depends on the object: the Object__command also updates the
@@ -86,7 +115,7 @@ endef
 $(foreach repo,$(gb_CObject_REPOS),$(eval $(call gb_CObject__rules,$(repo))))
 
 $(call gb_CObject_get_dep_target,%) :
-    $(eval $(call gb_Output_error,Unable to find plain C file $(call gb_CObject_get_source,,$*) in the repositories: $(gb_CObject_REPOS)))
+	$(eval $(call gb_Output_error,Unable to find plain C file $(call gb_CObject_get_source,,$*) in the repositories: $(gb_CObject_REPOS)))
 
 gb_CObject_CObject =
 
@@ -129,7 +158,7 @@ endef
 
 define gb_CxxObject__rules
 $$(call gb_CxxObject_get_target,%) : $$(call gb_CxxObject_get_source,$(1),%)
-    $$(eval $$(gb_CxxObject__set_pchflags))
+	$$(eval $$(gb_CxxObject__set_pchflags))
 	$$(call gb_CxxObject__command,$$@,$$*,$$<,$$(call gb_CxxObject_get_dep_target,$$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -145,7 +174,7 @@ $(foreach repo,$(gb_CxxObject_REPOS),$(eval $(call gb_CxxObject__rules,$(repo)))
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_CxxObject_get_dep_target,%) :
-    $(eval $(call gb_Output_error,Unable to find C++ file $(call gb_CxxObject_get_source,,$*) in repositories: $(gb_CxxObject_REPOS)))
+	$(eval $(call gb_Output_error,Unable to find C++ file $(call gb_CxxObject_get_source,,$*) in repositories: $(gb_CxxObject_REPOS)))
 
 endif
 
@@ -194,16 +223,59 @@ $(foreach repo,$(gb_ObjCxxObject_REPOS),$(eval $(call gb_ObjCxxObject__rules,$(r
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_ObjCxxObject_get_dep_target,%) :
-    $(eval $(call gb_Output_error,Unable to find Objective C++ file $(call gb_ObjCxxObject_get_source,,$*) in repositories: $(gb_ObjCxxObject_REPOS)))
+	$(eval $(call gb_Output_error,Unable to find Objective C++ file $(call gb_ObjCxxObject_get_source,,$*) in repositories: $(gb_ObjCxxObject_REPOS)))
 endif
 
 gb_ObjCxxObject_ObjCxxObject =
 
+# ObjCObject class
+#
+gb_ObjCObject_REPOS := $(gb_REPOS)
+
+gb_ObjCObject_get_source = $(1)/$(2).m
+# defined by platform
+#  gb_ObjCObject__command
+
+# this rule generates an "always rebuild" dep file, to have something to include.
+# the dep file will be overridden on the fly, when the object is compiled
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_ObjCObject__command_dep
+mkdir -p $(dir $(1)) && \
+	echo '$(call gb_ObjCObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
+
+endef
+else
+gb_ObjCObject__command_dep =
+endif
+
+define gb_ObjCObject__rules
+$$(call gb_ObjCObject_get_target,%) : $$(call gb_ObjCObject_get_source,$(1),%)
+	$$(call gb_ObjCObject__command,$$@,$$*,$$<,$$(DEFS),$$(OBJCFLAGS),$$(INCLUDE_STL) $$(INCLUDE))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$$(call gb_ObjCObject_get_dep_target,%) : $$(call gb_ObjCObject_get_source,$(1),%)
+	$$(call gb_ObjCObject__command_dep,$$@,$$*,$$<,$$(DEFS),$$(OBJCFLAGS),$$(INCLUDE_STL) $$(INCLUDE))
+endif
+
+endef
+
+$(foreach repo,$(gb_ObjCObject_REPOS),$(eval $(call gb_ObjCObject__rules,$(repo))))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_ObjCObject_get_dep_target,%) :
+	$(eval $(call gb_Output_error,Unable to find Objective C++ file $(call gb_ObjCObject_get_source,,$*) in repositories: $(gb_ObjCObject_REPOS)))
+endif
+
+gb_ObjCObject_ObjCObject =
+
 
 
 # LinkTarget class
 
 gb_LinkTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
+gb_LinkTarget_OBJECTOWNER :=
+gb_LinkTarget_OBJECTS :=
+
 # defined by platform
 #  gb_LinkTarget_CXXFLAGS
 #  gb_LinkTarget_LDFLAGS
@@ -212,49 +284,66 @@ gb_LinkTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
 
 .PHONY : $(call gb_LinkTarget_get_clean_target,%)
 $(call gb_LinkTarget_get_clean_target,%) :
-    $(call gb_Output_announce,$*,$(false),LNK,4)
-    RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
-        $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-        $(foreach object,$(COBJECTS),$(call gb_CObject_get_dep_target,$(object))) \
-        $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-        $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_dep_target,$(object))) \
-        $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
-        $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_dep_target,$(object))) \
-        $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-        $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_dep_target,$(object))) \
-        $(call gb_LinkTarget_get_target,$*) \
-        $(call gb_LinkTarget_get_dep_target,$*) \
-        $(call gb_LinkTarget_get_headers_target,$*) \
-        $(call gb_LinkTarget_get_external_headers_target,$*) \
-        $(DLLTARGET) \
-        $(AUXTARGETS)) && \
-    cat $${RESPONSEFILE} /dev/null | xargs -n 200 rm -f && \
-    rm -f $${RESPONSEFILE}
+	$(call gb_Output_announce,$*,$(false),LNK,4)
+	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_dep_target,$(object))) \
+		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_dep_target,$(object))) \
+		$(foreach object,$(OBJCOBJECTS),$(call gb_ObjCObject_get_target,$(object))) \
+		$(foreach object,$(OBJCOBJECTS),$(call gb_ObjCObject_get_dep_target,$(object))) \
+		$(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
+		$(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_dep_target,$(object))) \
+		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
+		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_dep_target,$(object))) \
+		$(call gb_LinkTarget_get_target,$*) \
+		$(call gb_LinkTarget_get_dep_target,$*) \
+		$(call gb_LinkTarget_get_headers_target,$*) \
+		$(call gb_LinkTarget_get_external_headers_target,$*) \
+		$(call gb_LinkTarget_get_objects_list,$*) \
+		$(DLLTARGET) \
+		$(AUXTARGETS)) && \
+	cat $${RESPONSEFILE} /dev/null | xargs -n 200 rm -f && \
+	rm -f $${RESPONSEFILE}
 
 
 # cat the deps of all objects in one file, then we need only open that one file
 define gb_LinkTarget__command_dep
 $(call gb_Output_announce,LNK:$(2),$(true),DEP,1)
 $(call gb_Helper_abbreviate_dirs,\
-    mkdir -p $(dir $(1)) && \
-    RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
-        $(foreach object,$(3),$(call gb_CObject_get_dep_target,$(object))) \
-        $(foreach object,$(4),$(call gb_CxxObject_get_dep_target,$(object))) \
-        $(foreach object,$(5),$(call gb_ObjCxxObject_get_dep_target,$(object)))\
-         $(foreach object,$(6),$(call gb_GenCxxObject_get_dep_target,$(object)))\
-        ) && \
-    cat $${RESPONSEFILE} /dev/null | xargs -n 200 cat > $(1)) && \
-    rm -f $${RESPONSEFILE}
+	mkdir -p $(dir $(1)) && \
+	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
+		$(foreach object,$(3),$(call gb_CObject_get_dep_target,$(object))) \
+		$(foreach object,$(4),$(call gb_CxxObject_get_dep_target,$(object))) \
+		$(foreach object,$(5),$(call gb_ObjCObject_get_dep_target,$(object)))\
+		$(foreach object,$(6),$(call gb_ObjCxxObject_get_dep_target,$(object)))\
+		 $(foreach object,$(7),$(call gb_GenCxxObject_get_dep_target,$(object)))\
+		) && \
+	cat $${RESPONSEFILE} /dev/null | xargs -n 200 cat > $(1)) && \
+	rm -f $${RESPONSEFILE}
+
+endef
+
+define gb_LinkTarget__command_objectlist
+TEMPFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
+	$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+	$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+	$(foreach object,$(OBJCOBJECTS),$(call gb_ObjCObject_get_target,$(object))) \
+	$(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
+	$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object)))) && \
+$(if $(EXTRAOBJECTLISTS),cat $(EXTRAOBJECTLISTS) >> $${TEMPFILE} && ) \
+mv $${TEMPFILE} $(call gb_LinkTarget_get_objects_list,$(2)) 
 
 endef
 
 $(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_headers_target,%) $(gb_Helper_MISCDUMMY)
-    $(call gb_LinkTarget__command,$@,$*)
+	$(call gb_LinkTarget__command,$@,$*)
+	$(call gb_LinkTarget__command_objectlist,$@,$*)
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_dep_target,%)
 $(call gb_LinkTarget_get_dep_target,%) : | $(call gb_LinkTarget_get_headers_target,%)
-    $(call gb_LinkTarget__command_dep,$@,$*,$(COBJECTS),$(CXXOBJECTS),$(OBJCXXOBJECTS),$(GENCXXOBJECTS))
+	$(call gb_LinkTarget__command_dep,$@,$*,$(COBJECTS),$(CXXOBJECTS),$(OBJCOBJECTS),$(OBJCXXOBJECTS),$(GENCXXOBJECTS))
 endif
 
 # Ok, this is some dark voodoo: When declaring a linktarget with
@@ -276,12 +365,12 @@ $$@ : COMMAND := $$(call gb_Helper_abbreviate_dirs, mkdir -p $$(dir $$@) && touc
 endef
 
 $(call gb_LinkTarget_get_external_headers_target,%) :
-    $(eval $(gb_LinkTarget__get_external_headers_check))
-    $(COMMAND)
+	$(eval $(gb_LinkTarget__get_external_headers_check))
+	$(COMMAND)
 
 $(call gb_LinkTarget_get_headers_target,%) : $(call gb_LinkTarget_get_external_headers_target,%)
-    $(call gb_Helper_abbreviate_dirs,\
-        mkdir -p $(dir $@) && touch $@)
+	$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@) && touch $@)
 
 # Explanation of some of the targets:
 # - gb_LinkTarget_get_external_headers_target is the targets that guarantees all
@@ -328,6 +417,8 @@ $(call gb_LinkTarget_get_target,$(1)) : COBJECTS :=
 $(call gb_LinkTarget_get_clean_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : CXXOBJECTS := 
 $(call gb_LinkTarget_get_clean_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : OBJCOBJECTS :=
+$(call gb_LinkTarget_get_clean_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : OBJCXXOBJECTS :=
 $(call gb_LinkTarget_get_clean_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS :=
@@ -356,12 +447,14 @@ $(call gb_LinkTarget_get_target,$(1)) : PCH_NAME :=
 $(call gb_LinkTarget_get_target,$(1)) : PCHOBJS :=
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : PDBFILE :=
+$(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS := 
 $(call gb_LinkTarget_get_target,$(1)) : NATIVERES :=
 
 ifeq ($(gb_FULLDEPS),$(true))
 -include $(call gb_LinkTarget_get_dep_target,$(1))
 $(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS := 
 $(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS := 
+$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCOBJECTS :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS) $(CFLAGS)
@@ -374,6 +467,7 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE)
 $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL)
 $(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE := 
 $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_NAME :=
+$(call gb_LinkTarget_get_dep_target,$(1)) : EXTRAOBJECTLISTS := 
 endif
 
 endef
@@ -476,6 +570,14 @@ endif
 
 endef
 
+define gb_LinkTarget_set_objcflags
+$(call gb_LinkTarget_get_target,$(1)) : OBJCFLAGS := $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCFLAGS := $(2)
+endif
+
+endef
+
 define gb_LinkTarget_set_include
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $(2)
@@ -548,6 +650,11 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS += $(2)
 $(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_CObject_get_dep_target,$(2))
 endif
 
+ifeq ($(gb_CHECKOBJECTOWNER),$(true))
+gb_LinkTarget_OBJECTOWNER += $(call gb_CObject_get_target,$(2)):$(1)
+gb_LinkTarget_OBJECTS +=  $(call gb_CObject_get_target,$(2))
+endif
+
 endef
 
 define gb_LinkTarget_add_cxxobject
@@ -563,6 +670,31 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS += $(2)
 $(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_CxxObject_get_dep_target,$(2))
 endif
 
+ifeq ($(gb_CHECKOBJECTOWNER),$(true))
+gb_LinkTarget_OBJECTOWNER += $(call gb_CxxObject_get_target,$(2)):$(1)
+gb_LinkTarget_OBJECTS +=  $(call gb_CxxObject_get_target,$(2))
+endif
+
+endef
+
+define gb_LinkTarget_add_objcobject
+$(call gb_LinkTarget_get_target,$(1)) : OBJCOBJECTS += $(2)
+$(call gb_LinkTarget_get_clean_target,$(1)) : OBJCOBJECTS += $(2)
+
+$(call gb_LinkTarget_get_target,$(1)) : $(call gb_ObjCObject_get_target,$(2))
+$(call gb_ObjCObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
+$(call gb_ObjCObject_get_target,$(2)) : OBJCFLAGS += $(3)
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCOBJECTS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_ObjCObject_get_dep_target,$(2))
+endif
+
+ifeq ($(gb_CHECKOBJECTOWNER),$(true))
+gb_LinkTarget_OBJECTOWNER += $(call gb_ObjCObject_get_target,$(2)):$(1)
+gb_LinkTarget_OBJECTS +=  $(call gb_ObjCObject_get_target,$(2))
+endif
+
 endef
 
 define gb_LinkTarget_add_objcxxobject
@@ -578,6 +710,11 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS += $(2)
 $(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_ObjCxxObject_get_dep_target,$(2))
 endif
 
+ifeq ($(gb_CHECKOBJECTOWNER),$(true))
+gb_LinkTarget_OBJECTOWNER += $(call gb_ObjCxxObject_get_target,$(2)):$(1)
+gb_LinkTarget_OBJECTS +=  $(call gb_ObjCxxObject_get_target,$(2))
+endif
+
 endef
 
 define gb_LinkTarget_add_generated_cxx_object
@@ -593,6 +730,11 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS += $(2)
 $(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_GenCxxObject_get_dep_target,$(2))
 endif
 
+ifeq ($(gb_CHECKOBJECTOWNER),$(true))
+gb_LinkTarget_OBJECTOWNER += $(call gb_GenCxxObject_get_target,$(2)):$(1)
+gb_LinkTarget_OBJECTS +=  $(call gb_GenCxxObject_get_target,$(2))
+endif
+
 endef
 
 define gb_LinkTarget_add_noexception_object
@@ -607,10 +749,36 @@ define gb_LinkTarget_add_cobjects
 $(foreach obj,$(2),$(call gb_LinkTarget_add_cobject,$(1),$(obj),$(3)))
 endef
 
+define gb_LinkTarget_add_linktarget_objects
+$(call gb_LinkTarget_get_target,$(1)) : $(foreach linktarget,$(2),$(call gb_LinkTarget_get_target,$(linktarget)))
+$(info gb_LinkTarget_add_linktarget_objects,$(1),$(2))
+$(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS += $(foreach linktarget,$(2),$(call gb_LinkTarget_get_objects_list,$(linktarget)))
+
+endef
+
+define gb_LinkTarget_add_library_objects
+ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
+$$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL))
+$$(eval $$(call gb_Output_error,Cannot import objects library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk))
+endif
+$(info gb_LinkTarget_add_library_objects,$(1),$(2))
+$(call gb_LinkTarget_add_linktarget_objects,$(1),$(foreach lib,$(2),$(call gb_Library_get_linktargetname,$(lib))))
+
+endef
+
+define gb_LinkTarget_add_executable_objects
+$(call gb_LinkTarget_add_linktarget_objects,$(1),$(foreach exe,$(2),$(call gb_Executable_get_linktargetname,$(lib))))
+
+endef
+
 define gb_LinkTarget_add_cxxobjects
 $(foreach obj,$(2),$(call gb_LinkTarget_add_cxxobject,$(1),$(obj),$(3)))
 endef
 
+define gb_LinkTarget_add_objcobjects
+$(foreach obj,$(2),$(call gb_LinkTarget_add_objcobject,$(1),$(obj),$(3)))
+endef
+
 define gb_LinkTarget_add_objcxxobjects
 $(foreach obj,$(2),$(call gb_LinkTarget_add_objcxxobject,$(1),$(obj),$(3)))
 endef
@@ -623,8 +791,12 @@ define gb_LinkTarget_add_exception_objects
 $(foreach obj,$(2),$(call gb_LinkTarget_add_exception_object,$(1),$(obj)))
 endef
 
+define gb_LinkTarget_add_generated_cxxobjects
+$(foreach obj,$(2),$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(obj),$(3)))
+endef
+
 define gb_LinkTarget_add_generated_exception_object
-$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS))
+$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS))
 endef
 
 define gb_LinkTarget_add_generated_exception_objects
@@ -680,8 +852,8 @@ $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS = $$(DEFS)
 ifeq ($(gb_FULLDEPS),$(true))
 -include \
-    $(call gb_PrecompiledHeader_get_dep_target,$(3)) \
-    $(call gb_NoexPrecompiledHeader_get_dep_target,$(3))
+	$(call gb_PrecompiledHeader_get_dep_target,$(3)) \
+	$(call gb_NoexPrecompiledHeader_get_dep_target,$(3))
 $(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(DEFS) -DPRECOMPILED_HEADERS
 $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS = $$(DEFS)
 endif
@@ -708,4 +880,4 @@ gb_LinkTarget_use_externals = \
  $(foreach external,$(2),$(call gb_LinkTarget_use_external,$(1),$(external)))
 
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index b909b46e27a0..10bf35be3733 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -26,6 +26,21 @@
 #*************************************************************************
 
 
+# Overview of dependencies and tasks of Module
+#
+# target                      task                         depends on
+# Module                      build the product            all product targets
+#                              excluding tests             recursive Modules
+# Module/check                run unit tests               all unit tests
+#                                                          recursive Module/checks
+# Module/subsequentcheck      run system tests             all system tests
+#                                                          recursive Module/subsequentchecks
+# all (global)                build the product            top-level Module
+# check (global)              run unit tests               top-level Module/check
+# subsequentcheck (global)    run system tests             top-level Module/subsequentcheck
+# allandcheck (global)        default goal                 all check
+
+
 # Module class
 
 gb_Module_ALLMODULES :=
@@ -37,31 +52,31 @@ gb_Module_CLEANTARGETSTACK :=
 
 .PHONY : $(call gb_Module_get_clean_target,%)
 $(call gb_Module_get_clean_target,%) :
-    $(call gb_Output_announce,$*,$(false),MOD,5)
-    $(call gb_Output_announce_title,module $* cleared.)
-    -$(call gb_Helper_abbreviate_dirs,\
-        rm -f $(call gb_Module_get_target,$*) $(call gb_Module_get_check_target,$*) $(call gb_Module_get_subsequentcheck_target,$*))
+	$(call gb_Output_announce,$*,$(false),MOD,5)
+	$(call gb_Output_announce_title,module $* cleared.)
+	-$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_Module_get_target,$*) $(call gb_Module_get_check_target,$*) $(call gb_Module_get_subsequentcheck_target,$*))
 
 $(call gb_Module_get_check_target,%) :
-    $(call gb_Output_announce,$*,$(true),CHK,5)
-    $(call gb_Output_announce_title,module $* checks done.)
-    -$(call gb_Helper_abbreviate_dirs,\
-        mkdir -p $(dir $@) && \
-        touch $@)
+	$(call gb_Output_announce,$*,$(true),CHK,5)
+	$(call gb_Output_announce_title,module $* checks done.)
+	-$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@) && \
+		touch $@)
 
 $(call gb_Module_get_subsequentcheck_target,%) :
-    $(call gb_Output_announce,$*,$(true),SCK,5)
-    $(call gb_Output_announce_title,module $* subsequentchecks done.)
-    -$(call gb_Helper_abbreviate_dirs,\
-        mkdir -p $(dir $@) && \
-        touch $@)
+	$(call gb_Output_announce,$*,$(true),SCK,5)
+	$(call gb_Output_announce_title,module $* subsequentchecks done.)
+	-$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@) && \
+		touch $@)
 
 $(call gb_Module_get_target,%) :
-    $(call gb_Output_announce,$*,$(true),MOD,5)
-    $(call gb_Output_announce_title,module $* done.)
-    -$(call gb_Helper_abbreviate_dirs,\
-        mkdir -p $(dir $@) && \
-        touch $@)
+	$(call gb_Output_announce,$*,$(true),MOD,5)
+	$(call gb_Output_announce_title,module $* done.)
+	-$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@) && \
+		touch $@)
 
 .PHONY : all allandcheck clean check subsequentcheck
 .DEFAULT_GOAL := allandcheck
@@ -74,26 +89,28 @@ ifneq ($(strip $(OOO_SUBSEQUENT_TESTS)),)
 endif
 
 all : 
-    $(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog,$^),$(notdir $(module))),$(true),ALL,6)
-    $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),ALL,6)
-    $(call gb_Output_announce_title,all done.)
-    $(call gb_Output_announce_bell)
+	$(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog,$^),$(notdir $(module))),$(true),ALL,6)
+	$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),ALL,6)
+	$(call gb_Output_announce_title,all done.)
+	$(call gb_Output_announce_bell)
 
 check :
-    $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),CHK,6)
-    $(call gb_Output_announce_title,all tests checked.)
-    $(call gb_Output_announce_bell)
+	$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),CHK,6)
+	$(call gb_Output_announce_title,all tests checked.)
+	$(call gb_Output_announce_bell)
 
-subsequentcheck : all 
-    $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),SCK,6)
-    $(call gb_Output_announce_title,all subsequent tests checked.)
-    $(call gb_Output_announce_bell)
+# removing the dependency on all for now until we can make a full build with gbuild
+#subsequentcheck : all 
+subsequentcheck : 
+	$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),SCK,6)
+	$(call gb_Output_announce_title,all subsequent tests checked.)
+	$(call gb_Output_announce_bell)
 
 clean : 
-    $(call gb_Output_announce,top level modules: $(foreach module,$^,$(notdir $(module))),$(false),ALL,6)
-    $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(false),ALL,6)
-    $(call gb_Output_announce_title,all cleared.)
-    $(call gb_Output_announce_bell)
+	$(call gb_Output_announce,top level modules: $(foreach module,$^,$(notdir $(module))),$(false),ALL,6)
+	$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(false),ALL,6)
+	$(call gb_Output_announce_title,all cleared.)
+	$(call gb_Output_announce_bell)
 
 define gb_Module_Module
 gb_Module_ALLMODULES += $(1)
@@ -207,6 +224,7 @@ ifneq ($$(and $$(gb_Module_TARGETSTACK),$$(gb_Module_CHECKTARGETSTACK),$$(gb_Mod
 $$(eval $$(call gb_Output_error,Corrupted module target stack!3))
 endif
 
+$$(eval $$(gb_Extensions_final_hook))
 endef
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index 9246fd540b82..bc4ec38123df 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -97,8 +97,8 @@ gb_Output_COLOR_ERROR := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;41m
 
 define gb_Output__format_type
 $(subst :, ,$(word 2,$(1) \
-    $(gb_Output_COLOR_OUTBUILD_LEVEL$(3))[:$(gb_Output_COLOR_INBUILD_LEVEL$(3))build:$(subst $(WHITESPACE),:,$(2))$(gb_Output_COLOR_OUTBUILD_LEVEL$(3)):] \
-    $(gb_Output_COLOR_OUTCLEAN_LEVEL$(3))[:$(gb_Output_COLOR_INCLEAN_LEVEL$(3))clean:$(subst $(WHITESPACE),:,$(2))$(gb_Output_COLOR_OUTCLEAN_LEVEL$(3)):]))$(gb_Output_COLOR_RESET)
+	$(gb_Output_COLOR_OUTBUILD_LEVEL$(3))[:$(gb_Output_COLOR_INBUILD_LEVEL$(3))__.oO:$(subst $(WHITESPACE),:,$(2))$(gb_Output_COLOR_OUTBUILD_LEVEL$(3)):] \
+	$(gb_Output_COLOR_OUTCLEAN_LEVEL$(3))[:$(gb_Output_COLOR_INCLEAN_LEVEL$(3))Xx.__:$(subst $(WHITESPACE),:,$(2))$(gb_Output_COLOR_OUTCLEAN_LEVEL$(3)):]))$(gb_Output_COLOR_RESET)
 endef
 
 define gb_Output_info
@@ -144,4 +144,4 @@ $(info $(call gb_Output__format_type,$(2),$(3),$(4)) $(call gb_Output__format_ta
 endef
 
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 4b525705bc5c..db02b8083c15 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -29,7 +29,7 @@
 # PackagePart class
 
 $(foreach destination,$(call gb_PackagePart_get_destinations), $(destination)/%) :
-    $(call gb_Deliver_deliver,$<,$@)
+	$(call gb_Deliver_deliver,$<,$@)
 
 define gb_PackagePart_PackagePart
 $(OUTDIR)/$(1) : $(2)
@@ -43,16 +43,16 @@ endef
 
 .PHONY : $(call gb_Package_get_clean_target,%)
 $(call gb_Package_get_clean_target,%) :
-    $(call gb_Output_announce,$*,$(false),PKG,2)
-    -$(call gb_Helper_abbreviate_dirs,\
-        rm -f $(FILES))
+	$(call gb_Output_announce,$*,$(false),PKG,2)
+	-$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(FILES))
 
 $(call gb_Package_get_preparation_target,%) :
-    mkdir -p $(dir $@) && touch $@
+	mkdir -p $(dir $@) && touch $@
 
 $(call gb_Package_get_target,%) :
-    $(call gb_Output_announce,$*,$(true),PKG,2)
-    mkdir -p $(dir $@) && touch $@
+	$(call gb_Output_announce,$*,$(true),PKG,2)
+	mkdir -p $(dir $@) && touch $@
 
 
 define gb_Package_Package
@@ -77,4 +77,4 @@ $(eval $(call gb_CustomTarget_CustomTarget,$(2),$(3)))
 
 endef
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk
index 2c7ececf4a0a..0db75718c07c 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -40,38 +40,38 @@ gb_NoexPrecompiledHeader_DEBUGDIR := nodebug
 endif
 
 $(call gb_PrecompiledHeader_get_dep_target,%) :
-    $(call gb_Helper_abbreviate_dirs,\
-        mkdir -p $(dir $@) && \
-        echo '$(call gb_PrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@)
+	$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@) && \
+		echo '$(call gb_PrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@)
 
 $(call gb_NoexPrecompiledHeader_get_dep_target,%) :
-    $(call gb_Helper_abbreviate_dirs,\
-        mkdir -p $(dir $@) && \
-        echo '$(call gb_NoexPrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@)
+	$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@) && \
+		echo '$(call gb_NoexPrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@)
 
 $(call gb_PrecompiledHeader_get_target,%) :
-    $(call gb_PrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE))
+	$(call gb_PrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE))
 
 $(call gb_NoexPrecompiledHeader_get_target,%) :
-    $(call gb_NoexPrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE))
+	$(call gb_NoexPrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE))
 
 .PHONY : $(call gb_PrecompiledHeader_get_clean_target,%) $(call gb_NoExPrecompiledHeader_get_clean_target,%)
 $(call gb_PrecompiledHeader_get_clean_target,%) :
-    $(call gb_Output_announce,$*,$(false),PCH,1)
-    -$(call gb_Helper_abbreviate_dirs,\
-        rm -f $(call gb_PrecompiledHeader_get_target,$*) \
-            $(call gb_PrecompiledHeader_get_target,$*).obj \
-            $(call gb_PrecompiledHeader_get_target,$*).pdb \
-            $(call gb_PrecompiledHeader_get_dep_target,$*))
+	$(call gb_Output_announce,$*,$(false),PCH,1)
+	-$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_PrecompiledHeader_get_target,$*) \
+			$(call gb_PrecompiledHeader_get_target,$*).obj \
+			$(call gb_PrecompiledHeader_get_target,$*).pdb \
+			$(call gb_PrecompiledHeader_get_dep_target,$*))
 
 
 $(call gb_NoexPrecompiledHeader_get_clean_target,%) :
-    $(call gb_Output_announce,$*,$(false),PCH,1)
-    -$(call gb_Helper_abbreviate_dirs,\
-        rm -f $(call gb_NoexPrecompiledHeader_get_target,$*) \
-            $(call gb_NoexPrecompiledHeader_get_target,$*).obj \
-            $(call gb_NoexPrecompiledHeader_get_target,$*).pdb \
-            $(call gb_NoexPrecompiledHeader_get_dep_target,$*))
+	$(call gb_Output_announce,$*,$(false),PCH,1)
+	-$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_NoexPrecompiledHeader_get_target,$*) \
+			$(call gb_NoexPrecompiledHeader_get_target,$*).obj \
+			$(call gb_NoexPrecompiledHeader_get_target,$*).pdb \
+			$(call gb_NoexPrecompiledHeader_get_dep_target,$*))
 endif
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/RdbTarget.mk b/solenv/gbuild/RdbTarget.mk
new file mode 100644
index 000000000000..e8436ebc99d7
--- /dev/null
+++ b/solenv/gbuild/RdbTarget.mk
@@ -0,0 +1,83 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+gb_RdbTarget__get_old_component_target = $(OUTDIR)/xml/$(1).component
+
+$(call gb_RdbTarget_get_target,%) :
+	$(call gb_Output_announce,$*,$(true),RDB,1)
+	$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@) && \
+		echo '<?xml version="1.0"?><components xmlns="http://openoffice.org/2010/uno-components">' > $@ && \
+		$(gb_AWK) -- \
+			'/^<\?xml version.*/ { next; } \
+			{ gsub(/vnd.sun.star.expand:\$$OOO_BASE_DIR\/program/, "vnd.sun.star.expand:$$OOO_BASE_DIR",$$0); gsub(/vnd.sun.star.expand:\$$BRAND_BASE_DIR\/program/, "vnd.sun.star.expand:$$BRAND_BASE_DIR",$$0); print; }' \
+			$(foreach component,$(COMPONENTS),$(call gb_ComponentTarget_get_target,$(component))) \
+			$(foreach component,$(OLD_COMPONENTS),$(call gb_RdbTarget__get_old_component_target,$(component))) \
+			>> $@ && \
+		echo '</components>' >> $@)
+
+.PHONY : $(call gb_RdbTarget_get_clean_target,%)
+$(call gb_RdbTarget_get_clean_target,%) :
+	$(call gb_Output_announce,$*,$(false),RDB,1)
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_RdbTarget_get_outdir_target,$*) $(call gb_RdbTarget_get_target,$*))
+
+$(call gb_RdbTarget_get_external_target,%) :
+	$(call gb_Deliver_deliver,$<,$@)
+
+define gb_RdbTarget_RdbTarget
+$(call gb_RdbTarget_get_target,$(1)) : COMPONENTS :=
+$(call gb_RdbTarget_get_target,$(1)) : OLD_COMPONENTS :=
+$(call gb_RdbTarget_get_clean_target,$(1)) : COMPONENTS :=
+$(call gb_RdbTarget_get_clean_target,$(1)) : OLD_COMPONENTS :=
+ifeq ($(2),$(true))
+$(call gb_RdbTarget_get_outdir_target,$(1)) : $(call gb_RdbTarget_get_target,$(1))
+$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_RdbTarget_get_target,$(1)))
+endif
+endef
+
+define gb_RdbTarget_add_component
+$(call gb_RdbTarget_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2))
+$(call gb_RdbTarget_get_target,$(1)) : COMPONENTS += $(2)
+$(call gb_RdbTarget_get_clean_target,$(1)) : COMPONENTS += $(2)
+endef
+
+define gb_RdbTarget_add_components
+$(foreach component,$(2),$(eval $(call gb_RdbTarget_add_component,$(1),$(component))))
+endef
+
+define gb_RdbTarget_add_old_component
+$(call gb_RdbTarget_get_target,$(1)) : $(call gb_RdbTarget__get_old_component_target,$(2))
+$(call gb_RdbTarget_get_target,$(1)) : OLD_COMPONENTS += $(2)
+$(call gb_RdbTarget_get_clean_target,$(1)) : OLD_COMPONENTS += $(2)
+endef
+
+define gb_RdbTarget_add_old_components
+$(foreach component,$(2),$(eval $(call gb_RdbTarget_add_old_component,$(1),$(component))))
+endef
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index 8f8670c6950d..81f007272498 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -35,28 +35,28 @@ gb_SdiTarget_SVIDLTARGET := $(call gb_Executable_get_target,svidl)
 gb_SdiTarget_SVIDLCOMMAND := $(gb_SdiTarget_SVIDLPRECOMMAND) $(gb_SdiTarget_SVIDLTARGET)
 
 $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | $(gb_SdiTarget_SVIDLTARGET)
-    $(call gb_Output_announce,$*,$(true),SDI,1)
-    $(call gb_Helper_abbreviate_dirs,\
-        mkdir -p $(dir $@))
-    $(call gb_Helper_abbreviate_dirs_native,\
-        cd $(dir $<) && \
-        $(gb_SdiTarget_SVIDLCOMMAND) -quiet \
-            $(INCLUDE) \
-            -fs$@.hxx \
-            -fd$@.ilb \
-            -fl$@.lst \
-            -fz$@.sid \
-            -fx$(EXPORTS) \
-            -fm$@ \
-            $<)
+	$(call gb_Output_announce,$*,$(true),SDI,1)
+	$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@))
+	$(call gb_Helper_abbreviate_dirs_native,\
+		cd $(dir $<) && \
+		$(gb_SdiTarget_SVIDLCOMMAND) -quiet \
+			$(INCLUDE) \
+			-fs$@.hxx \
+			-fd$@.ilb \
+			-fl$@.lst \
+			-fz$@.sid \
+			-fx$(EXPORTS) \
+			-fm$@ \
+			$(realpath $<))
 
 .PHONY : $(call gb_SdiTarget_get_clean_target,%)
 $(call gb_SdiTarget_get_clean_target,%) :
-    $(call gb_Output_announce,$*,$(false),SDI,1)
-    -$(call gb_Helper_abbreviate_dirs,\
-        rm -f $(foreach ext,.hxx .ilb .lst .sid,\
-            $(call gb_SdiTarget_get_target,$*)$(ext)) \
-            $(call gb_SdiTarget_get_target,$*))
+	$(call gb_Output_announce,$*,$(false),SDI,1)
+	-$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(foreach ext,.hxx .ilb .lst .sid,\
+			$(call gb_SdiTarget_get_target,$*)$(ext)) \
+			$(call gb_SdiTarget_get_target,$*))
 
 define gb_SdiTarget_SdiTarget
 $(call gb_SdiTarget_get_target,$(1)) : INCLUDE := $$(subst -I. ,-I$$(dir $(SRCDIR)/$(1)) ,$$(SOLARINC))
@@ -68,4 +68,4 @@ $(call gb_SdiTarget_get_target,$(1)) : INCLUDE := $(2)
 
 endef
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 4d3c22b4e871..33fe714d7256 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -35,20 +35,19 @@
 #  gb_StaticLibrary_FILENAMES
 #  gb_StaticLibrary_TARGETS
 
-gb_StaticLibrary__get_linktargetname = StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1))
 
 # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
 .PHONY : $(WORKDIR)/Clean/OutDir/lib/%$(gb_StaticLibrary_PLAINEXT)
 $(WORKDIR)/Clean/OutDir/lib/%$(gb_StaticLibrary_PLAINEXT) :
-    $(call gb_Helper_abbreviate_dirs,\
-        rm -f $(OUTDIR)/lib/$*$(gb_StaticLibrary_PLAINEXT) \
-            $(AUXTARGETS))
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(OUTDIR)/lib/$*$(gb_StaticLibrary_PLAINEXT) \
+			$(AUXTARGETS))
 
 # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
 $(gb_StaticLibrary_OUTDIRLOCATION)/%$(gb_StaticLibrary_PLAINEXT) : 
-    $(call gb_Helper_abbreviate_dirs,\
-        $(call gb_Deliver_deliver,$<,$@) \
-            $(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
+	$(call gb_Helper_abbreviate_dirs,\
+		$(call gb_Deliver_deliver,$<,$@) \
+			$(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
 
 define gb_StaticLibrary_StaticLibrary
 ifeq (,$$(findstring $(1),$$(gb_StaticLibrary_KNOWNLIBS)))
@@ -56,7 +55,7 @@ $$(eval $$(call gb_Output_info,Currently known static libraries are: $(sort $(gb
 $$(eval $$(call gb_Output_error,Static library $(1) must be registered in Repository.mk))
 endif
 $(call gb_StaticLibrary_get_target,$(1)) : AUXTARGETS :=
-$(call gb_StaticLibrary__StaticLibrary_impl,$(1),$(call gb_StaticLibrary__get_linktargetname,$(1)))
+$(call gb_StaticLibrary__StaticLibrary_impl,$(1),$(call gb_StaticLibrary_get_linktargetname,$(1)))
 
 endef
 
@@ -64,7 +63,7 @@ define gb_StaticLibrary__StaticLibrary_impl
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),StaticLibrary)
 $(call gb_LinkTarget_add_defs,$(2),\
-    $(gb_StaticLibrary_DEFS) \
+	$(gb_StaticLibrary_DEFS) \
 )
 $(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
 $(call gb_StaticLibrary_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
@@ -75,40 +74,41 @@ $(call gb_Deliver_add_deliverable,$(call gb_StaticLibrary_get_target,$(1)),$(cal
 endef
 
 define gb_StaticLibrary_forward_to_Linktarget
-gb_StaticLibrary_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_StaticLibrary__get_linktargetname,$$(1)),$$(2),$$(3))
+gb_StaticLibrary_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_StaticLibrary_get_linktargetname,$$(1)),$$(2),$$(3))
 
 endef
 
 $(eval $(foreach method,\
-    add_cobject \
-    add_cobjects \
-    add_cxxobject \
-    add_cxxobjects \
-    add_objcxxobject \
-    add_objcxxobjects \
-    add_exception_objects \
-    add_noexception_objects \
-    add_generated_exception_objects \
+	add_cobject \
+	add_cobjects \
+	add_cxxobject \
+	add_cxxobjects \
+	add_objcxxobject \
+	add_objcxxobjects \
+	add_exception_objects \
+	add_noexception_objects \
+	add_generated_cxxobjects \
+	add_generated_exception_objects \
 	add_cflags \
-    set_cflags \
+	set_cflags \
 	add_cxxflags \
-    set_cxxflags \
+	set_cxxflags \
 	add_objcxxflags \
-    set_objcxxflags \
+	set_objcxxflags \
 	add_defs \
-    set_defs \
-    set_include \
+	set_defs \
+	set_include \
 	add_ldflags \
-    set_ldflags \
+	set_ldflags \
 	add_libs \
-    set_library_path_flags \
-    add_linked_libs \
-    add_linked_static_libs \
-    add_package_headers \
-    add_sdi_headers \
-    add_precompiled_header \
+	set_library_path_flags \
+	add_linked_libs \
+	add_linked_static_libs \
+	add_package_headers \
+	add_sdi_headers \
+	add_precompiled_header \
 ,\
-    $(call gb_StaticLibrary_forward_to_Linktarget,$(method))\
+	$(call gb_StaticLibrary_forward_to_Linktarget,$(method))\
 ))
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 5ee2e5791663..bcca63f49c5c 100755
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -30,8 +30,15 @@
 gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
 gb_ComponentTarget_get_outdir_inbuild_target = $(OUTDIR)/xml/component/$(1).inbuild.component
 gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
-gb_PackagePart_get_destinations = $(OUTDIR)/xml $(OUTDIR)/inc $(OUTDIR)/bin $(OUTDIR)/pck
+gb_Executable_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT)
+gb_PackagePart_get_destinations = \
+	$(OUTDIR)/xml \
+	$(OUTDIR)/pck \
+	$(OUTDIR)/inc \
+	$(OUTDIR)/bin \
+
 gb_PackagePart_get_target = $(OUTDIR)/$(1)
+gb_RdbTarget_get_outdir_target = $(OUTDIR)/xml/$(1).rdb
 gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst
 gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res
 gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
@@ -71,22 +78,27 @@ gb_JunitTest_get_userdir = $(WORKDIR)/JunitTest/$(1)/user
 gb_LinkTarget_get_external_headers_target = $(WORKDIR)/ExternalHeaders/$(1)
 gb_LinkTarget_get_headers_target = $(WORKDIR)/Headers/$(1)
 gb_LinkTarget_get_target = $(WORKDIR)/LinkTarget/$(1)
+gb_LinkTarget_get_objects_list = $(WORKDIR)/LinkTarget/$(1).objectlist
 gb_Module_get_check_target = $(WORKDIR)/Module/check/$(1)
 gb_Module_get_subsequentcheck_target = $(WORKDIR)/Module/subsequentcheck/$(1)
 gb_Module_get_target = $(WORKDIR)/Module/$(1)
 gb_NoexPrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d
 gb_NoexPrecompiledHeader_get_target = $(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch
 gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o
+gb_ObjCObject_get_target = $(WORKDIR)/ObjCObject/$(1).o
 gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1)
 gb_Package_get_target = $(WORKDIR)/Package/$(1)
 gb_PrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d
 gb_PrecompiledHeader_get_target = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch
+gb_RdbTarget_get_target = $(WORKDIR)/RdbTarget/$(1).rdb
 gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
 gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
 gb_SdiTarget_get_target = $(WORKDIR)/SdiTarget/$(1)
 gb_SrsPartMergeTarget_get_target = $(WORKDIR)/SrsPartMergeTarget/$(1)
 gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1)
 gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
+gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/inc/$(firstword $(subst /, ,$(1)))/$(subst _tmpl,,$(notdir $(1)))
+gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1)
 gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
 gb_Zip_get_target = $(WORKDIR)/Zip/$(1).zip
 gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done
@@ -108,40 +120,43 @@ $(patsubst $(1):%,$(WORKDIR)/Headers/StaticLibrary/%,$(filter $(1):%,$(gb_Static
 endef
 
 $(eval $(call gb_Helper_make_clean_targets,\
-    AllLangResTarget \
-    ComponentTarget \
-    JavaClassSet \
+	AllLangResTarget \
+	ComponentTarget \
+	JavaClassSet \
 	Jar \
-    JunitTest \
-    LinkTarget \
-    Module \
-    NoexPrecompiledHeader \
-    PackagePart \
-    PrecompiledHeader \
-    ResTarget \
-    SdiTarget \
-    SrsTarget \
-    CppunitTest \
-    CustomTarget \
+	JunitTest \
+	LinkTarget \
+	Module \
+	NoexPrecompiledHeader \
+	PackagePart \
+	PrecompiledHeader \
+	RdbTarget \
+	ResTarget \
+	SdiTarget \
+	SrsTarget \
+	SrsTemplateTarget \
+	CppunitTest \
+	CustomTarget \
     WinResTarget \
 	Zip \
 ))
 
 $(eval $(call gb_Helper_make_outdir_clean_targets,\
-    Executable \
-    Library \
-    Package \
-    StaticLibrary \
+	Executable \
+	Library \
+	Package \
+	StaticLibrary \
 ))
 
 $(eval $(call gb_Helper_make_dep_targets,\
-    CObject \
-    CxxObject \
-    ObjCxxObject \
+	CObject \
+	CxxObject \
+	ObjCObject \
+	ObjCxxObject \
 	GenCxxObject \
-    LinkTarget \
-    SrsPartTarget \
-    SrsTarget \
+	LinkTarget \
+	SrsPartTarget \
+	SrsTarget \
 ))
 
 # other getters
@@ -162,6 +177,9 @@ define gb_StaticLibrary_get_filename
 $(patsubst $(1):%,%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
 endef
 
+gb_Executable_get_linktargetname = Executable/$(1)$(gb_Executable_EXT)
+gb_Library_get_linktargetname = Library/$(call gb_Library_get_filename,$(1))
+gb_StaticLibrary_get_linktargetname = StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1))
 
 # static members declared here because they are used globally
 
@@ -170,4 +188,4 @@ gb_Library_DLLDIR = $(WORKDIR)/LinkTarget/Library
 gb_CppunitTest_DLLDIR = $(WORKDIR)/LinkTarget/CppunitTest
 gb_StaticLibrary_OUTDIRLOCATION = $(OUTDIR)/lib
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/Tempfile.mk b/solenv/gbuild/Tempfile.mk
index 5b80452056e0..d87fc373fc9b 100644
--- a/solenv/gbuild/Tempfile.mk
+++ b/solenv/gbuild/Tempfile.mk
@@ -6,13 +6,13 @@ define var2file
 $(strip $(1)
 $(eval gb_var2file_helpervar := $$(shell printf "%s" "" > $(1) ))\
 $(foreach item,$(3),$(eval gb_var2file_curblock += $(item)
-    ifeq ($$(words $$(gb_var2file_curblock)),$(2)) 
-        gb_var2file_helpervar := $$(shell printf "%s" "$$(gb_var2file_curblock)" >> $(1) )
-        gb_var2file_curblock :=
-    endif
-    ))\
-    $(eval gb_var2file_helpervar := $(shell echo " "$(gb_var2file_curblock) >> $(1) )
-        gb_var2file_curblock :=
-    ))
+	ifeq ($$(words $$(gb_var2file_curblock)),$(2)) 
+		gb_var2file_helpervar := $$(shell printf "%s" "$$(gb_var2file_curblock)" >> $(1) )
+		gb_var2file_curblock :=
+	endif
+	))\
+	$(eval gb_var2file_helpervar := $(shell echo " "$(gb_var2file_curblock) >> $(1) )
+		gb_var2file_curblock :=
+	))
 endef
 
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index 17c7500769f9..af768ff2c596 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -30,21 +30,21 @@ endef
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_WinResTarget_get_dep_target,%) : $(gb_Helper_MISCDUMMY)
-        mkdir -p $(dir $@) && \
-            echo '$(call gb_WinResTarget_get_target,$*) : $$(gb_Helper_PHONY)' > $@
+		mkdir -p $(dir $@) && \
+			echo '$(call gb_WinResTarget_get_target,$*) : $$(gb_Helper_PHONY)' > $@
 endif
 
 
 $(call gb_WinResTarget_get_target,%) :
-    $(call gb_Output_announce,$*,$(true),RES,1)
-    $(call gb_WinResTarget__command_dep,$*,$<)
-    $(call gb_Helper_abbreviate_dirs,\
-        mkdir -p $(dir $@))
-    $(call gb_WinResTarget__command,$@)
+	$(call gb_Output_announce,$*,$(true),RES,1)
+	$(call gb_WinResTarget__command_dep,$*,$<)
+	$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@))
+	$(call gb_WinResTarget__command,$@)
 
 $(call gb_WinResTarget_get_clean_target,%) :
-    $(call gb_Helper_abbreviate_dirs,\
-        rm -f $(call gb_WinResTarget_get_target,$*))
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_WinResTarget_get_target,$*))
 
 define gb_WinResTarget_set_defs
 $(call gb_WinResTarget_get_target,$(1)) : DEFS := $(2)
diff --git a/solenv/gbuild/extensions/final_ObjectOwner.mk b/solenv/gbuild/extensions/final_ObjectOwner.mk
new file mode 100644
index 000000000000..f66a7a2e89ee
--- /dev/null
+++ b/solenv/gbuild/extensions/final_ObjectOwner.mk
@@ -0,0 +1,47 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+ifeq ($(gb_CHECKOBJECTOWNER),$(true))
+
+define gb_LinkTarget_check_object_owner
+ifneq (1,$$(words $$(filter $(1):%,$$(gb_LinkTarget_OBJECTOWNER))))
+$$(info \
+	$(patsubst $(WORKDIR)/%,%,$(1))\
+	is linked in by\
+	$$(patsubst $(1):%,%,$$(filter $(1):%,$$(gb_LinkTarget_OBJECTOWNER))))
+gb_CHECKOBJECTOWNER_VALID := $(false)
+endif
+endef
+
+gb_CHECKOBJECTOWNER_VALID := $(true)
+$(foreach object,$(sort $(gb_LinkTarget_OBJECTS)),$(eval $(call gb_LinkTarget_check_object_owner,$(object))))
+ifneq ($(gb_CHECKOBJECTOWNER_VALID),$(true))
+$(eval $(call gb_Output_warn,duplicate linked objects))
+endif
+
+endif
+# vim: set noet ts=4 sw=4:
diff --git a/solenv/gbuild/extensions/post_PackModule.mk b/solenv/gbuild/extensions/post_PackModule.mk
index f39268a9eea7..566c46d2e76f 100644
--- a/solenv/gbuild/extensions/post_PackModule.mk
+++ b/solenv/gbuild/extensions/post_PackModule.mk
@@ -42,8 +42,8 @@ endif
 endef
 
 packmodule : allandcheck deliverlog
-    $(eval $(call gb_PackModule_setpackmodulecommand))
-    $(COMMAND)
+	$(eval $(call gb_PackModule_setpackmodulecommand))
+	$(COMMAND)
 
 define gb_PackModule_setcleanpackmodulecommand
 ifeq ($$(words $(gb_Module_ALLMODULES)),1)
@@ -56,7 +56,7 @@ endif
 endef
 
 cleanpackmodule : clean
-    $(eval $(call gb_PackModule_setcleanpackmodulecommand))
-    $(COMMAND)
-    
+	$(eval $(call gb_PackModule_setcleanpackmodulecommand))
+	$(COMMAND)
+	
 # vim: set noet ts=4 sw=4:
diff --git a/solenv/gbuild/extensions/post_SetupLocal.mk b/solenv/gbuild/extensions/post_SetupLocal.mk
index 483b8a163056..175903c3a2b9 100644
--- a/solenv/gbuild/extensions/post_SetupLocal.mk
+++ b/solenv/gbuild/extensions/post_SetupLocal.mk
@@ -29,40 +29,40 @@
 ifneq ($(gb_LOCALBUILDDIR),)
 ifneq ($(wildcard $(gb_LOCALBUILDDIR)/SetupLocal.mk),)
 setuplocal :
-    $(eval $(call gb_Output_error,$(gb_LOCALBUILDDIR) exists already.))
+	$(eval $(call gb_Output_error,$(gb_LOCALBUILDDIR) exists already.))
 
 else
 
 setuplocal :
-    $(eval MODULE := $(firstword $(MODULE) $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))))
-    $(eval modulerepo := $(patsubst %/$(MODULE),%,$(foreach repo,$(gb_REPOS),$(wildcard $(repo)/$(MODULE)))))
-    $(eval $(call gb_Output_announce,setting up local build directory (module: $(MODULE)).,$(true),SYC,5))
-    mkdir -p $(gb_LOCALBUILDDIR)/srcdir $(gb_LOCALBUILDDIR)/workdir $(gb_LOCALBUILDDIR)/outdir
-    rsync --archive --exclude 'workdir/**' $(SOLARVERSION)/$(INPATH)/ $(gb_LOCALBUILDDIR)/outdir
-    cp $(modulerepo)/Repository.mk $(gb_LOCALBUILDDIR)/srcdir/Repository.mk
-    cp $(modulerepo)/RepositoryFixes.mk $(gb_LOCALBUILDDIR)/srcdir/RepositoryFixes.mk
-    rsync --archive $(modulerepo)/$(MODULE)/ $(gb_LOCALBUILDDIR)/srcdir/$(MODULE)
-    echo "gb_REPOS := $(gb_LOCALBUILDDIR)/srcdir $(filter-out $(patsubst %/$(MODULE),%,$(foreach repo,$(gb_REPOS),$(wildcard $(repo)/$(MODULE)))),$(gb_REPOS))" > $(gb_LOCALBUILDDIR)/SetupLocal.mk
-    echo "#original gb_REPOS was $(gb_REPOS)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
-    echo "OUTDIR := $(gb_LOCALBUILDDIR)/outdir" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
-    echo "#original OUTDIR was $(OUTDIR)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
-    echo "WORKDIR := $(gb_LOCALBUILDDIR)/workdir" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
-    echo "#original WORKDIR was $(WORKDIR)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+	$(eval MODULE := $(firstword $(MODULE) $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))))
+	$(eval modulerepo := $(patsubst %/$(MODULE),%,$(foreach repo,$(gb_REPOS),$(wildcard $(repo)/$(MODULE)))))
+	$(eval $(call gb_Output_announce,setting up local build directory (module: $(MODULE)).,$(true),SYC,5))
+	mkdir -p $(gb_LOCALBUILDDIR)/srcdir $(gb_LOCALBUILDDIR)/workdir $(gb_LOCALBUILDDIR)/outdir
+	rsync --archive --exclude 'workdir/**' $(SOLARVERSION)/$(INPATH)/ $(gb_LOCALBUILDDIR)/outdir
+	cp $(modulerepo)/Repository.mk $(gb_LOCALBUILDDIR)/srcdir/Repository.mk
+	cp $(modulerepo)/RepositoryFixes.mk $(gb_LOCALBUILDDIR)/srcdir/RepositoryFixes.mk
+	rsync --archive $(modulerepo)/$(MODULE)/ $(gb_LOCALBUILDDIR)/srcdir/$(MODULE)
+	echo "gb_REPOS := $(gb_LOCALBUILDDIR)/srcdir $(filter-out $(patsubst %/$(MODULE),%,$(foreach repo,$(gb_REPOS),$(wildcard $(repo)/$(MODULE)))),$(gb_REPOS))" > $(gb_LOCALBUILDDIR)/SetupLocal.mk
+	echo "#original gb_REPOS was $(gb_REPOS)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+	echo "OUTDIR := $(gb_LOCALBUILDDIR)/outdir" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+	echo "#original OUTDIR was $(OUTDIR)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+	echo "WORKDIR := $(gb_LOCALBUILDDIR)/workdir" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+	echo "#original WORKDIR was $(WORKDIR)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
 
 endif
 
 removelocal :
-    $(eval $(call gb_Output_warn,removing directory $(gb_LOCALBUILDDIR).,SYC))
-    sleep 10
-    rm -rf $(gb_LOCALBUILDDIR)
+	$(eval $(call gb_Output_warn,removing directory $(gb_LOCALBUILDDIR).,SYC))
+	sleep 10
+	rm -rf $(gb_LOCALBUILDDIR)
 
 else
 setuplocal:
-    $(eval $(call gb_Output_error,setuplocal: gb_LOCALBUILDDIR is not set.))
+	$(eval $(call gb_Output_error,setuplocal: gb_LOCALBUILDDIR is not set.))
 
 removelocal:
-    $(eval $(call gb_Output_error,setuplocal: gb_LOCALBUILDDIR is not set.))
+	$(eval $(call gb_Output_error,setuplocal: gb_LOCALBUILDDIR is not set.))
 
 endif
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/filter-showIncludes.pl b/solenv/gbuild/filter-showIncludes.pl
new file mode 100755
index 000000000000..f72a9eb07fd8
--- /dev/null
+++ b/solenv/gbuild/filter-showIncludes.pl
@@ -0,0 +1,62 @@
+#!/usr/bin/env perl
+#
+# filter-showIncludes.pl depfile.d objfile.o orginal.cxx
+#
+# Create dependency information from the output of cl.exe's showInclude.  It
+# needs additional information - the output name to which to write, objfile
+# that depends on the includes, and the original file name.
+#
+# It also consolidates the file names to a canonical form, and filters out
+# duplicates.
+#
+# LGPL v3 / GPL v3 / MPL 1.1
+#
+# Original author: Jan Holesovsky <kendy@suse.cz>
+
+my $outfile = $ARGV[0];
+my $objfile = $ARGV[1];
+my $srcfile = $ARGV[2];
+if ( !defined $outfile || !defined $objfile || !defined $srcfile ) {
+    die "Not enough parameters to create dependencies.";
+}
+
+my $showincludes_prefix = $ENV{'SHOWINCLUDES_PREFIX'};
+if ( !defined( $showincludes_prefix ) || $showincludes_prefix eq "" ) {
+    $showincludes_prefix = 'Note: including file:';
+}
+
+open( OUT, "> $outfile" ) or die "Cannot open $outfile for writing.";
+print OUT "$objfile: \\\n $srcfile";
+
+my %seen;
+my $first_line = 1;
+while ( <STDIN> ) {
+    if ( /^$showincludes_prefix/ ) {
+        s/^$showincludes_prefix\s*//;
+        s/\r$//;
+
+        chomp;
+        s/\\/\//g;
+
+        # X: -> /cygdrive/x/
+        s/^(.):/\/cygdrive\/\l\1/;
+
+        s/ /\\ /g;
+
+        if ( !defined $seen{$_} ) {
+            $seen{$_} = 1;
+            print OUT " \\\n  $_";
+        }
+    }
+    else {
+        # skip the first line, it always just duplicates what is being
+        # compiled
+        print unless ( $first_line );
+    }
+    $first_line = 0;
+}
+
+print OUT "\n";
+close( OUT ) or die "Cannot close $outfile.";
+
+# vim: shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 61a281fc59e9..0214f14c2f88 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -27,7 +27,6 @@
 
 # vars needed from the env/calling makefile
 
-# CVER
 # DEBUG
 # GBUILDDIR
 # INPATH
@@ -38,7 +37,6 @@
 # PRODUCT
 # SOLARINC
 # SOLARLIB
-# STLPORT_VER
 # UPD
 
 # GXX_INCLUDE_PATH (Linux)
@@ -46,7 +44,6 @@
 # SYSTEM_ICU (Linux)
 # SYSTEM_JPEG (Linux)
 # SYSTEM_LIBXML (Linux)
-# USE_SYSTEM_STL (Linux)
 
 SHELL := /bin/sh
 true := T
@@ -83,14 +80,27 @@ gb_PRODUCT := $(false)
 endif
 endif
 
-ifneq ($(strip $(DEBUG)$(debug)),)
-gb_DEBUGLEVEL := 2
+ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),)
+gb_SYMBOL := $(true)
 else
-ifeq ($(gb_PRODUCT),$(true))
+gb_SYMBOL := $(false)
+endif
+
 gb_DEBUGLEVEL := 0
-else
+ifneq ($(strip $(DEBUG)$(debug)),)
 gb_DEBUGLEVEL := 1
 endif
+
+ifneq ($(strip $(DBGLEVEL)$(dbglevel)),)
+ifneq ($(strip $(dbglevel)),)
+gb_DEBUGLEVEL := $(strip $(dbglevel))
+else
+gb_DEBUGLEVEL := $(strip $(DBGLEVEL))
+endif
+endif
+
+ifneq ($(gb_DEBUGLEVEL),0)
+gb_SYMBOL := $(true)
 endif
 
 ifneq ($(strip $(ENABLE_PCH)),)
@@ -100,12 +110,32 @@ gb_ENABLE_PCH := $(false)
 endif
 
 # for clean, setuplocal and removelocal goals we switch off dependencies
-ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables,$(MAKECMDGOALS)),)
+ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables help,$(MAKECMDGOALS)),)
 gb_FULLDEPS := $(false)
 else
 gb_FULLDEPS := $(true)
 endif
 
+gb_CHECKOBJECTOWNER := $(true)
+
+# save user-supplied flags for latter use
+ifneq ($(strip $(CFLAGS)),)
+gb__ENV_CFLAGS := $(CFLAGS)
+else
+# TODO remove after the old build system is abolished
+ifneq ($(strip $(ENVCFLAGS)),)
+gb__ENV_CFLAGS := $(ENVCFLAGS)
+endif
+endif
+ifneq ($(strip $(CXXFLAGS)),)
+gb__ENV_CXXFLAGS := $(CXXFLAGS)
+else
+# TODO remove after the old build system is abolished
+ifneq ($(strip $(ENVCFLAGSCXX)),)
+gb__ENV_CXXFLAGS := $(ENVCFLAGSCXX)
+endif
+endif
+
 include $(GBUILDDIR)/Helper.mk
 include $(GBUILDDIR)/TargetLocations.mk
 
@@ -113,27 +143,35 @@ $(eval $(call gb_Helper_init_registries))
 $(eval $(call gb_Helper_add_repositories,$(gb_REPOS)))
 $(eval $(call gb_Helper_collect_libtargets))
 
+gb_Library_DLLPOSTFIX := lo
+
 ifeq ($(OS),LINUX)
-include $(GBUILDDIR)/platform/linux.mk
-else
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
+include $(GBUILDDIR)/platform/linux-$(CPUNAME).mk
+else ifeq ($(OS),MACOSX)
+include $(GBUILDDIR)/platform/macosx.mk
+else ifeq ($(OS),WNT)
+ifeq ($(COM),GCC)
 include $(GBUILDDIR)/platform/winmingw.mk
 else
 include $(GBUILDDIR)/platform/windows.mk
 endif
-else
-ifeq ($(OS),SOLARIS)
+else ifeq ($(OS),OPENBSD)
+include $(GBUILDDIR)/platform/openbsd.mk
+else ifeq ($(OS),FREEBSD)
+include $(GBUILDDIR)/platform/freebsd.mk
+else ifeq ($(OS),NETBSD)
+include $(GBUILDDIR)/platform/netbsd.mk
+else ifeq ($(OS),DRAGONFLY)
+include $(GBUILDDIR)/platform/dragonfly.mk
+else ifeq ($(OS),SOLARIS)
 include $(GBUILDDIR)/platform/solaris.mk
-else
-ifeq ($(OS),MACOSX)
-include $(GBUILDDIR)/platform/macosx.mk
+else ifeq ($(OS),IOS)
+include $(GBUILDDIR)/platform/ios.mk
+else ifeq ($(OS),ANDROID)
+include $(GBUILDDIR)/platform/android.mk
 else
 $(eval $(call gb_Output_error,Unsupported OS: $(OS)))
 endif
-endif
-endif
-endif
 
 include $(GBUILDDIR)/Tempfile.mk
 
@@ -141,41 +179,50 @@ include $(foreach repo,$(gb_REPOS),$(repo)/RepositoryFixes.mk)
 
 $(eval $(call gb_Helper_collect_knownlibs))
 
+# add user-supplied flags
+ifneq ($(strip gb__ENV_CFLAGS),)
+gb_LinkTarget_CFLAGS += $(gb__ENV_CFLAGS)
+endif
+ifneq ($(strip gb__ENV_CXXFLAGS),)
+gb_LinkTarget_CXXFLAGS += $(gb__ENV_CXXFLAGS)
+endif
+
 gb_GLOBALDEFS := \
-    -D_REENTRANT \
-    -DCUI \
-    -DENABLE_LAYOUT_EXPERIMENTAL=0 \
-    -DENABLE_LAYOUT=0 \
-    -DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \
-    -DSOLAR_JAVA \
-    -DSTLPORT_VERSION=$(STLPORT_VER) \
-    -DSUPD=$(UPD) \
-    -DVCL \
-    $(gb_OSDEFS) \
-    $(gb_COMPILERDEFS) \
-    $(gb_CPUDEFS) \
+	-D_REENTRANT \
+	-DCUI \
+	-DENABLE_LAYOUT_EXPERIMENTAL=0 \
+	-DENABLE_LAYOUT=0 \
+	-DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \
+	-DSUPD=$(UPD) \
+	-DVCL \
+	$(gb_OSDEFS) \
+	$(gb_COMPILERDEFS) \
+	$(gb_CPUDEFS) \
 
 ifeq ($(gb_PRODUCT),$(true))
 gb_GLOBALDEFS += \
-    -DPRODUCT \
-    -DPRODUCT_FULL \
+	-DPRODUCT \
+	-DPRODUCT_FULL \
 
 else
 gb_GLOBALDEFS += \
-    -DDBG_UTIL \
-    -D_STLP_DEBUG \
-    -D_DEBUG \
+	-DDBG_UTIL \
+	-D_DEBUG \
+
+endif
 
+ifneq ($(strip $(SOLAR_JAVA)),)
+gb_GLOBALDEFS += -DSOLAR_JAVA
 endif
 
-ifeq ($(gb_DEBUGLEVEL),2)
+ifeq ($(gb_DEBUGLEVEL),0)
 gb_GLOBALDEFS += \
-    -DDEBUG \
+	-DOPTIMIZE \
+	-DNDEBUG \
 
-else
+else ifneq ($(gb_DEBUGLEVEL),1) # 2 or more
 gb_GLOBALDEFS += \
-    -DOPTIMIZE \
-    -DNDEBUG \
+	-DDEBUG \
 
 endif
 
@@ -221,22 +268,23 @@ include $(SOLARENV)/inc/minor.mk
 # is not available everywhere by default.
 
 include $(foreach class, \
-    ComponentTarget \
-    AllLangResTarget \
-    WinResTarget \
-    LinkTarget \
-    Library \
-    StaticLibrary \
-    Executable \
-    SdiTarget \
-    Package \
-    CustomTarget \
-    PrecompiledHeaders \
-    CppunitTest \
+	ComponentTarget \
+	AllLangResTarget \
+	WinResTarget \
+	LinkTarget \
+	Library \
+	StaticLibrary \
+	Executable \
+	SdiTarget \
+	Package \
+	CustomTarget \
+	PrecompiledHeaders \
+	RdbTarget \
+	CppunitTest \
 	Jar \
-    JavaClassSet \
-    JunitTest \
-    Module \
+	JavaClassSet \
+	JunitTest \
+	Module \
 	Zip \
 ,$(GBUILDDIR)/$(class).mk)
 
@@ -245,11 +293,19 @@ ifneq ($(wildcard $(GBUILDDIR)/extensions/post_*.mk),)
 include $(wildcard $(GBUILDDIR)/extensions/post_*.mk)
 endif
 
-ifeq ($(SYSTEM_LIBXSLT),YES)
+define gb_Extensions_final_hook
+ifneq ($(wildcard $(GBUILDDIR)/extensions/final_*.mk),)
+include $(wildcard $(GBUILDDIR)/extensions/final_*.mk)
+endif
+
+endef
+
+
+ifeq ($(SYSTEM_LIBXSLT_FOR_BUILD),YES)
 gb_XSLTPROCTARGET :=
 gb_XSLTPROC := xsltproc
 else
-gb_XSLTPROCTARGET := $(call gb_Executable_get_target,xsltproc)
+gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
 gb_XSLTPROC := $(gb_XSLTPROCPRECOMMAND) $(gb_XSLTPROCTARGET)
 endif
 
@@ -259,4 +315,72 @@ export GBUILDDIR
 # FIXME exporting SRCDIR seems kind of a hack
 export SRCDIR
 
-# vim: set noet sw=4 ts=4:
+define gb_HelpMessage
+NAME
+       gbuild - GNU make based build system for LibreOffice
+
+SYNOPSIS
+       make [ -f makefile ] [ options ] [ variable=value ... ] [ targets ] ...
+
+IMPORTANT OPTIONS
+       -r Eliminate use of the built-in implicit rules. Improves performance,
+          please use always.
+       -s Silent operation; do not print the commands as they are executed.
+
+       -n Print the commands that would be executed, but do not execute them.
+       -k Continue as much as possible after an error.
+
+       -j Specifies the number of jobs (commands) to run simultaneously.
+       -l Specifies that no new jobs (commands) should be started if there are
+          others jobs running and the load average is at least load.
+
+       -t Touch files (mark them up to date without really changing them)
+          instead of running their commands.
+       -W Pretend that the target file has just been modified.
+       -o Do not remake the file file even if it is older than its
+          dependencies, and do not remake anything on account of changes in file.
+
+       -p Print the data base (rules and variable values) that results from
+          reading the makefiles.
+       --debug=b debug make run, see GNU make man page for details
+
+       (descriptions from GNU make man page)
+
+AVAILABLE TARGETS
+       allandcheck     build product and run unit tests (default goal)
+       all             build product
+       check           run unit tests
+       subsequentcheck run system tests (requires full installation)
+       clean           remove all generated files
+
+INTERACTIVE VARIABLES:
+       DEBUG / debug   If not empty, build with DBGLEVEL=1 (see below).
+       ENABLE_SYMBOLS / enable_symbols
+                       If not empty, build with debug symbols. Automatically
+                       enabled by DEBUG/debug.
+       DBGLEVEL / dbglevel
+                       If not empty, force the debug level to the specified value. The
+                       debug level is passed to the source code through OSL_DEBUG_LEVEL
+                       macro.
+                       0 = no debug
+                       1 = symbols + no optimizations
+                       2 = symbols + no optimizations + extra debug output. OSL_TRACE
+                           starts being active on this level.
+                       3... = symbols + no optimizations + extra debug output (usually
+                              extremely verbose). Levels > 2 are not used very much.
+
+       ENABLE_PCH      If not empty, use precompiled headers (Windows only).
+       CFLAGS          Add as compiler flags for plain c compilation.
+       CXXFLAGS        Add as compiler flags for c++ compilation.
+       gb_FULLDEPS     Generate and use dependencies (on by default, handle with care).
+       gb_COLOR        Use ASCII color output.
+       gb_TITLES       Show progress in terminal title.
+
+endef
+
+.PHONY: help
+help :
+	$(info $(gb_HelpMessage))
+	@true
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk
new file mode 100644
index 000000000000..df39d54a3ddb
--- /dev/null
+++ b/solenv/gbuild/platform/android.mk
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk or linux.mk
+gb_CPUDEFS += -DARM32
+gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_CXXFLAGS += -fno-omit-frame-pointer
+gb_CFLAGS += -fno-omit-frame-pointer
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/dragonfly.mk b/solenv/gbuild/platform/dragonfly.mk
new file mode 100644
index 000000000000..591b47bb6d37
--- /dev/null
+++ b/solenv/gbuild/platform/dragonfly.mk
@@ -0,0 +1,44 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk
+
+ifeq ($(CPUNAME),INTEL)
+gb_CPUDEFS := -DX86
+else
+gb_CPUDEFS := -D$(CPUNAME)
+endif
+
+gb_COMPILERDEFAULTOPTFLAGS := -O -g
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:/usr/pkg/lib
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk
new file mode 100644
index 000000000000..39cce14c660d
--- /dev/null
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -0,0 +1,42 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk
+
+ifeq ($(CPUNAME),INTEL)
+gb_CPUDEFS := -DX86
+else
+gb_CPUDEFS := -D$(CPUNAME)
+endif
+
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
new file mode 100644
index 000000000000..c2215e2db109
--- /dev/null
+++ b/solenv/gbuild/platform/ios.mk
@@ -0,0 +1,411 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+GUI := UNX
+COM := GCC
+
+# Darwin mktemp -t expects a prefix, not a pattern
+gb_MKTEMP := /usr/bin/mktemp -t gbuild.
+
+gb_CC := "gcc-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk"
+gb_CXX := "g++-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk"
+gb_GCCP := "gcc-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk"
+gb_AR := ar
+gb_AWK := awk
+gb_CLASSPATHSEP := :
+
+# use CC/CXX if they are nondefaults
+ifneq ($(origin CC),default)
+gb_CC := $(CC)
+gb_GCCP := $(CC)
+endif
+ifneq ($(origin CXX),default)
+gb_CXX := $(CXX)
+endif
+
+gb_OSDEFS := \
+	-D$(OS) \
+	-D_PTHREADS \
+	-DUNIX \
+	-DUNX \
+	-D_REENTRANT \
+	-DNO_PTHREAD_PRIORITY \
+	$(EXTRA_CDEFS) \
+
+gb_COMPILERDEFS := \
+	-D$(COM) \
+	-DCPPU_ENV=gcc3 \
+	-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
+
+gb_CPUDEFS := -DARM32
+
+gb_SDKDIR := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
+
+
+gb_CFLAGS := \
+	-isysroot $(gb_SDKDIR) \
+	-Wall \
+	-Wendif-labels \
+	-Wextra \
+	-Wshadow \
+	-fmessage-length=0 \
+	-fno-common \
+	-fno-strict-aliasing \
+	-pipe \
+
+gb_CXXFLAGS := \
+	-isysroot $(gb_SDKDIR) \
+	-Wall \
+	-Wendif-labels \
+	-Wextra \
+	-Wno-ctor-dtor-privacy \
+	-Wno-non-virtual-dtor \
+	-fmessage-length=0 \
+	-fno-common \
+	-fno-strict-aliasing \
+	-fsigned-char \
+	-malign-natural \
+	-pipe \
+	#-Wshadow \ break in compiler headers already
+	#-fsigned-char \ might be removed?
+	#-malign-natural \ might be removed?
+
+# these are to get g++ to switch to Objective-C++ mode
+# (see toolkit module for a case where it is necessary to do it this way)
+gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
+
+gb_OBJCFLAGS := -x objective-c
+
+ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
+gb_CFLAGS_WERROR := -Werror
+gb_CXXFLAGS_WERROR := -Werror
+endif
+
+gb_LinkTarget_EXCEPTIONFLAGS := \
+	-DEXCEPTIONS_ON \
+	-fexceptions \
+	-fno-enforce-eh-specs \
+
+gb_LinkTarget_NOEXCEPTIONFLAGS := \
+	-DEXCEPTIONS_OFF \
+	-fno-exceptions \
+
+gb_LinkTarget_LDFLAGS := \
+	-Wl,-syslibroot,$(gb_SDKDIR) \
+	$(subst -L../lib , ,$(SOLARLIB)) \
+#man ld says: obsolete	-Wl,-multiply_defined,suppress \
+
+ifneq ($(gb_DEBUGLEVEL),0)
+gb_COMPILEROPTFLAGS := -O0
+else
+gb_COMPILEROPTFLAGS := -O2
+endif
+
+gb_COMPILERNOOPTFLAGS := -O0
+
+# Helper class
+
+gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
+
+gb_Helper_set_ld_path := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+
+# convert parametters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(1)
+endef
+
+
+# CObject class
+
+define gb_CObject__command
+$(call gb_Output_announce,$(2),$(true),C  ,3)
+$(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $(1)) && \
+	mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
+	$(gb_CC) \
+		$(DEFS) $(CFLAGS) \
+		-c $(3) \
+		-o $(1) \
+		-MMD -MT $(call gb_CObject_get_target,$(2)) \
+		-MF $(call gb_CObject_get_dep_target,$(2)) \
+		-I$(dir $(3)) \
+		$(INCLUDE))
+endef
+
+
+# CxxObject class
+
+# N.B: $(CXXFLAGS) may contain -x objective-c++, which must come before -c
+define gb_CxxObject__command
+$(call gb_Output_announce,$(2),$(true),CXX,3)
+$(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $(1)) && \
+	mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
+	$(gb_CXX) \
+		$(DEFS) $(CXXFLAGS) \
+		-c $(3) \
+		-o $(1) \
+		-MMD -MT $(call gb_CxxObject_get_target,$(2)) \
+		-MF $(call gb_CxxObject_get_dep_target,$(2)) \
+		-I$(dir $(3)) \
+		$(INCLUDE_STL) $(INCLUDE))
+endef
+
+
+# ObjCxxObject class
+
+define gb_ObjCxxObject__command
+$(call gb_Output_announce,$(2),$(true),OCX,3)
+$(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $(1)) && \
+	mkdir -p $(dir $(call gb_ObjCxxObject_get_dep_target,$(2))) && \
+	$(gb_CXX) \
+		$(DEFS) $(OBJCXXFLAGS) \
+		-c $(3) \
+		-o $(1) \
+		-MMD -MT $(call gb_ObjCxxObject_get_target,$(2)) \
+		-MF $(call gb_ObjCxxObject_get_dep_target,$(2)) \
+		-I$(dir $(3)) \
+		$(INCLUDE_STL) $(INCLUDE))
+endef
+
+# ObjCObject class
+
+define gb_ObjCObject__command
+$(call gb_Output_announce,$(2),$(true),OCC,3)
+$(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $(1)) && \
+	mkdir -p $(dir $(call gb_ObjCObject_get_dep_target,$(2))) && \
+	$(gb_CC) \
+		$(DEFS) $(OBJCFLAGS) \
+		-c $(3) \
+		-o $(1) \
+		-MMD -MT $(call gb_ObjCObject_get_target,$(2)) \
+		-MF $(call gb_ObjCObject_get_dep_target,$(2)) \
+		-I$(dir $(3)) \
+		$(INCLUDE_STL) $(INCLUDE))
+endef
+
+
+# LinkTarget class
+
+gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
+gb_LinkTarget_OBJCXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) $(gb_OBJCXXFLAGS) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_OBJCFLAGS := $(gb_CFLAGS) $(gb_OBJCFLAGS) $(gb_COMPILEROPTFLAGS)
+
+ifeq ($(gb_SYMBOL),$(true))
+gb_LinkTarget_CFLAGS += -g
+gb_LinkTarget_CXXFLAGS += -g
+gb_LinkTarget_OBJCXXFLAGS += -g
+gb_LinkTarget_OBJCFLAGS += -g
+endif
+
+gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
+gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
+
+# FIXME framework handling very hackish
+define gb_LinkTarget__get_liblinkflags
+$(patsubst lib%.dylib,-l%,$(foreach lib,$(filter-out $(gb_Library__FRAMEWORKS),$(1)),$(call gb_Library_get_filename,$(lib)))) \
+$(addprefix -framework ,$(filter $(gb_Library__FRAMEWORKS),$(1)))
+endef
+
+define gb_LinkTarget__get_layer
+$(if $(filter Executable,$(1)),\
+	$$(call gb_Executable_get_layer,$(2)),\
+	$$(call gb_Library_get_layer,$(2)))
+endef
+
+# Just create a dummy executable
+# It is pointless to build actual iOS executables here anyway.
+# Hmm, except for the simulator? Nah, use Xcode for that, too.
+define gb_LinkTarget__command_dynamiclink
+$(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $(1)) && \
+	((echo '#!/bin/sh' && echo 'echo Nope.') >$(1)))
+endef
+
+# parameters: 1-linktarget 2-cobjects 3-cxxobjects
+define gb_LinkTarget__command_staticlink
+$(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $(1)) && \
+	$(gb_AR) -rsu $(1) \
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+		$(foreach object,$(OBJCOBJECTS),$(call gb_ObjCObject_get_target,$(object))) \
+		$(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
+		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
+		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
+		2> /dev/null)
+endef
+
+define gb_LinkTarget__command
+$(call gb_Output_announce,$(2),$(true),LNK,4)
+$(if $(filter CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2)))
+$(if $(filter Library StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
+endef
+
+
+# Library class
+
+gb_Library_DEFS :=
+gb_Library_SYSPRE := lib
+gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
+gb_Library_PLAINEXT := .a
+gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
+
+gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
+gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
+
+gb_Library__FRAMEWORKS := \
+
+gb_Library_PLAINLIBS_NONE += \
+	jpeg \
+	m \
+	pthread \
+	z \
+
+gb_Library_FILENAMES := \
+	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
+
+
+gb_Library_LAYER := \
+	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \
+
+define gb_Library_Library_platform
+$(call gb_LinkTarget_get_target,$(2)) : LAYER := $(call gb_Library_get_layer,$(1))
+
+endef
+
+
+# StaticLibrary class
+
+gb_StaticLibrary_DEFS :=
+gb_StaticLibrary_SYSPRE := lib
+gb_StaticLibrary_PLAINEXT := .a
+gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
+
+gb_StaticLibrary_FILENAMES := \
+	$(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
+	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
+
+gb_StaticLibrary_StaticLibrary_platform =
+
+
+# Executable class
+
+gb_Executable_EXT :=
+gb_Executable_TARGETTYPEFLAGS := -bind_at_load
+
+gb_Executable_LAYER := \
+	$(foreach exe,$(gb_Executable_UREBIN),$(exe):OOO) \
+	$(foreach exe,$(gb_Executable_SDK),$(exe):OOO) \
+	$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
+	$(foreach exe,$(gb_Executable_BRAND),$(exe):OOO) \
+	$(foreach exe,$(gb_Executable_NONE),$(exe):OOO) \
+
+
+define gb_Executable_Executable_platform
+$(call gb_LinkTarget_get_target,$(2)) : LAYER := $(call gb_Executable_get_layer,$(1))
+
+endef
+
+
+# CppunitTest class
+
+gb_CppunitTest_CPPTESTPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_CppunitTest_SYSPRE := libtest_
+gb_CppunitTest_EXT := .dylib
+gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
+gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
+
+define gb_CppunitTest_CppunitTest_platform
+$(call gb_LinkTarget_get_target,$(2)) :
+$(call gb_LinkTarget_get_target,$(2)) : LAYER := NONE
+
+endef
+
+# JunitTest class
+
+define gb_JunitTest_JunitTest_platform
+$(call gb_JunitTest_get_target,$(1)) : DEFS := \
+	-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/LibreOffice.app/Contents/MacOS/soffice}" \
+	-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH \
+	-Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
+
+endef
+
+# SdiTarget class
+
+gb_SdiTarget_SVIDLPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+
+# SrsPartMergeTarget
+
+gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+
+# SrsPartTarget class
+
+gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
+gb_SrsPartTarget_RSCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
+
+define gb_SrsPartTarget__command_dep
+$(call gb_Helper_abbreviate_dirs,\
+	$(gb_GCCP) \
+		-MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \
+		$(INCLUDE) \
+		$(DEFS) \
+		-c -x c++-header $(2) \
+		-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
+endef
+
+
+# ComponentTarget
+
+gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_Library_COMPONENTPREFIXES := \
+	OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
+	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-ARM.mk b/solenv/gbuild/platform/linux-ARM.mk
new file mode 100644
index 000000000000..df39d54a3ddb
--- /dev/null
+++ b/solenv/gbuild/platform/linux-ARM.mk
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk or linux.mk
+gb_CPUDEFS += -DARM32
+gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_CXXFLAGS += -fno-omit-frame-pointer
+gb_CFLAGS += -fno-omit-frame-pointer
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-AXP.mk b/solenv/gbuild/platform/linux-AXP.mk
new file mode 100644
index 000000000000..ebf88fb7f71c
--- /dev/null
+++ b/solenv/gbuild/platform/linux-AXP.mk
@@ -0,0 +1,39 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk or linux.mk
+gb_CPUDEFS += -D$(CPUNAME)
+gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
+gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer
+gb_LinkTarget_LDFLAGS += -Wl,--no-relax
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-GODSON.mk b/solenv/gbuild/platform/linux-GODSON.mk
new file mode 100644
index 000000000000..0f17660b2122
--- /dev/null
+++ b/solenv/gbuild/platform/linux-GODSON.mk
@@ -0,0 +1,36 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk or linux.mk
+gb_CPUDEFS += -DMIPS
+gb_COMPILERDEFAULTOPTFLAGS := -Os
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-HPPA.mk b/solenv/gbuild/platform/linux-HPPA.mk
new file mode 100644
index 000000000000..ad5fba8ca592
--- /dev/null
+++ b/solenv/gbuild/platform/linux-HPPA.mk
@@ -0,0 +1,36 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk or linux.mk
+gb_CPUDEFS += -D$(CPUNAME)
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-IA64.mk b/solenv/gbuild/platform/linux-IA64.mk
new file mode 100644
index 000000000000..9eba1ffcf516
--- /dev/null
+++ b/solenv/gbuild/platform/linux-IA64.mk
@@ -0,0 +1,36 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk or linux.mk
+gb_CPUDEFS := -D$(CPUNAME)
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+
+include $(GBUILDDIR)/platform/linux.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-INTEL.mk b/solenv/gbuild/platform/linux-INTEL.mk
new file mode 100644
index 000000000000..0bf0267f084d
--- /dev/null
+++ b/solenv/gbuild/platform/linux-INTEL.mk
@@ -0,0 +1,36 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk or linux.mk
+gb_CPUDEFS := -DX86
+gb_COMPILERDEFAULTOPTFLAGS := -Os
+
+include $(GBUILDDIR)/platform/linux.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-M68K.mk b/solenv/gbuild/platform/linux-M68K.mk
new file mode 100644
index 000000000000..670a33183ea9
--- /dev/null
+++ b/solenv/gbuild/platform/linux-M68K.mk
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk or linux.mk
+gb_CPUDEFS += -D$(CPUNAME)
+gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
+gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-POWERPC.mk b/solenv/gbuild/platform/linux-POWERPC.mk
new file mode 100644
index 000000000000..ba730c9b265b
--- /dev/null
+++ b/solenv/gbuild/platform/linux-POWERPC.mk
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk or linux.mk
+gb_CPUDEFS += -DPOWERPC -DPPC
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+gb_CXXFLAGS += -fsigned-char
+gb_CFLAGS += -fsigned-char
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-POWERPC64.mk b/solenv/gbuild/platform/linux-POWERPC64.mk
new file mode 100644
index 000000000000..b58010f66404
--- /dev/null
+++ b/solenv/gbuild/platform/linux-POWERPC64.mk
@@ -0,0 +1,37 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk or linux.mk
+gb_CPUDEFS := -D$(CPUNAME)
+gb_CXXFLAGS += -mminimal-toc
+gb_CFLAGS += -fsigned-char
+
+include $(GBUILDDIR)/platform/linux-POWERPC.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-S390.mk b/solenv/gbuild/platform/linux-S390.mk
new file mode 100644
index 000000000000..983c94a9de69
--- /dev/null
+++ b/solenv/gbuild/platform/linux-S390.mk
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk or linux.mk
+gb_CPUDEFS += -D$(CPUNAME)
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
+gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer
+
+include $(GBUILDDIR)/platform/linux.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-S390X.mk b/solenv/gbuild/platform/linux-S390X.mk
new file mode 100644
index 000000000000..a27c2acf016d
--- /dev/null
+++ b/solenv/gbuild/platform/linux-S390X.mk
@@ -0,0 +1,35 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk or linux.mk
+gb_CPUDEFS := -D$(CPUNAME)
+
+include $(GBUILDDIR)/platform/linux-S390.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-SPARC.mk b/solenv/gbuild/platform/linux-SPARC.mk
new file mode 100644
index 000000000000..2472d5e84bf8
--- /dev/null
+++ b/solenv/gbuild/platform/linux-SPARC.mk
@@ -0,0 +1,36 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk or linux.mk
+gb_CPUDEFS := -D$(CPUNAME)
+gb_COMPILERDEFAULTOPTFLAGS := -Os
+
+include $(GBUILDDIR)/platform/linux.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-X86_64.mk b/solenv/gbuild/platform/linux-X86_64.mk
new file mode 100644
index 000000000000..9eba1ffcf516
--- /dev/null
+++ b/solenv/gbuild/platform/linux-X86_64.mk
@@ -0,0 +1,36 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk or linux.mk
+gb_CPUDEFS := -D$(CPUNAME)
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+
+include $(GBUILDDIR)/platform/linux.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 47d173054328..4ef02d54b2f7 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -25,398 +25,9 @@
 #
 #*************************************************************************
 
-GUI := UNX
-COM := GCC
-
-gb_MKTEMP := mktemp -t gbuild.XXXXXX
-
-gb_CC := gcc
-gb_CXX := g++
-gb_GCCP := gcc
-gb_AR := ar
-gb_AWK := awk
-gb_CLASSPATHSEP := :
-
-# normalize setsolar and configure env.
-ifeq ($(CPU),X)
-CPUNAME := X86_64
-endif
-
-# use CC/CXX if they are nondefaults
-ifneq ($(origin CC),default)
-gb_CC := $(CC)
-gb_GCCP := $(CC)
-endif
-ifneq ($(origin CXX),default)
-gb_CXX := $(CXX)
-endif
-
-gb_OSDEFS := \
-    -D$(OS) \
-    -D_PTHREADS \
-    -DUNIX \
-    -DUNX \
-    $(PTHREAD_CFLAGS) \
-
-ifeq ($(GXX_INCLUDE_PATH),)
-GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
-endif
-
-gb_COMPILERDEFS := \
-    -D$(COM) \
-    -DHAVE_GCC_VISIBILITY_FEATURE \
-    -DCPPU_ENV=gcc3 \
-    -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
-
-ifeq ($(CPUNAME),X86_64)
-gb_CPUDEFS := -D$(CPUNAME)
-else
-gb_CPUDEFS := -DX86
-endif
-
-gb_CFLAGS := \
-    -Wall \
-    -Wendif-labels \
-    -Wextra \
-    -Wshadow \
-    -fPIC \
-    -fmessage-length=0 \
-    -fno-common \
-    -fno-strict-aliasing \
-    -fvisibility=hidden \
-    -pipe \
-
-gb_CXXFLAGS := \
-    -Wall \
-    -Wendif-labels \
-    -Wextra \
-    -Wno-ctor-dtor-privacy \
-    -Wno-non-virtual-dtor \
-    -Wshadow \
-    -fPIC \
-    -fmessage-length=0 \
-    -fno-common \
-    -fno-strict-aliasing \
-    -fno-use-cxa-atexit \
-    -fvisibility-inlines-hidden \
-    -fvisibility=hidden \
-    -pipe \
-
-ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -Werror
-gb_CXXFLAGS_WERROR := -Werror
-endif
-
-ifneq ($(strip $(SYSBASE)),)
-gb_CXXFLAGS += --sysroot=$(SYSBASE)
-gb_CFLAGS += --sysroot=$(SYSBASE)
-endif
-gb_LinkTarget_EXCEPTIONFLAGS := \
-    -DEXCEPTIONS_ON \
-    -fexceptions \
-    -fno-enforce-eh-specs \
-
-gb_LinkTarget_NOEXCEPTIONFLAGS := \
-    -DEXCEPTIONS_OFF \
-    -fno-exceptions \
-
-gb_LinkTarget_LDFLAGS := \
-    -Wl,--sysroot=$(SYSBASE) \
-    -Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
-    -Wl,-z,combreloc \
-    -Wl,-z,defs \
-    $(subst -L../lib , ,$(SOLARLIB)) \
-
-ifeq ($(HAVE_LD_HASH_STYLE),TRUE)
-gb_LinkTarget_LDFLAGS += \
-    -Wl,--hash-style=both \
-
-endif
-
-ifneq ($(HAVE_LD_BSYMBOLIC_FUNCTIONS),)
 gb_LinkTarget_LDFLAGS += \
-    -Wl,--dynamic-list-cpp-new \
-    -Wl,--dynamic-list-cpp-typeinfo \
-    -Wl,-Bsymbolic-functions \
-
-endif
-
-ifeq ($(gb_DEBUGLEVEL),0)
-gb_LinkTarget_LDFLAGS += -Wl,-O1
-endif
-
-gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
-
-ifeq ($(gb_DEBUGLEVEL),2)
-gb_COMPILEROPTFLAGS := -O0
-else
-gb_COMPILEROPTFLAGS := -Os
-endif
-
-gb_COMPILERNOOPTFLAGS := -O0
-
-# Helper class
-
-gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
-
-# convert parametters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(1)
-endef
-
-# CObject class
-
-# $(call gb_CObject__command,object,relative-source,source,dep-file)
-define gb_CObject__command
-$(call gb_Output_announce,$(2),$(true),C  ,3)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) $(dir $(4)) && \
-    $(gb_CC) \
-		$(DEFS) \
-		$(T_CFLAGS) \
-        -c $(3) \
-        -o $(1) \
-		-MMD -MT $(1) \
-		-MF $(4) \
-        -I$(dir $(3)) \
-        $(INCLUDE))
-endef
-
-
-# CxxObject class
-
-# $(call gb_CxxObject__command,object,relative-source,source,dep-file)
-define gb_CxxObject__command
-$(call gb_Output_announce,$(2),$(true),CXX,3)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) $(dir $(4)) && \
-    $(gb_CXX) \
-		$(DEFS) \
-		$(T_CXXFLAGS) \
-        -c $(3) \
-        -o $(1) \
-		-MMD -MT $(1) \
-		-MF $(4) \
-        -I$(dir $(3)) \
-        $(INCLUDE_STL) $(INCLUDE))
-endef
-
-
-# LinkTarget class
-
-define gb_LinkTarget__get_rpath_for_layer
-$(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS)))
-endef
-
-gb_LinkTarget__RPATHS := \
-    URELIB:\dORIGIN \
-    UREBIN:\dORIGIN/../lib:\dORIGIN \
-    OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
-    BRAND:\dORIGIN:\dORIGIN/../basis-link/program:\dORIGIN/../basis-link/ure-link/lib \
-    SDKBIN:\dORIGIN/../../ure-link/lib \
-    NONEBIN:\dORIGIN/../lib:\dORIGIN \
-
-gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
-gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
-
-
-gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
-gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
-
-define gb_LinkTarget__command_dynamiclink
-$(call gb_Helper_abbreviate_dirs,\
-    mkdir -p $(dir $(1)) && \
-    $(gb_CXX) \
-        $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-		$(subst \d,$$,$(RPATH)) \
-		$(T_LDFLAGS) \
-        $(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
-        $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-        $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-        $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-        -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
-		$(LIBS) \
-        -o $(1))
-endef
-
-define gb_LinkTarget__command_staticlink
-$(call gb_Helper_abbreviate_dirs,\
-    mkdir -p $(dir $(1)) && \
-    $(gb_AR) -rsu $(1) \
-        $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-        $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-        $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-        2> /dev/null)
-endef
-
-define gb_LinkTarget__command
-$(call gb_Output_announce,$(2),$(true),LNK,4)
-$(if $(filter Library CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1)))
-$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
-endef
-
-
-# Library class
-
-gb_Library_DEFS :=
-gb_Library_TARGETTYPEFLAGS := -shared -Wl,-z,noexecstack
-gb_Library_SYSPRE := lib
-gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
-gb_Library_PLAINEXT := .so
-gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_STLEXT := port_gcc$(gb_Library_PLAINEXT)
-else
-gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_PLAINEXT)
-endif
-
-ifeq ($(CPUNAME),X86_64)
-gb_Library_OOOEXT := lx$(gb_Library_PLAINEXT)
-gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-else
-gb_Library_OOOEXT := li$(gb_Library_PLAINEXT)
-gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-endif
-
-gb_Library_PLAINLIBS_NONE += \
-    dl \
-	fontconfig \
-    freetype \
-    m \
-    pthread \
-    ICE \
-    SM \
-    X11 \
-    Xext \
-	Xrender \
-
-gb_Library_FILENAMES := \
-    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-    $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
-    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
-    $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_STLEXT)) \
-    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
-
-
-gb_Library_LAYER := \
-    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
-    $(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \
-    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
-    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
-
-define gb_Library_get_rpath
-'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))' \
-'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
-endef
-
-define gb_Library_Library_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Library_get_rpath,$(1))
-
-endef
-
-
-# StaticLibrary class
-
-gb_StaticLibrary_DEFS :=
-gb_StaticLibrary_SYSPRE := lib
-gb_StaticLibrary_PLAINEXT := .a
-gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
-
-gb_StaticLibrary_FILENAMES := \
-    $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
-    $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
-
-gb_StaticLibrary_StaticLibrary_platform =
-
-
-# Executable class
-
-gb_Executable_EXT :=
-
-gb_Executable_LAYER := \
-    $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
-    $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
-    $(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
-    $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
-    $(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
-
-
-define gb_Executable_get_rpath
-'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))' \
--Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
-endef
-
-define gb_Executable_Executable_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Executable_get_rpath,$(1))
-
-endef
-
-
-# CppunitTest class
-
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-gb_CppunitTest_SYSPRE := libtest_
-gb_CppunitTest_EXT := .so
-gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
-gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
-
-define gb_CppunitTest_CppunitTest_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH :=
-
-endef
-
-# JunitTest class
-
-define gb_JunitTest_JunitTest_platform
-$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-    -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/openoffice.org3/program/soffice}" \
-    -Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
-    -Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
-
-endef
-
-# SdiTarget class
-
-gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-
-# SrsPartMergeTarget
-
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-
-# SrsPartTarget class
-
-gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
-gb_SrsPartTarget_RSCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
-
-define gb_SrsPartTarget__command_dep
-$(call gb_Helper_abbreviate_dirs,\
-    $(gb_GCCP) \
-        -MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \
-        $(INCLUDE) \
-        $(DEFS) \
-        -c -x c++-header $(2) \
-        -o $(call gb_SrsPartTarget_get_dep_target,$(1)))
-endef
-
-
-# ComponentTarget
+        -Wl,-z,defs \
 
-gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-gb_Library_COMPONENTPREFIXES := \
-    OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
-    URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-    NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+include $(GBUILDDIR)/platform/unxgcc.mk
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 6d9f38061e31..5f11ede7136c 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -48,20 +48,20 @@ gb_CXX := $(CXX)
 endif
 
 gb_OSDEFS := \
-    -D$(OS) \
-    -D_PTHREADS \
-    -DUNIX \
-    -DUNX \
-    -D_REENTRANT \
-    -DNO_PTHREAD_PRIORITY \
-    -DQUARTZ \
-    $(EXTRA_CDEFS) \
+	-D$(OS) \
+	-D_PTHREADS \
+	-DUNIX \
+	-DUNX \
+	-D_REENTRANT \
+	-DNO_PTHREAD_PRIORITY \
+	-DQUARTZ \
+	$(EXTRA_CDEFS) \
 
 gb_COMPILERDEFS := \
-    -D$(COM) \
-    -DHAVE_GCC_VISIBILITY_FEATURE \
-    -DCPPU_ENV=gcc3 \
-    -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
+	-D$(COM) \
+	-DHAVE_GCC_VISIBILITY_FEATURE \
+	-DCPPU_ENV=gcc3 \
+	-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
 
 ifeq ($(CPUNAME),POWERPC)
 gb_CPUDEFS := -DPOWERPC -DPPC
@@ -77,62 +77,64 @@ endif
 
 
 gb_CFLAGS := \
-    -isysroot $(gb_SDKDIR) \
-    -Wall \
-    -Wendif-labels \
-    -Wextra \
-    -Wshadow \
-    -fPIC \
-    -fmessage-length=0 \
-    -fno-common \
-    -fno-strict-aliasing \
-    -pipe \
+	-isysroot $(gb_SDKDIR) \
+	-Wall \
+	-Wendif-labels \
+	-Wextra \
+	-Wshadow \
+	-fPIC \
+	-fmessage-length=0 \
+	-fno-common \
+	-fno-strict-aliasing \
+	-pipe \
 
 gb_CXXFLAGS := \
-    -isysroot $(gb_SDKDIR) \
-    -Wall \
-    -Wendif-labels \
-    -Wextra \
-    -Wno-ctor-dtor-privacy \
-    -Wno-long-double \
-    -Wno-non-virtual-dtor \
-    -fPIC \
-    -fmessage-length=0 \
-    -fno-common \
-    -fno-strict-aliasing \
-    -fsigned-char \
-    -malign-natural \
-    -pipe \
-    #-Wshadow \ break in compiler headers already
-    #-fsigned-char \ might be removed?
-    #-malign-natural \ might be removed?
+	-isysroot $(gb_SDKDIR) \
+	-Wall \
+	-Wendif-labels \
+	-Wextra \
+	-Wno-ctor-dtor-privacy \
+	-Wno-long-double \
+	-Wno-non-virtual-dtor \
+	-fPIC \
+	-fmessage-length=0 \
+	-fno-common \
+	-fno-strict-aliasing \
+	-fsigned-char \
+	-malign-natural \
+	-pipe \
+	#-Wshadow \ break in compiler headers already
+	#-fsigned-char \ might be removed?
+	#-malign-natural \ might be removed?
 
 # these are to get g++ to switch to Objective-C++ mode
 # (see toolkit module for a case where it is necessary to do it this way)
 gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
 
+gb_OBJCFLAGS := -x objective-c
+
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
 gb_CFLAGS_WERROR := -Werror
 gb_CXXFLAGS_WERROR := -Werror
 endif
 
 gb_LinkTarget_EXCEPTIONFLAGS := \
-    -DEXCEPTIONS_ON \
-    -fexceptions \
-    -fno-enforce-eh-specs \
+	-DEXCEPTIONS_ON \
+	-fexceptions \
+	-fno-enforce-eh-specs \
 
 gb_LinkTarget_NOEXCEPTIONFLAGS := \
-    -DEXCEPTIONS_OFF \
-    -fno-exceptions \
+	-DEXCEPTIONS_OFF \
+	-fno-exceptions \
 
 gb_LinkTarget_LDFLAGS := \
-    -Wl,-syslibroot,$(gb_SDKDIR) \
-    $(subst -L../lib , ,$(SOLARLIB)) \
+	-Wl,-syslibroot,$(gb_SDKDIR) \
+	$(subst -L../lib , ,$(SOLARLIB)) \
 #man ld says: obsolete	-Wl,-multiply_defined,suppress \
 
 gb_DEBUG_CFLAGS := -g
+ifneq ($(gb_DEBUGLEVEL),0)
 
-ifeq ($(gb_DEBUGLEVEL),2)
 gb_COMPILEROPTFLAGS := -O0
 else
 gb_COMPILEROPTFLAGS := -O2
@@ -144,6 +146,8 @@ gb_COMPILERNOOPTFLAGS := -O0
 
 gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
 
+gb_Helper_set_ld_path := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+
 # convert parametters filesystem root to native notation
 # does some real work only on windows, make sure not to
 # break the dummy implementations on unx*
@@ -158,15 +162,15 @@ define gb_CObject__command
 $(call gb_Output_announce,$(2),$(true),C  ,3)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) $(dir $(4)) && \
-    $(gb_CC) \
+	$(gb_CC) \
 		$(DEFS) \
 		$(T_CFLAGS) \
-        -c $(3) \
-        -o $(1) \
+		-c $(3) \
+		-o $(1) \
 		-MMD -MT $(1) \
 		-MF $(4) \
-        -I$(dir $(3)) \
-        $(INCLUDE))
+		-I$(dir $(3)) \
+		$(INCLUDE))
 endef
 
 
@@ -177,15 +181,15 @@ define gb_CxxObject__command
 $(call gb_Output_announce,$(2),$(true),CXX,3)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) $(dir $(4)) && \
-    $(gb_CXX) \
+	$(gb_CXX) \
 		$(DEFS) \
 		$(T_CXXFLAGS) \
-        -c $(3) \
-        -o $(1) \
+		-c $(3) \
+		-o $(1) \
 		-MMD -MT $(1) \
 		-MF $(4) \
-        -I$(dir $(3)) \
-        $(INCLUDE_STL) $(INCLUDE))
+		-I$(dir $(3)) \
+		$(INCLUDE_STL) $(INCLUDE))
 endef
 
 
@@ -195,15 +199,32 @@ define gb_ObjCxxObject__command
 $(call gb_Output_announce,$(2),$(true),OCX,3)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) $(dir $(4)) && \
-    $(gb_CXX) \
+	$(gb_CXX) \
 		$(DEFS) \
 		$(T_OBJCXXFLAGS) \
-        -c $(3) \
-        -o $(1) \
+		-c $(3) \
+		-o $(1) \
 		-MMD -MT $(1) \
 		-MF $(4) \
-        -I$(dir $(3)) \
-        $(INCLUDE_STL) $(INCLUDE))
+		-I$(dir $(3)) \
+		$(INCLUDE_STL) $(INCLUDE))
+endef
+
+# ObjCObject class
+
+define gb_ObjCObject__command
+$(call gb_Output_announce,$(2),$(true),OCC,3)
+$(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $(1)) && \
+	mkdir -p $(dir $(call gb_ObjCObject_get_dep_target,$(2))) && \
+	$(gb_CC) \
+		$(DEFS) $(OBJCFLAGS) \
+		-c $(3) \
+		-o $(1) \
+		-MMD -MT $(call gb_ObjCObject_get_target,$(2)) \
+		-MF $(call gb_ObjCObject_get_dep_target,$(2)) \
+		-I$(dir $(3)) \
+		$(INCLUDE_STL) $(INCLUDE))
 endef
 
 
@@ -214,12 +235,12 @@ $(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS)))
 endef
 
 gb_LinkTarget__RPATHS := \
-    URELIB:@__________________________________________________URELIB/ \
-    UREBIN: \
-    OOO:@__________________________________________________OOO/ \
-    BRAND: \
-    SDKBIN: \
-    NONEBIN: \
+	URELIB:@__________________________________________________URELIB/ \
+	UREBIN: \
+	OOO:@__________________________________________________OOO/ \
+	BRAND: \
+	SDKBIN: \
+	NONEBIN: \
 
 define gb_LinkTarget__get_installname
 $(if $(2),-install_name '$(2)$(1)',)
@@ -228,6 +249,8 @@ endef
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
 gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
 gb_LinkTarget_OBJCXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) $(gb_OBJCXXFLAGS)
+gb_LinkTarget_OBJCFLAGS := $(gb_CFLAGS) $(gb_OBJCFLAGS) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_OBJCFLAGS += -g
 
 gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
 gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
@@ -240,52 +263,56 @@ endef
 
 define gb_LinkTarget__get_layer
 $(if $(filter Executable,$(1)),\
-    $$(call gb_Executable_get_layer,$(2)),\
-    $$(call gb_Library_get_layer,$(2)))
+	$$(call gb_Executable_get_layer,$(2)),\
+	$$(call gb_Library_get_layer,$(2)))
 endef
 
 # FIXME the DYLIB_FILE mess is only necessary because
 # solver layout is different from installation layout
 define gb_LinkTarget__command_dynamiclink
 $(call gb_Helper_abbreviate_dirs,\
-    mkdir -p $(dir $(1)) && \
-    DYLIB_FILE=`$(gb_MKTEMP)` && \
-    $(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
-        $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+	mkdir -p $(dir $(1)) && \
+	DYLIB_FILE=`$(gb_MKTEMP)` && \
+	$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+		$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
+		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
 		$(subst \d,$$,$(RPATH)) \
 		$(T_LDFLAGS) \
-        $(patsubst lib%.dylib,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) > $${DYLIB_FILE} && \
-    $(gb_CXX) \
-        $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
-        $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+		$(patsubst lib%.dylib,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) > $${DYLIB_FILE} && \
+	$(gb_CXX) \
+		$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
+		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
 		$(subst \d,$$,$(RPATH)) \
 		$(T_LDFLAGS) \
-        $(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
-        $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-        $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-        $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
-        $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-        $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
+		$(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+		$(foreach object,$(OBJCOBJECTS),$(call gb_ObjCObject_get_target,$(object))) \
+		$(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
+		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
+		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
+		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
 		$(LIBS) \
-        -o $(1) \
-        `cat $${DYLIB_FILE}` && \
-    $(if $(filter Library CppunitTest,$(TARGETTYPE)),\
-        $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) && \
-        ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \
-    rm -f $${DYLIB_FILE})
+		-o $(1) \
+		`cat $${DYLIB_FILE}` && \
+	$(if $(filter Library CppunitTest,$(TARGETTYPE)),\
+		$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) && \
+		ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \
+	rm -f $${DYLIB_FILE})
 endef
 
 # parameters: 1-linktarget 2-cobjects 3-cxxobjects
 define gb_LinkTarget__command_staticlink
 $(call gb_Helper_abbreviate_dirs,\
-    mkdir -p $(dir $(1)) && \
-    $(gb_AR) -rsu $(1) \
-        $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-        $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-        $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
-        $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-        2> /dev/null)
+	mkdir -p $(dir $(1)) && \
+	$(gb_AR) -rsu $(1) \
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+		$(foreach object,$(OBJCOBJECTS),$(call gb_ObjCObject_get_target,$(object))) \
+		$(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
+		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
+		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
+		2> /dev/null)
 endef
 
 define gb_LinkTarget__command
@@ -303,52 +330,44 @@ gb_Library_SYSPRE := lib
 gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
 gb_Library_PLAINEXT := .dylib
 gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_STLEXT := port_gcc$(gb_Library_PLAINEXT)
-else
-gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_PLAINEXT)
-endif
 
-ifeq ($(CPUNAME),INTEL)
-gb_Library_OOOEXT := mxi$(gb_Library_PLAINEXT)
+gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
 gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-else # ifeq ($(CPUNAME),POWERPC)
-gb_Library_OOOEXT := mxp$(gb_Library_PLAINEXT)
-gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-endif
 
 gb_Library__FRAMEWORKS := \
-    Cocoa \
+	Cocoa \
+	GLUT \
+	OpenGL \
 
 gb_Library_PLAINLIBS_NONE += \
-    Cocoa \
-    objc \
-    m \
-    pthread \
+	GLUT \
+	Cocoa \
+	objc \
+	OpenGL \
+	m \
+	pthread \
 
 gb_Library_FILENAMES := \
-    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-    $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
-    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
-    $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_STLEXT)) \
-    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
 
 
 gb_Library_LAYER := \
-    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
-    $(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \
-    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
-    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
+	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
+	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
+	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
 
 define gb_Library_get_rpath
 $(call gb_LinkTarget__get_installname,$(call gb_Library_get_filename,$(1)),$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1))))
@@ -369,8 +388,8 @@ gb_StaticLibrary_PLAINEXT := .a
 gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
 
 gb_StaticLibrary_FILENAMES := \
-    $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
-    $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
+	$(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
+	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
 
 gb_StaticLibrary_StaticLibrary_platform =
 
@@ -381,11 +400,11 @@ gb_Executable_EXT :=
 gb_Executable_TARGETTYPEFLAGS := -bind_at_load
 
 gb_Executable_LAYER := \
-    $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
-    $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
-    $(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
-    $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
-    $(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
+	$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
+	$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
+	$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
+	$(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
+	$(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
 
 
 define gb_Executable_get_rpath
@@ -417,9 +436,9 @@ endef
 
 define gb_JunitTest_JunitTest_platform
 $(call gb_JunitTest_get_target,$(1)) : DEFS := \
-    -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/OpenOffice.org.app/Contents/MacOS/soffice}" \
-    -Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH \
-    -Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
+	-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/LibreOffice.app/Contents/MacOS/soffice}" \
+	-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH \
+	-Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
 
 endef
 
@@ -438,12 +457,12 @@ gb_SrsPartTarget_RSCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUT
 
 define gb_SrsPartTarget__command_dep
 $(call gb_Helper_abbreviate_dirs,\
-    $(gb_GCCP) \
-        -MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \
-        $(INCLUDE) \
-        $(DEFS) \
-        -c -x c++-header $(2) \
-        -o $(call gb_SrsPartTarget_get_dep_target,$(1)))
+	$(gb_GCCP) \
+		-MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \
+		$(INCLUDE) \
+		$(DEFS) \
+		-c -x c++-header $(2) \
+		-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
 endef
 
 
@@ -451,8 +470,8 @@ endef
 
 gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
 gb_Library_COMPONENTPREFIXES := \
-    OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
-    URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+	OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
+	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
     NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/netbsd.mk b/solenv/gbuild/platform/netbsd.mk
new file mode 100644
index 000000000000..5644f0cf7941
--- /dev/null
+++ b/solenv/gbuild/platform/netbsd.mk
@@ -0,0 +1,44 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk
+
+ifeq ($(CPUNAME),INTEL)
+gb_CPUDEFS := -DX86
+else
+gb_CPUDEFS := -D$(CPUNAME)
+endif
+
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:/usr/pkg/lib:/usr/X11R7/lib
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/openbsd.mk b/solenv/gbuild/platform/openbsd.mk
new file mode 100644
index 000000000000..187c207ac962
--- /dev/null
+++ b/solenv/gbuild/platform/openbsd.mk
@@ -0,0 +1,60 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk
+
+ifeq ($(CPUNAME),INTEL)
+gb_CPUDEFS := -DX86
+else
+gb_CPUDEFS := -D$(CPUNAME)
+endif
+
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+gb_STDLIBS := pthread
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS
+
+define gb_LinkTarget__command_dynamiclink
+$(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $(1)) && \
+	$(gb_CXX) \
+		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+		$(subst \d,$$,$(RPATH)) $(LDFLAGS) \
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
+		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
+		-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
+		$(subst -lpthread,$(PTHREAD_LIBS),$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \
+		-o $(1))
+endef
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 32ee2328ac91..e0547b8de4ec 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -47,19 +47,19 @@ gb_CXX := $(CXX)
 endif
 
 gb_OSDEFS := \
-    -D$(OS) \
-    -D$(GUI) \
-    -DSYSV \
-    -DSUN \
-    -DSUN4 \
-    -D_REENTRANT \
-    -D_POSIX_PTHREAD_SEMANTICS \
-    -D_PTHREADS \
-    -DUNIX \
+	-D$(OS) \
+	-D$(GUI) \
+	-DSYSV \
+	-DSUN \
+	-DSUN4 \
+	-D_REENTRANT \
+	-D_POSIX_PTHREAD_SEMANTICS \
+	-D_PTHREADS \
+	-DUNIX \
 
 gb_COMPILERDEFS := \
-    -D$(COM) \
-    -DCPPU_ENV=sunpro5 \
+	-D$(COM) \
+	-DCPPU_ENV=sunpro5 \
 
 gb_CPUDEFS := -D$(CPUNAME)
 ifeq ($(CPUNAME),SPARC)
@@ -67,22 +67,22 @@ gb_CPUDEFS += -D__sparcv8plus
 endif
 
 gb_CFLAGS := \
-    -temp=/tmp \
-    -KPIC \
-    -mt \
-    -xldscope=hidden \
-    -xCC \
-    -xc99=none \
+	-temp=/tmp \
+	-KPIC \
+	-mt \
+	-xldscope=hidden \
+	-xCC \
+	-xc99=none \
 
 gb_CXXFLAGS := \
-    -temp=/tmp \
-    -KPIC \
-    -mt \
-    -xldscope=hidden \
-    -features=no%altspell \
-    -library=no%Cstd \
-    +w2 \
-    -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,anonnotype \
+	-temp=/tmp \
+	-KPIC \
+	-mt \
+	-xldscope=hidden \
+	-features=no%altspell \
+	-library=no%Cstd \
+	+w2 \
+	-erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,anonnotype \
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
 gb_CFLAGS_WERROR := -errwarn=%all
@@ -90,37 +90,36 @@ gb_CXXFLAGS_WERROR := -xwe
 endif
 
 gb_LinkTarget_EXCEPTIONFLAGS := \
-    -DEXCEPTIONS_ON \
+	-DEXCEPTIONS_ON \
 
 gb_LinkTarget_NOEXCEPTIONFLAGS := \
-    -DEXCEPTIONS_OFF \
-    -noex \
+	-DEXCEPTIONS_OFF \
+	-noex \
 
 gb_LinkTarget_LDFLAGS := \
-    $(subst -L../lib , ,$(SOLARLIB)) \
-    -temp=/tmp \
-    -w \
-    -mt \
-    -Bdirect \
-    -z defs \
-    -z combreloc \
-    -norunpath \
-    -PIC \
-    -library=no%Cstd \
+	$(subst -L../lib , ,$(SOLARLIB)) \
+	-temp=/tmp \
+	-w \
+	-mt \
+	-Bdirect \
+	-z defs \
+	-z combreloc \
+	-norunpath \
+	-PIC \
+	-library=no%Cstd \
 
 
 gb_DEBUG_CFLAGS := -g
-
-ifeq ($(gb_DEBUGLEVEL),2)
+ifneq ($(gb_DEBUGLEVEL),0)
 gb_COMPILEROPTFLAGS :=
 else
 ifeq ($(CPUNAME),INTEL)
 gb_COMPILEROPTFLAGS := -xarch=generic -xO3
 else # ifeq ($(CPUNAME),SPARC)
-#  -m32 -xarch=sparc        restrict target to 32 bit sparc
-#  -xO3                     optimization level 3
-#  -xspace                  don't do optimizations which do increase binary size
-#  -xprefetch=yes           do prefetching (helps on UltraSparc III)
+#  -m32 -xarch=sparc		restrict target to 32 bit sparc
+#  -xO3					 optimization level 3
+#  -xspace				  don't do optimizations which do increase binary size
+#  -xprefetch=yes		   do prefetching (helps on UltraSparc III)
 gb_COMPILEROPTFLAGS := -m32 -xarch=sparc -xO3 -xspace -xprefetch=yes
 endif
 endif
@@ -146,15 +145,15 @@ $(call gb_Output_announce,$(2),$(true),C  ,3)
 $(call gb_Helper_abbreviate_dirs,\
 	rm -f $(4) && \
 	mkdir -p $(dir $(1)) $(dir $(4)) && \
-    $(gb_CC) \
-        -c $(3) \
-        -o $(1) \
-        -xMMD \
+	$(gb_CC) \
+		-c $(3) \
+		-o $(1) \
+		-xMMD \
 		-xMF $(4) \
 		$(DEFS) \
 		$(T_CFLAGS) \
-        -I$(dir $(3)) \
-        $(INCLUDE))
+		-I$(dir $(3)) \
+		$(INCLUDE))
 endef
 
 
@@ -164,15 +163,15 @@ define gb_CxxObject__command
 $(call gb_Output_announce,$(2),$(true),CXX,3)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) $(dir $(4)) && \
-    $(gb_CXX) \
+	$(gb_CXX) \
 		$(DEFS) \
 		$(T_CXXFLAGS) \
-        -c $(3) \
-        -o $(1) \
-        -xMMD \
+		-c $(3) \
+		-o $(1) \
+		-xMMD \
 		-xMF $(4) \
-        -I$(dir $(3)) \
-        $(INCLUDE_STL) $(INCLUDE))
+		-I$(dir $(3)) \
+		$(INCLUDE_STL) $(INCLUDE))
 endef
 
 
@@ -183,12 +182,12 @@ $(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS)))
 endef
 
 gb_LinkTarget__RPATHS := \
-    URELIB:\dORIGIN \
-    UREBIN:\dORIGIN/../lib:\dORIGIN \
-    OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
-    BRAND:\dORIGIN:\dORIGIN/../basis-link/program:\dORIGIN/../basis-link/ure-link/lib \
-    SDKBIN:\dORIGIN/../../ure-link/lib \
-    NONEBIN:\dORIGIN/../lib:\dORIGIN \
+	URELIB:\dORIGIN \
+	UREBIN:\dORIGIN/../lib:\dORIGIN \
+	OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
+	BRAND:\dORIGIN:\dORIGIN/../basis-link/program:\dORIGIN/../basis-link/ure-link/lib \
+	SDKBIN:\dORIGIN/../../ure-link/lib \
+	NONEBIN:\dORIGIN/../lib:\dORIGIN \
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
 gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
@@ -199,28 +198,29 @@ gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
 
 define gb_LinkTarget__command_dynamiclink
 $(call gb_Helper_abbreviate_dirs,\
-    mkdir -p $(dir $(1)) && \
-    $(gb_CXX) \
-        $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+	mkdir -p $(dir $(1)) && \
+	$(gb_CXX) \
+		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
 		$(subst \d,$$,$(RPATH)) \
 		$(T_LDFLAGS) \
-        $(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
-        $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-        $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-        $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-        $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
+		$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
+		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
+		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
 		$(LIBS) \
-        -o $(1))
+		-o $(1))
 endef
 
 define gb_LinkTarget__command_staticlink
 $(call gb_Helper_abbreviate_dirs,\
-    mkdir -p $(dir $(1)) && \
-    $(gb_AR) -rsu $(1) \
-        $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-        $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-        $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-        2> /dev/null)
+	mkdir -p $(dir $(1)) && \
+	$(gb_AR) -rsu $(1) \
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
+		2> /dev/null)
 endef
 
 define gb_LinkTarget__command
@@ -237,62 +237,52 @@ gb_Library_SYSPRE := lib
 gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
 gb_Library_PLAINEXT := .so
 gb_Library_RTEXT := C52$(gb_Library_PLAINEXT)
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_STLEXT := port_sunpro$(gb_Library_PLAINEXT)
-else
-gb_Library_STLEXT := port_sunpro_debug$(gb_Library_PLAINEXT)
-endif
 
-ifeq ($(CPUNAME),INTEL)
-gb_Library_OOOEXT := si$(gb_Library_PLAINEXT)
+gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
 gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-else # ifeq ($(CPUNAME),SPARC)
-gb_Library_OOOEXT := ss$(gb_Library_PLAINEXT)
-gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-endif
 
 gb_STDLIBS := \
-    Crun \
-    m \
-    c \
+	Crun \
+	m \
+	c \
 
 gb_Library_PLAINLIBS_NONE += \
-    $(gb_STDLIBS) \
-    dl \
-    freetype \
+	$(gb_STDLIBS) \
+	dl \
+	freetype \
+	GL \
+	GLU \
 	jpeg \
 	m \
 	nsl \
-    pthread \
+	pthread \
 	socket \
-    X11 \
-    Xext \
-    SM \
-    ICE \
+	X11 \
+	Xext \
+	SM \
+	ICE \
 
 gb_Library_FILENAMES := \
-    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-    $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
-    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
-    $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_STLEXT)) \
-    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
 
 
 gb_Library_LAYER := \
-    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
-    $(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \
-    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
-    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
+	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
+	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
+	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
 
 define gb_Library_get_rpath
 '-R$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))'
@@ -312,8 +302,8 @@ gb_StaticLibrary_PLAINEXT := .a
 gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
 
 gb_StaticLibrary_FILENAMES := \
-    $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
-    $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
+	$(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
+	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
 
 gb_StaticLibrary_StaticLibrary_platform =
 
@@ -323,11 +313,11 @@ gb_StaticLibrary_StaticLibrary_platform =
 gb_Executable_EXT :=
 
 gb_Executable_LAYER := \
-    $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
-    $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
-    $(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
-    $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
-    $(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
+	$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
+	$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
+	$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
+	$(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
+	$(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
 
 
 define gb_Executable_get_rpath
@@ -357,9 +347,9 @@ endef
 
 define gb_JunitTest_JunitTest_platform
 $(call gb_JunitTest_get_target,$(1)) : DEFS := \
-    -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/openoffice.org3/program/soffice}" \
-    -Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
-    -Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
+	-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/program/soffice}" \
+	-Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
+	-Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
 
 endef
 
@@ -380,18 +370,18 @@ gb_SrsPartTarget_RSCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDI
 # do not have the right suffix, so use makedepend here...
 define gb_SrsPartTarget__command_dep
 $(call gb_Helper_abbreviate_dirs_native,\
-    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
-        $(INCLUDE) \
-        $(DEFS) \
-        $(2) \
-        -f - \
-    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-        -v OBJECTFILE=$(call gb_SrsPartTarget_get_target,$(1)) \
-        -v OUTDIR=$(OUTDIR)/ \
-        -v WORKDIR=$(WORKDIR)/ \
-        -v SRCDIR=$(SRCDIR)/ \
-        -v REPODIR=$(REPODIR)/ \
-    > $(call gb_SrsPartTarget_get_dep_target,$(1)))
+	$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+		$(INCLUDE) \
+		$(DEFS) \
+		$(2) \
+		-f - \
+	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+		-v OBJECTFILE=$(call gb_SrsPartTarget_get_target,$(1)) \
+		-v OUTDIR=$(OUTDIR)/ \
+		-v WORKDIR=$(WORKDIR)/ \
+		-v SRCDIR=$(SRCDIR)/ \
+		-v REPODIR=$(REPODIR)/ \
+	> $(call gb_SrsPartTarget_get_dep_target,$(1)))
 endef
 
 
@@ -399,8 +389,8 @@ endef
 
 gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
 gb_Library_COMPONENTPREFIXES := \
-    OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
-    URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+	OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
+	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
     NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
new file mode 100644
index 000000000000..59c3a4eb091d
--- /dev/null
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -0,0 +1,441 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+GUI := UNX
+COM := GCC
+
+gb_MKTEMP := mktemp -t gbuild.XXXXXX
+
+gb_CC := gcc
+gb_CXX := g++
+gb_GCCP := gcc
+gb_AR := ar
+gb_AWK := awk
+gb_CLASSPATHSEP := :
+
+# use CC/CXX if they are nondefaults
+ifneq ($(origin CC),default)
+gb_CC := $(CC)
+gb_GCCP := $(CC)
+endif
+ifneq ($(origin CXX),default)
+gb_CXX := $(CXX)
+endif
+
+gb_OSDEFS := \
+	-D$(OS) \
+	-D_PTHREADS \
+	-DUNIX \
+	-DUNX \
+	$(PTHREAD_CFLAGS) \
+
+ifeq ($(GXX_INCLUDE_PATH),)
+GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
+endif
+
+gb_COMPILERDEFS := \
+	-D$(COM) \
+	-DCPPU_ENV=gcc3 \
+	-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
+
+gb_CFLAGS := \
+	-Wall \
+	-Wendif-labels \
+	-Wextra \
+	-Wshadow \
+	-fPIC \
+	-fmessage-length=0 \
+	-fno-common \
+	-pipe \
+
+gb_CXXFLAGS := \
+	-Wall \
+	-Wendif-labels \
+	-Wextra \
+	-Wno-ctor-dtor-privacy \
+	-Wno-non-virtual-dtor \
+	-Woverloaded-virtual \
+	-Wshadow \
+	-fPIC \
+	-fmessage-length=0 \
+	-fno-common \
+	-pipe \
+
+ifeq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE)
+gb_COMPILERDEFS += \
+        -DHAVE_GCC_VISIBILITY_FEATURE \
+
+gb_CFLAGS += \
+        -fvisibility=hidden
+
+gb_CXXFLAGS += \
+	-fvisibility=hidden \
+
+ifneq ($(HAVE_GCC_VISIBILITY_BROKEN),TRUE)
+gb_CXXFLAGS += \
+        -fvisibility-inlines-hidden \
+
+endif
+
+endif
+
+gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+$$2*100+$$3 }')
+gb_StrictAliasingUnsafe := $(shell expr $(gb_CCVER) \< 40600)
+
+ifeq ($(gb_StrictAliasingUnsafe),1)
+gb_CFLAGS += -fno-strict-aliasing
+gb_CXXFLAGS += -fno-strict-aliasing
+endif
+
+ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
+gb_CFLAGS_WERROR := -Werror
+gb_CXXFLAGS_WERROR := -Werror
+endif
+
+ifeq ($(HAVE_CXX0X),TRUE)
+gb_CXXFLAGS += -std=c++0x -Wno-deprecated-declarations
+endif
+
+ifneq ($(strip $(SYSBASE)),)
+gb_CXXFLAGS += --sysroot=$(SYSBASE)
+gb_CFLAGS += --sysroot=$(SYSBASE)
+gb_LinkTarget_LDFLAGS += \
+	-Wl,--sysroot=$(SYSBASE)
+endif
+gb_LinkTarget_EXCEPTIONFLAGS := \
+	-DEXCEPTIONS_ON \
+	-fexceptions \
+	-fno-enforce-eh-specs \
+
+gb_LinkTarget_NOEXCEPTIONFLAGS := \
+	-DEXCEPTIONS_OFF \
+	-fno-exceptions \
+
+gb_LinkTarget_LDFLAGS += \
+	-Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
+	-Wl,-z,combreloc \
+	$(subst -L../lib , ,$(SOLARLIB)) \
+
+ifeq ($(HAVE_LD_HASH_STYLE),TRUE)
+gb_LinkTarget_LDFLAGS += \
+	-Wl,--hash-style=$(WITH_LINKER_HASH_STYLE) \
+
+endif
+
+ifneq ($(HAVE_LD_BSYMBOLIC_FUNCTIONS),)
+gb_LinkTarget_LDFLAGS += \
+	-Wl,--dynamic-list-cpp-new \
+	-Wl,--dynamic-list-cpp-typeinfo \
+	-Wl,-Bsymbolic-functions \
+
+endif
+
+ifneq ($(gb_SYMBOL),$(true))
+gb_LinkTarget_LDFLAGS += \
+	-Wl,--strip-all \
+
+endif
+
+ifneq ($(gb_DEBUGLEVEL),0)
+gb_COMPILEROPTFLAGS := -O0
+gb_LINKEROPTFLAGS :=
+else
+gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS)
+gb_LINKEROPTFLAGS := -Wl,-O1
+endif
+
+gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+
+gb_COMPILERNOOPTFLAGS := -O0
+
+# Helper class
+
+gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
+
+gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+
+# convert parametters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(1)
+endef
+
+# CObject class
+
+# $(call gb_CObject__command,object,relative-source,source,dep-file)
+define gb_CObject__command
+$(call gb_Output_announce,$(2),$(true),C  ,3)
+$(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $(1)) $(dir $(4)) && \
+	$(gb_CC) \
+		$(DEFS) \
+		$(T_CFLAGS) \
+		-c $(3) \
+		-o $(1) \
+		-MMD -MT $(1) \
+		-MF $(4) \
+		-I$(dir $(3)) \
+		$(INCLUDE))
+endef
+
+
+# CxxObject class
+
+# $(call gb_CxxObject__command,object,relative-source,source,dep-file)
+define gb_CxxObject__command
+$(call gb_Output_announce,$(2),$(true),CXX,3)
+$(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $(1)) $(dir $(4)) && \
+	$(gb_CXX) \
+		$(DEFS) \
+		$(T_CXXFLAGS) \
+		-c $(3) \
+		-o $(1) \
+		-MMD -MT $(1) \
+		-MF $(4) \
+		-I$(dir $(3)) \
+		$(INCLUDE_STL) $(INCLUDE))
+endef
+
+
+# LinkTarget class
+
+define gb_LinkTarget__get_rpath_for_layer
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS)))
+endef
+
+gb_LinkTarget__RPATHS := \
+	URELIB:\dORIGIN \
+	UREBIN:\dORIGIN/../lib:\dORIGIN \
+	OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
+	BRAND:\dORIGIN:\dORIGIN/../basis-link/program:\dORIGIN/../basis-link/ure-link/lib \
+	SDKBIN:\dORIGIN/../../ure-link/lib \
+	NONEBIN:\dORIGIN/../lib:\dORIGIN \
+
+gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
+gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
+
+ifeq ($(gb_SYMBOL),$(true))
+gb_LinkTarget_CXXFLAGS += -ggdb2
+gb_LinkTarget_CFLAGS += -ggdb2
+endif
+
+gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
+gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
+
+# note that `cat $(extraobjectlist)` is needed to build with older gcc versions, e.g. 4.1.2 on SLED10
+# we want to use @$(extraobjectlist) in the long run
+define gb_LinkTarget__command_dynamiclink
+$(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $(1)) && \
+	$(gb_CXX) \
+		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+		$(subst \d,$$,$(RPATH)) \
+		$(T_LDFLAGS) \
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
+		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
+		-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
+		$(LIBS) \
+		$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
+		-o $(1))
+endef
+
+define gb_LinkTarget__command_staticlink
+$(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $(1)) && \
+	$(gb_AR) -rsu $(1) \
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
+		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
+		2> /dev/null)
+endef
+
+define gb_LinkTarget__command
+$(call gb_Output_announce,$(2),$(true),LNK,4)
+$(if $(filter Library CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1)))
+$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
+endef
+
+
+# Library class
+
+gb_Library_DEFS :=
+gb_Library_TARGETTYPEFLAGS := -shared -Wl,-z,noexecstack
+gb_Library_SYSPRE := lib
+gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
+gb_Library_PLAINEXT := .so
+gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
+
+gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
+gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
+
+gb_Library_PLAINLIBS_NONE += \
+	dl \
+	fontconfig \
+	freetype \
+	GL \
+	GLU \
+	ICE \
+	m \
+	pthread \
+	SM \
+	ICE \
+	X11 \
+	Xext \
+	Xrender \
+
+gb_Library_FILENAMES := \
+	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
+
+
+gb_Library_LAYER := \
+	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
+	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
+	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
+
+define gb_Library_get_rpath
+'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))' \
+'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
+endef
+
+define gb_Library_Library_platform
+$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Library_get_rpath,$(1))
+
+endef
+
+
+# StaticLibrary class
+
+gb_StaticLibrary_DEFS :=
+gb_StaticLibrary_SYSPRE := lib
+gb_StaticLibrary_PLAINEXT := .a
+gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
+
+gb_StaticLibrary_FILENAMES := \
+	$(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
+	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
+
+gb_StaticLibrary_StaticLibrary_platform =
+
+
+# Executable class
+
+gb_Executable_EXT :=
+
+gb_Executable_LAYER := \
+	$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
+	$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
+	$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
+	$(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
+	$(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
+
+
+define gb_Executable_get_rpath
+'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))' \
+-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
+endef
+
+define gb_Executable_Executable_platform
+$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Executable_get_rpath,$(1))
+
+endef
+
+
+# CppunitTest class
+
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+gb_CppunitTest_SYSPRE := libtest_
+gb_CppunitTest_EXT := .so
+gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
+gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
+
+define gb_CppunitTest_CppunitTest_platform
+$(call gb_LinkTarget_get_target,$(2)) : RPATH :=
+
+endef
+
+# JunitTest class
+
+define gb_JunitTest_JunitTest_platform
+$(call gb_JunitTest_get_target,$(1)) : DEFS := \
+	-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/program/soffice}" \
+	-Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
+	-Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
+
+endef
+
+# SdiTarget class
+
+gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+
+# SrsPartMergeTarget
+
+gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+
+# SrsPartTarget class
+
+gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
+gb_SrsPartTarget_RSCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(OUTDIR_FOR_BUILD)/bin/rsc
+
+define gb_SrsPartTarget__command_dep
+$(call gb_Helper_abbreviate_dirs,\
+	$(gb_GCCP) \
+		-MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \
+		$(INCLUDE) \
+		$(DEFS) \
+		-c -x c++-header $(2) \
+		-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
+endef
+
+
+# ComponentTarget
+
+gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+gb_Library_COMPONENTPREFIXES := \
+	OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
+	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+    NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 3f655675a393..5e322b158043 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -49,129 +49,129 @@ gb_CXX := $(CXX)
 endif
 
 gb_OSDEFS := \
-    -DWINVER=0x0500 \
-    -D_WIN32_IE=0x0500 \
-    -DNT351 \
-    -DWIN32 \
-    -DWNT \
+	-DWINVER=0x0500 \
+	-D_WIN32_IE=0x0500 \
+	-DNT351 \
+	-DWIN32 \
+	-DWNT \
 
 gb_COMPILERDEFS := \
-    -DMSC \
-    -D_CRT_NON_CONFORMING_SWPRINTFS \
-    -D_CRT_NONSTDC_NO_DEPRECATE \
-    -D_CRT_SECURE_NO_DEPRECATE \
-    -D_MT \
-    -DBOOST_MEM_FN_ENABLE_CDECL \
-    -DCPPU_ENV=msci \
-    -DFULL_DESK \
-    -DM1500 \
+	-DMSC \
+	-D_CRT_NON_CONFORMING_SWPRINTFS \
+	-D_CRT_NONSTDC_NO_DEPRECATE \
+	-D_CRT_SECURE_NO_DEPRECATE \
+	-D_MT \
+	-D_DLL \
+	-DBOOST_MEM_FN_ENABLE_CDECL \
+	-DCPPU_ENV=msci \
+	-DM1500 \
 
 gb_CPUDEFS := -DINTEL -D_X86_=1
 
 gb_RCDEFS := \
-     -DWINVER=0x0400 \
-     -DWIN32 \
+	 -DWINVER=0x0400 \
+	 -DWIN32 \
 
 gb_RCFLAGS := \
-     -V
+	 -V
 
 gb_CFLAGS := \
-    -Gd \
-    -GR \
-    -Gs \
-    -GS \
-    -nologo \
-    -Wall \
-    -wd4005 \
-    -wd4061 \
-    -wd4127 \
-    -wd4180 \
-    -wd4189 \
-    -wd4191 \
-    -wd4217 \
-    -wd4250 \
-    -wd4251 \
-    -wd4255 \
-    -wd4275 \
-    -wd4290 \
-    -wd4294 \
-    -wd4350 \
-    -wd4355 \
-    -wd4365 \
-    -wd4503 \
-    -wd4505 \
-    -wd4511 \
-    -wd4512 \
-    -wd4514 \
-    -wd4611 \
-    -wd4619 \
-    -wd4625 \
-    -wd4626 \
-    -wd4640 \
-    -wd4668 \
-    -wd4675 \
-    -wd4692 \
-    -wd4710 \
-    -wd4711 \
-    -wd4738 \
-    -wd4786 \
-    -wd4800 \
-    -wd4820 \
-    -wd4826 \
-    -Zc:forScope,wchar_t- \
-    -Zm500 \
+	-Gd \
+	-GR \
+	-Gs \
+	-GS \
+	-MD \
+	-nologo \
+	-Wall \
+	-wd4005 \
+	-wd4061 \
+	-wd4127 \
+	-wd4180 \
+	-wd4189 \
+	-wd4191 \
+	-wd4217 \
+	-wd4250 \
+	-wd4251 \
+	-wd4255 \
+	-wd4275 \
+	-wd4290 \
+	-wd4294 \
+	-wd4350 \
+	-wd4355 \
+	-wd4365 \
+	-wd4503 \
+	-wd4505 \
+	-wd4511 \
+	-wd4512 \
+	-wd4514 \
+	-wd4611 \
+	-wd4619 \
+	-wd4625 \
+	-wd4626 \
+	-wd4640 \
+	-wd4668 \
+	-wd4675 \
+	-wd4692 \
+	-wd4710 \
+	-wd4711 \
+	-wd4738 \
+	-wd4786 \
+	-wd4800 \
+	-wd4820 \
+	-wd4826 \
+	-Zc:forScope,wchar_t- \
+	-Zm500 \
 
 gb_CXXFLAGS := \
-    -Gd \
-    -GR \
-    -Gs \
-    -GS \
-    -Gy \
-    -nologo \
-    -Wall \
-    -wd4005 \
-    -wd4061 \
-    -wd4127 \
-    -wd4180 \
-    -wd4189 \
-    -wd4191 \
-    -wd4217 \
-    -wd4250 \
-    -wd4251 \
-    -wd4275 \
-    -wd4290 \
-    -wd4294 \
-    -wd4350 \
-    -wd4355 \
-    -wd4365 \
-    -wd4503 \
-    -wd4505 \
-    -wd4511 \
-    -wd4512 \
-    -wd4514 \
-    -wd4611 \
-    -wd4619 \
-    -wd4625 \
-    -wd4626 \
-    -wd4640 \
-    -wd4668 \
-    -wd4675 \
-    -wd4692 \
-    -wd4710 \
-    -wd4711 \
-    -wd4738 \
-    -wd4786 \
-    -wd4800 \
-    -wd4820 \
-    -wd4826 \
-    -Zc:forScope,wchar_t- \
-    -Zm500 \
+	-Gd \
+	-GR \
+	-Gs \
+	-GS \
+	-Gy \
+	-MD \
+	-nologo \
+	-Wall \
+	-wd4005 \
+	-wd4061 \
+	-wd4127 \
+	-wd4180 \
+	-wd4189 \
+	-wd4191 \
+	-wd4217 \
+	-wd4250 \
+	-wd4251 \
+	-wd4275 \
+	-wd4290 \
+	-wd4294 \
+	-wd4350 \
+	-wd4355 \
+	-wd4365 \
+	-wd4503 \
+	-wd4505 \
+	-wd4511 \
+	-wd4512 \
+	-wd4514 \
+	-wd4611 \
+	-wd4619 \
+	-wd4625 \
+	-wd4626 \
+	-wd4640 \
+	-wd4668 \
+	-wd4675 \
+	-wd4692 \
+	-wd4710 \
+	-wd4711 \
+	-wd4738 \
+	-wd4786 \
+	-wd4800 \
+	-wd4820 \
+	-wd4826 \
+	-Zc:forScope,wchar_t- \
+	-Zm500 \
 
 gb_STDLIBS := \
-    uwinapi \
-    kernel32 \
-    msvcrt \
-    oldnames \
+	uwinapi \
+	advapi32 \
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
 gb_CFLAGS_WERROR := -WX
@@ -179,25 +179,24 @@ gb_CXXFLAGS_WERROR := -WX
 endif
 
 gb_LinkTarget_EXCEPTIONFLAGS := \
-    -DEXCEPTIONS_ON \
-    -EHa \
+	-DEXCEPTIONS_ON \
+	-EHa \
 
 gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
 
 
 gb_LinkTarget_NOEXCEPTIONFLAGS := \
-    -DEXCEPTIONS_OFF \
+	-DEXCEPTIONS_OFF \
 
 gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
 
 gb_LinkTarget_LDFLAGS := \
-    -MACHINE:IX86 \
-    -NODEFAULTLIB \
-    -OPT:NOREF \
-    -safeseh \
-    -nxcompat \
-    -dynamicbase \
-    $(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \
+	-MACHINE:IX86 \
+	-OPT:NOREF \
+	-safeseh \
+	-nxcompat \
+	-dynamicbase \
+	$(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \
 	
 gb_DEBUG_CFLAGS := -Zi
 
@@ -208,7 +207,10 @@ gb_CFLAGS+=-Zi
 gb_CXXFLAGS+=-Zi
 endif
 
-ifeq ($(gb_DEBUGLEVEL),2)
+ifeq ($(gb_SYMBOL),$(true))
+endif
+
+ifneq ($(gb_DEBUGLEVEL),0)
 gb_LinkTarget_LDFLAGS += -DEBUG
 gb_COMPILEROPTFLAGS :=
 else
@@ -217,6 +219,16 @@ endif
 
 gb_COMPILERNOOPTFLAGS := -Od
 
+ifeq ($(gb_FULLDEPS),$(true))
+gb_COMPILERDEPFLAGS := -showIncludes
+define gb_create_deps
+| $(GBUILDDIR)/filter-showIncludes.pl $(2) $(1) $(3); exit $${PIPESTATUS[0]}
+endef
+else
+gb_COMPILERDEPFLAGS :=
+define gb_create_deps
+endef
+endif
 
 # Helper class
 gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
@@ -229,6 +241,8 @@ R=$(gb_Helper_REPODIR_NATIVE) && $(subst $(REPODIR)/,$$R/,$(subst $(gb_Helper_RE
 $(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)))))))))
 endef
 
+gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
+
 # convert parametters filesystem root to native notation
 # does some real work only on windows, make sure not to
 # break the dummy implementations on unx*
@@ -243,41 +257,21 @@ endef
 
 # CObject class
 
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_Object__command_deponcompile
-$(call gb_Helper_abbreviate_dirs_native,\
-    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
-        $(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
-        -I$(dir $(3)) \
-        $(filter-out -I$(COMPATH)% %/pch -I$(JAVA_HOME)%,$(6)) \
-        $(3) \
-        -f - \
-    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-        -v OBJECTFILE=$(1) \
-        -v OUTDIR=$(OUTDIR)/ \
-        -v WORKDIR=$(WORKDIR)/ \
-        -v SRCDIR=$(SRCDIR)/ \
-        -v REPODIR=$(REPODIR)/ \
-    > $((2))
-endef
-else
-gb_Object__command_deponcompile =
-endif
-
 define gb_CObject__command
 $(call gb_Output_announce,$(2),$(true),C  ,3)
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) && \
-    unset INCLUDE && \
-    $(gb_CC) \
+	mkdir -p $(dir $(1)) && \
+	unset INCLUDE && \
+	$(gb_CC) \
 		$(DEFS) \
 		$(T_CFLAGS) \
 		-Fd$(PDBFILE) \
-        $(PCHFLAGS) \
-        -I$(dir $(3)) \
-        $(INCLUDE) \
-        -c $(3) \
-        -Fo$(1))
+		$(PCHFLAGS) \
+		$(gb_COMPILERDEPFLAGS) \
+		-I$(realpath $(dir $(3))) \
+		$(INCLUDE) \
+		-c $(realpath $(3)) \
+		-Fo$(1)) $(call gb_create_deps,$(1),$(call gb_CObject_get_dep_target,$(2)),$(realpath $(3)))
 $(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
 endef
 
@@ -287,17 +281,18 @@ endef
 define gb_CxxObject__command
 $(call gb_Output_announce,$(2),$(true),CXX,3)
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) && \
-    unset INCLUDE && \
-    $(gb_CXX) \
+	mkdir -p $(dir $(1)) && \
+	unset INCLUDE && \
+	$(gb_CXX) \
 		$(DEFS) \
 		$(T_CXXFLAGS) \
 		-Fd$(PDBFILE) \
-        $(PCHFLAGS) \
-        -I$(dir $(3)) \
-        $(INCLUDE_STL) $(INCLUDE) \
-        -c $(3) \
-        -Fo$(1))
+		$(PCHFLAGS) \
+		$(gb_COMPILERDEPFLAGS) \
+		-I$(realpath $(dir $(3))) \
+		$(INCLUDE_STL) $(INCLUDE) \
+		-c $(realpath $(3)) \
+		-Fo$(1))  $(call gb_create_deps,$(1),$(call gb_CxxObject_get_dep_target,$(2)),$(realpath $(3)))
 $(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CXXFLAGS),$(INCLUDE))
 endef
 
@@ -305,83 +300,39 @@ endef
 # PrecompiledHeader class
 
 gb_PrecompiledHeader_get_enableflags = -Yu$(1).hxx \
-                                       -Fp$(call gb_PrecompiledHeader_get_target,$(1))
-
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_PrecompiledHeader__command_deponcompile
-$(call gb_Helper_abbreviate_dirs_native,\
-    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
-        $(4) $(5) \
-        -I$(dir $(3)) \
-        $(filter-out -I$(COMPATH)% -I$(JAVA_HOME)%,$(6)) \
-        $(3) \
-        -f - \
-    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-        -v OBJECTFILE=$(1) \
-        -v OUTDIR=$(OUTDIR)/ \
-        -v WORKDIR=$(WORKDIR)/ \
-        -v SRCDIR=$(SRCDIR)/ \
-        -v REPODIR=$(REPODIR)/ \
-    > $(call gb_PrecompiledHeader_get_dep_target,$(2)))
-endef
-else
-gb_PrecompiledHeader__command_deponcompile =
-endif
-
+	-Fp$(call gb_PrecompiledHeader_get_target,$(1))
 
 define gb_PrecompiledHeader__command
 $(call gb_Output_announce,$(2),$(true),PCH,1)
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2))) && \
-    unset INCLUDE && \
-    $(gb_CXX) \
-        $(4) $(5) -Fd$(PDBFILE) \
-        -I$(dir $(3)) \
-        $(6) \
-        -c $(3) \
-        -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
-$(call gb_PrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
+	mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2))) && \
+	unset INCLUDE && \
+	$(gb_CXX) \
+		$(4) $(5) -Fd$(PDBFILE) \
+		$(gb_COMPILERDEPFLAGS) \
+		-I$(realpath $(dir $(3))) \
+		$(6) \
+		-c $(realpath $(3)) \
+		-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_create_deps,$(1),$(call gb_PrecompiledHeader_get_dep_target,$(2)),$(realpath $(3)))
 endef
 
 # NoexPrecompiledHeader class
 
 gb_NoexPrecompiledHeader_get_enableflags = -Yu$(1).hxx \
-                                           -Fp$(call gb_NoexPrecompiledHeader_get_target,$(1))
-
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_NoexPrecompiledHeader__command_deponcompile
-$(call gb_Helper_abbreviate_dirs_native,\
-    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
-        $(4) $(5) \
-        -I$(dir $(3)) \
-        $(filter-out -I$(COMPATH)% -I$(JAVA_HOME)%,$(6)) \
-        $(3) \
-        -f - \
-    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-        -v OBJECTFILE=$(1) \
-        -v OUTDIR=$(OUTDIR)/ \
-        -v WORKDIR=$(WORKDIR)/ \
-        -v SRCDIR=$(SRCDIR)/ \
-        -v REPODIR=$(REPODIR)/ \
-    > $(call gb_NoexPrecompiledHeader_get_dep_target,$(2)))
-endef
-else
-gb_NoexPrecompiledHeader__command_deponcompile =
-endif
-
+	-Fp$(call gb_NoexPrecompiledHeader_get_target,$(1))
 
 define gb_NoexPrecompiledHeader__command
 $(call gb_Output_announce,$(2),$(true),PCH,1)
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) $(dir $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) && \
-    unset INCLUDE && \
-    $(gb_CXX) \
-        $(4) $(5) -Fd$(PDBFILE) \
-        -I$(dir $(3)) \
-        $(6) \
-        -c $(3) \
-        -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
-$(call gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
+	mkdir -p $(dir $(1)) $(dir $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) && \
+	unset INCLUDE && \
+	$(gb_CXX) \
+		$(4) $(5) -Fd$(PDBFILE) \
+		$(gb_COMPILERDEPFLAGS) \
+		-I$(realpath $(dir $(3))) \
+		$(6) \
+		-c $(realpath $(3)) \
+		-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_create_deps,$(1),$(call gb_NoexPrecompiledHeader,$(2)),$(realpath $(3)))
 endef
 
 # LinkTarget class
@@ -390,8 +341,8 @@ gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
 gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
 
 gb_LinkTarget_INCLUDE :=\
-    $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) \
-    $(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \
+	$(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) \
+	$(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \
 
 gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
 
@@ -400,25 +351,26 @@ gb_LinkTarget_get_pdbfile = $(call gb_LinkTarget_get_target,)pdb/$(1).pdb
 define gb_LinkTarget__command
 $(call gb_Output_announce,$(2),$(true),LNK,4)
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) && \
-    rm -f $(1) && \
-    RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100, \
-        $(call gb_Helper_convert_native,$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-        $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-        $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-        $(PCHOBJS) $(NATIVERES))) && \
-    $(gb_LINK) \
-        $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-        $(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
-        $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
+	mkdir -p $(dir $(1)) && \
+	rm -f $(1) && \
+	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100, \
+		$(call gb_Helper_convert_native,$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat $(extraobjectlist))) \
+		$(PCHOBJS) $(NATIVERES))) && \
+	$(gb_LINK) \
+		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+		$(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
+		$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
 		$(if $(filter YES,$(gb_Executable_TARGETGUI)), -SUBSYSTEM:WINDOWS, -SUBSYSTEM:CONSOLE) \
 		$(T_LDFLAGS) \
-        @$${RESPONSEFILE} \
-        $(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \
-        $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_filename,$(lib))) \
+		@$${RESPONSEFILE} \
+		$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \
+		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_filename,$(lib))) \
 		$(LIBS) \
-        $(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \
-    $(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) ; exit $$RC)
+		$(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \
+	$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) ; exit $$RC)
 endef
 
 
@@ -432,78 +384,74 @@ gb_Library_SYSPRE := i
 gb_Library_PLAINEXT := .lib
 
 gb_Library_PLAINLIBS_NONE += \
-    advapi32 \
+	advapi32 \
 	d3d9 \
 	d3dx \
 	ddraw \
-    gdi32 \
-    gdiplus \
-    gnu_getopt \
-    imm32\
-    kernel32 \
-    msimg32 \
-    msvcrt \
-    mpr \
-    oldnames \
-    ole32 \
-    oleaut32 \
-    shell32 \
-    unicows \
-    user32 \
-    uuid \
-    uwinapi \
+	gdi32 \
+	gdiplus \
+	gnu_getopt \
+	imm32\
+	kernel32 \
+	msimg32 \
+	msvcrt \
+	msvcprt \
+	mpr \
+	oldnames \
+	ole32 \
+	oleaut32 \
+	shell32 \
+	shlwapi \
+	unicows \
+	user32 \
+	uuid \
+	uwinapi \
+	version \
 	winmm \
-    winspool \
+	winspool \
 
 gb_Library_LAYER := \
-    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_STLLIBS),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \
 
 gb_Library_FILENAMES :=\
-    $(foreach lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
 
 gb_Library_DLLEXT := .dll
 gb_Library_MAJORVER := 3
 gb_Library_RTEXT := MSC$(gb_Library_DLLEXT)
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_STLEXT := port_vc7145$(gb_Library_DLLEXT)
-else
-gb_Library_STLEXT := port_vc7145_stldebug$(gb_Library_DLLEXT)
-endif
-gb_Library_OOOEXT := mi$(gb_Library_DLLEXT)
+gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_DLLEXT)
 gb_Library_UNOEXT := .uno$(gb_Library_DLLEXT)
 gb_Library_UNOVEREXT := $(gb_Library_MAJORVER)$(gb_Library_DLLEXT)
 gb_Library_RTVEREXT := $(gb_Library_MAJORVER)$(gb_Library_RTEXT)
 
 gb_Library_DLLFILENAMES :=\
-    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(lib)$(gb_Library_OOOEXT)) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \
-    $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(lib)$(gb_Library_RTEXT)) \
-    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVEREXT)) \
-    $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(lib)$(gb_Library_STLEXT)) \
-    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVEREXT)) \
+	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(lib)$(gb_Library_OOOEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \
+	$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(lib)$(gb_Library_RTEXT)) \
+	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVEREXT)) \
+	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVEREXT)) \
 
 define gb_Library_Library_platform
 $(call gb_LinkTarget_set_dlltarget,$(2),$(3))
 
 $(call gb_LinkTarget_set_auxtargets,$(2),\
-    $(patsubst %.lib,%.exp,$(call gb_LinkTarget_get_target,$(2))) \
-    $(3).manifest \
-    $(call gb_LinkTarget_get_pdbfile,$(2)) \
-    $(patsubst %.dll,%.pdb,$(3)) \
-    $(patsubst %.dll,%.ilk,$(3)) \
+	$(patsubst %.lib,%.exp,$(call gb_LinkTarget_get_target,$(2))) \
+	$(3).manifest \
+	$(call gb_LinkTarget_get_pdbfile,$(2)) \
+	$(patsubst %.dll,%.pdb,$(3)) \
+	$(patsubst %.dll,%.ilk,$(3)) \
 )
 
 $(call gb_Library_get_target,$(1)) \
@@ -512,8 +460,8 @@ $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir
 ifneq ($(ENABLE_CRASHDUMP),)
 $(call gb_Library_get_target,$(1)) \
 $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS +=  \
-        $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \
-        $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \
+		$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \
+		$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \
 
 endif
 
@@ -528,10 +476,10 @@ define gb_Library_add_default_nativeres
 $(call gb_WinResTarget_WinResTarget_init,$(1)/$(2))
 $(call gb_WinResTarget_add_file,$(1)/$(2),solenv/inc/shlinfo)
 $(call gb_WinResTarget_set_defs,$(1)/$(2),\
-        $$(DEFS) \
-        -DADDITIONAL_VERINFO1 \
-        -DADDITIONAL_VERINFO2 \
-        -DADDITIONAL_VERINFO3 \
+		$$(DEFS) \
+		-DADDITIONAL_VERINFO1 \
+		-DADDITIONAL_VERINFO2 \
+		-DADDITIONAL_VERINFO3 \
 )
 $(call gb_Library_add_nativeres,$(1),$(2))
 $(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(1)/$(2))
@@ -558,8 +506,8 @@ gb_StaticLibrary_PLAINEXT := .lib
 gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
 
 gb_StaticLibrary_FILENAMES := \
-    $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
-    $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
+	$(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
+	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
 
 gb_StaticLibrary_FILENAMES := $(patsubst salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES))
 
@@ -568,7 +516,7 @@ $(call gb_LinkTarget_get_target,$(2)) \
 $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))
 
 $(call gb_LinkTarget_set_auxtargets,$(2),\
-    $(call gb_LinkTarget_get_pdbfile,$(2)) \
+	$(call gb_LinkTarget_get_pdbfile,$(2)) \
 )
 
 endef
@@ -576,15 +524,15 @@ endef
 # Executable class
 
 gb_Executable_EXT := .exe
-gb_Executable_TARGETTYPEFLAGS := -RELEASE -BASE:0x1b000000 -OPT:NOREF -INCREMENTAL:NO -DEBUG
+gb_Executable_TARGETTYPEFLAGS := -RELEASE -OPT:NOREF -INCREMENTAL:NO -DEBUG
 gb_Executable_get_rpath :=
 gb_Executable_TARGETGUI := 
 
 define gb_Executable_Executable_platform
 $(call gb_LinkTarget_set_auxtargets,$(2),\
-    $(patsubst %.exe,%.pdb,$(call gb_LinkTarget_get_target,$(2))) \
-    $(call gb_LinkTarget_get_pdbfile,$(2)) \
-    $(call gb_LinkTarget_get_target,$(2)).manifest \
+	$(patsubst %.exe,%.pdb,$(call gb_LinkTarget_get_target,$(2))) \
+	$(call gb_LinkTarget_get_pdbfile,$(2)) \
+	$(call gb_LinkTarget_get_target,$(2)).manifest \
 )
 
 $(call gb_Executable_get_target,$(1)) \
@@ -599,7 +547,12 @@ endef
 # CppunitTest class
 
 gb_CppunitTest_DEFS := -D_DLL
-gb_CppunitTest_CPPTESTPRECOMMAND :=
+# cppunittester.exe is in the cppunit subdirectory of ${OUTDIR}/bin,
+# thus it won't find its DLLs unless ${OUTDIR}/bin is added to PATH.
+# PATH is the Cygwin one while ${OUTDIR} is a Win32 pathname, thus
+# cygpath -u.
+gb_CppunitTest_CPPTESTPRECOMMAND := PATH="`cygpath -u $(OUTDIR)`/bin:$${PATH}"
+
 gb_CppunitTest_SYSPRE := itest_
 gb_CppunitTest_EXT := .lib
 gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
@@ -609,11 +562,11 @@ define gb_CppunitTest_CppunitTest_platform
 $(call gb_LinkTarget_set_dlltarget,$(2),$(3))
 
 $(call gb_LinkTarget_set_auxtargets,$(2),\
-    $(patsubst %.lib,%.exp,$(call gb_LinkTarget_get_target,$(2))) \
-    $(3).manifest \
-    $(patsubst %.dll,%.pdb,$(3)) \
-    $(call gb_LinkTarget_get_pdbfile,$(2)) \
-    $(patsubst %.dll,%.ilk,$(3)) \
+	$(patsubst %.lib,%.exp,$(call gb_LinkTarget_get_target,$(2))) \
+	$(3).manifest \
+	$(patsubst %.dll,%.pdb,$(3)) \
+	$(call gb_LinkTarget_get_pdbfile,$(2)) \
+	$(patsubst %.dll,%.ilk,$(3)) \
 )
 
 $(call gb_LinkTarget_get_target,$(2)) \
@@ -644,11 +597,11 @@ $(call gb_JunitTest_get_target,$(1)) : $(call gb_JunitTest_get_target,$(1)).inst
 $(call gb_JunitTest_get_target,$(1)) : CLEAN_CMD = $(call gb_Helper_abbreviate_dirs,rm -rf `cat $$@.instpath` $$@.instpath)
 
 $(call gb_JunitTest_get_target,$(1)).instpath : 
-    INST_DIR=$$$$(cygpath -m `mktemp -d -t testinst.XXXXXX`) \
-    && unzip -d "$$$${INST_DIR}"  $$(gb_smoketest_instset) \
-    && mv "$$$${INST_DIR}"/OOo_*_install-arc_$$(gb_defaultlangiso) "$$$${INST_DIR}"/opt\
-    && mkdir -p $$(dir $$@) \
-    && echo "$$$${INST_DIR}" > $$@
+	INST_DIR=$$$$(cygpath -m `mktemp -d -t testinst.XXXXXX`) \
+	&& unzip -d "$$$${INST_DIR}"  $$(gb_smoketest_instset) \
+	&& mv "$$$${INST_DIR}"/OOo_*_install-arc_$$(gb_defaultlangiso) "$$$${INST_DIR}"/opt\
+	&& mkdir -p $$(dir $$@) \
+	&& echo "$$$${INST_DIR}" > $$@
 
 endef
 else # OOO_TEST_SOFFICE
@@ -659,20 +612,22 @@ define gb_JunitTest_JunitTest_platform
 $(call gb_JunitTest_JunitTest_platform_longpathname_hack,$(1))
 
 $(call gb_JunitTest_get_target,$(1)) : DEFS := \
-    -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:`cat $(call gb_JunitTest_get_target,$(1)).instpath`/opt/OpenOffice.org 3/program/soffice.exe}" \
-    -Dorg.openoffice.test.arg.env=PATH \
-    -Dorg.openoffice.test.arg.user=file:///$(call gb_JunitTest_get_userdir,$(1)) \
+	-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:`cat $(call gb_JunitTest_get_target,$(1)).instpath`/opt/OpenOffice.org 3/program/soffice.exe}" \
+	-Dorg.openoffice.test.arg.env=PATH \
+	-Dorg.openoffice.test.arg.user=file:///$(call gb_JunitTest_get_userdir,$(1)) \
 
 endef
 
 
 # SdiTarget class
 
-gb_SdiTarget_SVIDLPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
+# svidl.exe is in ${OUTDIR}/bin itself, so nothing special needed to have it find
+# DLLs in the same directory
+gb_SdiTarget_SVIDLPRECOMMAND :=
 
 # SrsPartMergeTarget
-
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
+# Ditto for transex3
+gb_SrsPartMergeTarget_TRANSEXPRECOMMAND :=
 
 # SrsPartTarget class
 
@@ -682,18 +637,18 @@ gb_SrsPartTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCT
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_SrsPartTarget__command_dep
 $(call gb_Helper_abbreviate_dirs_native,\
-    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
-        $(INCLUDE) \
-        $(DEFS) \
-        $(2) \
-        -f - \
-    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-        -v OBJECTFILE=$(call gb_SrsPartTarget_get_target,$(1)) \
-        -v OUTDIR=$(OUTDIR)/ \
-        -v WORKDIR=$(WORKDIR)/ \
-        -v SRCDIR=$(SRCDIR)/ \
-        -v REPODIR=$(REPODIR)/ \
-    > $(call gb_SrsPartTarget_get_dep_target,$(1)))
+	$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+		$(INCLUDE) \
+		$(DEFS) \
+		$(2) \
+		-f - \
+	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+		-v OBJECTFILE=$(call gb_SrsPartTarget_get_target,$(1)) \
+		-v OUTDIR=$(OUTDIR)/ \
+		-v WORKDIR=$(WORKDIR)/ \
+		-v SRCDIR=$(SRCDIR)/ \
+		-v REPODIR=$(REPODIR)/ \
+	> $(call gb_SrsPartTarget_get_dep_target,$(1)))
 endef
 else
 gb_SrsPartTarget__command_dep =
@@ -706,34 +661,34 @@ gb_WinResTarget_POSTFIX :=.res
 define gb_WinResTarget__command
 $(call gb_Output_announce,$(2),$(true),RES,3)
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) && \
-    $(gb_RC) \
-        $(DEFS) $(FLAGS) \
-        -I$(dir $(3)) \
-        $(INCLUDE) \
-        -Fo$(1) \
-        $(RCFILE) )
+	mkdir -p $(dir $(1)) && \
+	$(gb_RC) \
+		$(DEFS) $(FLAGS) \
+		-I$(dir $(3)) \
+		$(INCLUDE) \
+		-Fo$(1) \
+		$(RCFILE) )
 endef
 
 $(eval $(call gb_Helper_make_dep_targets,\
-    WinResTarget \
+	WinResTarget \
 ))
 
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_WinResTarget__command_dep
 $(call gb_Helper_abbreviate_dirs_native,\
-    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
-        $(INCLUDE) \
-        $(DEFS) \
-        $(2) \
-        -f - \
-    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-        -v OBJECTFILE=$(call gb_WinResTarget_get_target,$(1)) \
-        -v OUTDIR=$(OUTDIR)/ \
-        -v WORKDIR=$(WORKDIR)/ \
-        -v SRCDIR=$(SRCDIR)/ \
-        -v REPODIR=$(REPODIR)/ \
-    > $(call gb_WinResTarget_get_dep_target,$(1)))
+	$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+		$(INCLUDE) \
+		$(DEFS) \
+		$(2) \
+		-f - \
+	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+		-v OBJECTFILE=$(call gb_WinResTarget_get_target,$(1)) \
+		-v OUTDIR=$(OUTDIR)/ \
+		-v WORKDIR=$(WORKDIR)/ \
+		-v SRCDIR=$(SRCDIR)/ \
+		-v REPODIR=$(REPODIR)/ \
+	> $(call gb_WinResTarget_get_dep_target,$(1)))
 endef
 else
 gb_WinResTarget__command_dep =
@@ -741,10 +696,12 @@ endif
 
 # ComponentTarget
 
-gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
+# See comment for svidl.exe
+gb_XSLTPROCPRECOMMAND :=
+
 gb_Library_COMPONENTPREFIXES := \
-    OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
-    URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+	OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
+	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
     NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index babeb36917fd..a8e981461144 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -29,7 +29,11 @@ GUI := WNT
 COM := GCC
 
 # set tmpdir to some mixed case path, suitable for native tools
+ifeq ($(OS_FOR_BUILD),WNT)
 gb_TMPDIR:=$(if $(TMPDIR),$(shell cygpath -m $(TMPDIR)),$(shell cygpath -m /tmp))
+else
+gb_TMPDIR:=/tmp
+endif
 gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX
 
 gb_CC := $(CC)
@@ -50,84 +54,81 @@ ifeq ($(MINGW_SHARED_GXXLIB),YES)
 gb_MINGW_LIBSTDCPP := $(subst -l,,$(MINGW_SHARED_LIBSTDCPP))
 else
 gb_MINGW_LIBSTDCPP := \
-        stdc++ \
-        moldname
+		stdc++ \
+		moldname
 endif
 ifeq ($(MINGW_SHARED_GCCLIB),YES)
 gb_MINGW_LIBGCC := \
-        gcc_s \
-        gcc
+		gcc_s \
+		gcc
 else
 ifeq ($(MINGW_GCCLIB_EH),YES)
 gb_MINGW_LIBGCC := \
-        gcc \
-        gcc_eh
+		gcc \
+		gcc_eh
 else
 gb_MINGW_LIBGCC := gcc
 endif
 endif
 
 gb_OSDEFS := \
-    -DWINVER=0x0500 \
-    -D_WIN32_IE=0x0500 \
-    -DNT351 \
-    -DWIN32 \
-    -DWNT \
+	-DWINVER=0x0500 \
+	-D_WIN32_IE=0x0500 \
+	-DNT351 \
+	-DWIN32 \
+	-DWNT \
 
 ifeq ($(GXX_INCLUDE_PATH),)
 GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
 endif
 
 gb_COMPILERDEFS := \
-    -DGCC \
-    -D$(CVER) \
-    -DCVER=$(CVER) \
-    -DGLIBC=2 \
-    -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
-    -DCPPU_ENV=gcc3 \
-    -D_MT \
-    -D_NATIVE_WCHAR_T_DEFINED \
-    -D_MSC_EXTENSIONS \
-    -D_FORCENAMELESSUNION \
+	-DGCC \
+	-DGLIBC=2 \
+	-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
+	-DCPPU_ENV=gcc3 \
+	-D_MT \
+	-D_NATIVE_WCHAR_T_DEFINED \
+	-D_MSC_EXTENSIONS \
+	-D_FORCENAMELESSUNION \
 
 ifeq ($(USE_MINGW),cygwin-w64-mingw32)
 gb_COMPILERDEFS +=-D_declspec=__declspec
 endif
 
 gb_CPUDEFS := \
-    -DINTEL \
-    -D_M_IX86 \
+	-DINTEL \
+	-D_M_IX86 \
 
 gb_RCDEFS := \
-     -DWINVER=0x0400 \
-     -DWIN32 \
+	 -DWINVER=0x0400 \
+	 -DWIN32 \
 
 gb_RCFLAGS := \
-     -V
+	 -V
 
 gb_CFLAGS := \
-    -Wall \
-    -Wendif-labels \
-    -Wextra \
-    -fmessage-length=0 \
-    -fno-strict-aliasing \
-    -pipe \
-    -nostdinc \
+	-Wall \
+	-Wendif-labels \
+	-Wextra \
+	-fmessage-length=0 \
+	-fno-strict-aliasing \
+	-pipe \
+	-nostdinc \
 
 gb_CXXFLAGS := \
-    -Wall \
-    -Wendif-labels \
-    -Wextra \
-    -Wno-ctor-dtor-privacy \
-    -Wno-non-virtual-dtor \
-    -Wreturn-type \
-    -Wshadow \
-    -Wuninitialized \
-    -fmessage-length=0 \
-    -fno-strict-aliasing \
-    -fno-use-cxa-atexit \
-    -pipe \
-    -nostdinc \
+	-Wall \
+	-Wendif-labels \
+	-Wextra \
+	-Wno-ctor-dtor-privacy \
+	-Wno-non-virtual-dtor \
+	-Wreturn-type \
+	-Wshadow \
+	-Wuninitialized \
+	-fmessage-length=0 \
+	-fno-strict-aliasing \
+	-pipe \
+	-nostdinc \
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
 gb_CFLAGS_WERROR := -Werror
@@ -139,35 +140,35 @@ gb_CXXFLAGS += --sysroot=$(SYSBASE)
 gb_CFLAGS += --sysroot=$(SYSBASE)
 endif
 gb_LinkTarget_EXCEPTIONFLAGS := \
-    -DEXCEPTIONS_ON \
-    -fexceptions \
-    -fno-enforce-eh-specs \
+	-DEXCEPTIONS_ON \
+	-fexceptions \
+	-fno-enforce-eh-specs \
 
 gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
 
 
 gb_LinkTarget_NOEXCEPTIONFLAGS := \
-    -DEXCEPTIONS_OFF \
-    -fno-exceptions \
-    
+	-DEXCEPTIONS_OFF \
+	-fno-exceptions \
+
 gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
 
 gb_LinkTarget_LDFLAGS := \
-    --export-all-symbols \
-    --kill-at \
-    --exclude-libs ALL \
-    --enable-stdcall-fixup \
-    --enable-runtime-pseudo-reloc-v2 \
-    -L$(gb_Library_DLLDIR) \
-    $(patsubst %,-L%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \
+	--export-all-symbols \
+	--kill-at \
+	--exclude-libs ALL \
+	--enable-stdcall-fixup \
+	--enable-runtime-pseudo-reloc-v2 \
+	-L$(gb_Library_DLLDIR) \
+	$(patsubst %,-L%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \
 
 ifeq ($(MINGW_GCCLIB_EH),YES)
 gb_LinkTarget_LDFLAGS += -shared-libgcc
 endif
 
 gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+ifneq ($(gb_DEBUGLEVEL),0)
 
-ifeq ($(gb_DEBUGLEVEL),2)
 gb_COMPILEROPTFLAGS := -O0
 else
 gb_COMPILEROPTFLAGS := -Os
@@ -176,23 +177,31 @@ endif
 gb_COMPILERNOOPTFLAGS := -O0
 
 gb_STDLIBS := \
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
+	mingwthrd \
+	$(gb_MINGW_LIBSTDCPP) \
+	mingw32 \
+	$(gb_MINGW_LIBGCC) \
+	uwinapi \
+	moldname \
+	mingwex \
+	kernel32 \
+	msvcrt \
+	msvcprt \
 
 
 # Helper class
 
+ifeq ($(OS_FOR_BUILD),WNT)
 gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
 gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
 gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
 gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
+else
+gb_Helper_SRCDIR_NATIVE := $(SRCDIR)
+gb_Helper_WORKDIR_NATIVE := $(WORKDIR)
+gb_Helper_OUTDIR_NATIVE := $(OUTDIR)
+gb_Helper_REPODIR_NATIVE := $(REPODIR)
+endif
 
 define gb_Helper_abbreviate_dirs_native
 R=$(gb_Helper_REPODIR_NATIVE) && $(subst $(REPODIR)/,$$R/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,O=$(gb_Helper_OUTDIR_NATIVE) && W=$(gb_Helper_WORKDIR_NATIVE) && S=$(gb_Helper_SRCDIR_NATIVE))) && \
@@ -215,18 +224,18 @@ endef
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_Object__command_deponcompile
 $(call gb_Helper_abbreviate_dirs_native,\
-    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
-        $(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
-        -I$(dir $(3)) \
-        $(filter-out -I$(COMPATH)% %/pch -I$(JAVA_HOME),$(6)) \
-        $(3) \
-        -f - \
-    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-        -v OBJECTFILE=$(1) \
-        -v OUTDIR=$(OUTDIR)/ \
-        -v WORKDIR=$(WORKDIR)/ \
-        -v SRCDIR=$(SRCDIR)/ \
-        -v REPODIR=$(REPODIR)/ \
+	$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+		$(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
+		-I$(dir $(3)) \
+		$(filter-out -I$(COMPATH)% %/pch -I$(JAVA_HOME),$(6)) \
+		$(3) \
+		-f - \
+	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+		-v OBJECTFILE=$(1) \
+		-v OUTDIR=$(OUTDIR)/ \
+		-v WORKDIR=$(WORKDIR)/ \
+		-v SRCDIR=$(SRCDIR)/ \
+		-v REPODIR=$(REPODIR)/ \
 	> $(2))
 endef
 else
@@ -236,14 +245,14 @@ endif
 define gb_CObject__command
 $(call gb_Output_announce,$(2),$(true),C  ,3)
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) && \
-    $(gb_CC) \
+	mkdir -p $(dir $(1)) && \
+	$(gb_CC) \
 		$(DEFS) \
 		$(T_CFLAGS) \
-        -c $(3) \
-        -o $(1) \
-        -I$(dir $(3)) \
-        $(INCLUDE))
+		-c $(3) \
+		-o $(1) \
+		-I$(dir $(3)) \
+		$(INCLUDE))
 $(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
 endef
 
@@ -254,14 +263,14 @@ endef
 define gb_CxxObject__command
 $(call gb_Output_announce,$(2),$(true),CXX,3)
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) && \
-    $(gb_CXX) \
+	mkdir -p $(dir $(1)) && \
+	$(gb_CXX) \
 		$(DEFS) \
 		$(T_CXXFLAGS) \
-        -c $(3) \
-        -o $(1) \
-        -I$(dir $(3)) \
-        $(INCLUDE_STL) $(INCLUDE))
+		-c $(3) \
+		-o $(1) \
+		-I$(dir $(3)) \
+		$(INCLUDE_STL) $(INCLUDE))
 $(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CXXFLAGS),$(INCLUDE_STL) $(INCLUDE))
 endef
 
@@ -271,25 +280,25 @@ endef
 gb_PrecompiledHeader_EXT := .gch
 
 gb_PrecompiledHeader_get_enableflags = -I$(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR) \
-                    -DPRECOMPILED_HEADERS \
-                    -Winvalid-pch \
+					-DPRECOMPILED_HEADERS \
+					-Winvalid-pch \
 
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_PrecompiledHeader__command_deponcompile
 $(call gb_Helper_abbreviate_dirs_native,\
-    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
-        $(4) $(5) \
-        -I$(dir $(3)) \
-        $(filter-out -I$(COMPATH)% -I$(JAVA_HOME),$(6)) \
-        $(3) \
-        -f - \
-    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-        -v OBJECTFILE=$(1) \
-        -v OUTDIR=$(OUTDIR)/ \
-        -v WORKDIR=$(WORKDIR)/ \
-        -v SRCDIR=$(SRCDIR)/ \
-        -v REPODIR=$(REPODIR)/ \
-    > $(call gb_PrecompiledHeader_get_dep_target,$(2)))
+	$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+		$(4) $(5) \
+		-I$(dir $(3)) \
+		$(filter-out -I$(COMPATH)% -I$(JAVA_HOME),$(6)) \
+		$(3) \
+		-f - \
+	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+		-v OBJECTFILE=$(1) \
+		-v OUTDIR=$(OUTDIR)/ \
+		-v WORKDIR=$(WORKDIR)/ \
+		-v SRCDIR=$(SRCDIR)/ \
+		-v REPODIR=$(REPODIR)/ \
+	> $(call gb_PrecompiledHeader_get_dep_target,$(2)))
 endef
 else
 gb_PrecompiledHeader__command_deponcompile =
@@ -298,14 +307,14 @@ endif
 define gb_PrecompiledHeader__command
 $(call gb_Output_announce,$(2),$(true),PCH,1)
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2))) && \
-    $(gb_CXX) \
-        -x c++-header \
-        $(4) $(5) \
-        -I$(dir $(3)) \
-        $(6) \
-        -c $(3) \
-        -o$(1))
+	mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2))) && \
+	$(gb_CXX) \
+		-x c++-header \
+		$(4) $(5) \
+		-I$(dir $(3)) \
+		$(6) \
+		-c $(3) \
+		-o$(1))
 $(call gb_PrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
 
 endef
@@ -315,24 +324,24 @@ endef
 gb_NoexPrecompiledHeader_EXT := .gch
 
 gb_NoexPrecompiledHeader_get_enableflags = -I$(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR) \
-                    -Winvalid-pch \
+					-Winvalid-pch \
 
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_NoexPrecompiledHeader__command_deponcompile
 $(call gb_Helper_abbreviate_dirs_native,\
-    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
-        $(4) $(5) \
-        -I$(dir $(3)) \
-        $(filter-out -I$(COMPATH)% -I$(JAVA_HOME),$(6)) \
-        $(3) \
-        -f - \
-    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-        -v OBJECTFILE=$(1) \
-        -v OUTDIR=$(OUTDIR)/ \
-        -v WORKDIR=$(WORKDIR)/ \
-        -v SRCDIR=$(SRCDIR)/ \
-        -v REPODIR=$(REPODIR)/ \
-    > $(call gb_NoexPrecompiledHeader_get_dep_target,$(2)))
+	$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+		$(4) $(5) \
+		-I$(dir $(3)) \
+		$(filter-out -I$(COMPATH)% -I$(JAVA_HOME),$(6)) \
+		$(3) \
+		-f - \
+	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+		-v OBJECTFILE=$(1) \
+		-v OUTDIR=$(OUTDIR)/ \
+		-v WORKDIR=$(WORKDIR)/ \
+		-v SRCDIR=$(SRCDIR)/ \
+		-v REPODIR=$(REPODIR)/ \
+	> $(call gb_NoexPrecompiledHeader_get_dep_target,$(2)))
 endef
 else
 gb_NoexPrecompiledHeader__command_deponcompile =
@@ -341,14 +350,14 @@ endif
 define gb_NoexPrecompiledHeader__command
 $(call gb_Output_announce,$(2),$(true),PCH,1)
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) $(dir $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) && \
-    $(gb_CXX) \
-        -x c++-header \
-        $(4) $(5) \
-        -I$(dir $(3)) \
-        $(6) \
-        -c $(3) \
-        -o$(1))
+	mkdir -p $(dir $(1)) $(dir $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) && \
+	$(gb_CXX) \
+		-x c++-header \
+		$(4) $(5) \
+		-I$(dir $(3)) \
+		$(6) \
+		-c $(3) \
+		-o$(1))
 $(call gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
 
 endef
@@ -359,69 +368,75 @@ endef
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
 gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
 
+endif
+ifeq ($(gb_SYMBOL),$(true))
+gb_LinkTarget_CXXFLAGS += -ggdb2
+gb_LinkTarget_CFLAGS += -ggdb2
 gb_LinkTarget_INCLUDE :=\
-    $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) \
-    $(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \
+	$(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) \
+	$(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \
 
 gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
 
 define gb_LinkTarget__command_dynamiclinkexecutable
 $(call gb_Output_announce,$(2),$(true),LNK,4)
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) && \
-    RESPONSEFILE=`$(gb_MKTEMP)` && \
-    echo "$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-        $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-        $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) " > $${RESPONSEFILE} && \
-    $(gb_LINK) \
-        $(gb_Executable_TARGETTYPEFLAGS) \
+	mkdir -p $(dir $(1)) && \
+	RESPONSEFILE=`$(gb_MKTEMP)` && \
+	echo "$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) " > $${RESPONSEFILE} && \
+	$(gb_LINK) \
+		$(gb_Executable_TARGETTYPEFLAGS) \
 		$(if $(filter YES,$(gb_Executable_TARGETGUI)), --subsystem windows, --subsystem console) \
 		$(T_LDFLAGS) \
-        $(gb_MINGWLIBDIR)/crt2.o \
-        $(MINGW_CLIB_DIR)/crtbegin.o \
-        @$${RESPONSEFILE} \
-        --start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) --end-group \
-        --start-group $(patsubst %.dll,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_dllname,$(lib)))) --end-group \
+		$(gb_MINGWLIBDIR)/crt2.o \
+		$(MINGW_CLIB_DIR)/crtbegin.o \
+		@$${RESPONSEFILE} \
+		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
+		--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) --end-group \
+		--start-group $(patsubst %.dll,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_dllname,$(lib)))) --end-group \
 		$(LIBS) \
-        $(MINGW_CLIB_DIR)/crtend.o \
-        -Map $(basename $(1)).map \
-        -o $(1))
+		$(MINGW_CLIB_DIR)/crtend.o \
+		-Map $(basename $(1)).map \
+		-o $(1))
 endef
 
 define gb_LinkTarget__command_dynamiclinklibrary
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) && \
-    rm -f $(1) && \
-    RESPONSEFILE=`$(gb_MKTEMP)` && \
-    echo "$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-        $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-        $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) " > $${RESPONSEFILE} && \
-    $(gb_LINK) \
-        $(gb_Library_TARGETTYPEFLAGS) \
+	mkdir -p $(dir $(1)) && \
+	rm -f $(1) && \
+	RESPONSEFILE=`$(gb_MKTEMP)` && \
+	echo "$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) " > $${RESPONSEFILE} && \
+	$(gb_LINK) \
+		$(gb_Library_TARGETTYPEFLAGS) \
 		$(T_LDFLAGS) \
-        --enable-auto-image-base \
-        -e _DllMainCRTStartup@12 \
-        $(gb_MINGWLIBDIR)/dllcrt2.o \
-        $(MINGW_CLIB_DIR)/crtbegin.o \
-        @$${RESPONSEFILE} \
-        --start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) --end-group \
-        --start-group $(patsubst %.dll,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_dllname,$(lib)))) --end-group \
+		--enable-auto-image-base \
+		-e _DllMainCRTStartup@12 \
+		$(gb_MINGWLIBDIR)/dllcrt2.o \
+		$(MINGW_CLIB_DIR)/crtbegin.o \
+		@$${RESPONSEFILE} \
+		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
+		--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) --end-group \
+		--start-group $(patsubst %.dll,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_dllname,$(lib)))) --end-group \
 		$(LIBS) \
-        $(MINGW_CLIB_DIR)/crtend.o \
-        -Map $(basename $(DLLTARGET)).map \
-        -o $(DLLTARGET) && touch $(1))
+		$(MINGW_CLIB_DIR)/crtend.o \
+		-Map $(basename $(DLLTARGET)).map \
+		-o $(DLLTARGET) && touch $(1))
 endef
 
 define gb_LinkTarget__command_staticlinklibrary
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) && \
-    RESPONSEFILE=`$(gb_MKTEMP)` && \
-    echo "$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-        $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-        $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) " > $${RESPONSEFILE} && \
-    $(gb_AR) -rsu\
-        $(1) \
-        @$${RESPONSEFILE})
+	mkdir -p $(dir $(1)) && \
+	RESPONSEFILE=`$(gb_MKTEMP)` && \
+	echo "$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) " > $${RESPONSEFILE} && \
+	$(gb_AR) -rsu\
+		$(1) \
+		@$${RESPONSEFILE})
 endef
 
 define gb_LinkTarget__command
@@ -442,68 +457,65 @@ gb_Library_SYSPRE := i
 gb_Library_PLAINEXT := .lib
 
 gb_Library_PLAINLIBS_NONE += \
-    mingwthrd \
-    mingw32 \
-    mingwex \
-    $(gb_MINGW_LIBSTDCPP) \
-    $(gb_MINGW_LIBGCC) \
-    advapi32 \
+	mingwthrd \
+	mingw32 \
+	mingwex \
+	$(gb_MINGW_LIBSTDCPP) \
+	$(gb_MINGW_LIBGCC) \
+	advapi32 \
 	d3d9 \
 	d3dx \
 	ddraw \
-    gdi32 \
+	gdi32 \
 	gdiplus \
-    kernel32 \
-    msvcrt \
-    mpr \
-    moldname \
-    ole32 \
-    oleaut32 \
-    shell32 \
-    unicows \
-    user32 \
-    uuid \
-    uwinapi \
+	gnu_getopt \
+	kernel32 \
+	msvcrt \
+	msvcprt \
+	mpr \
+	moldname \
+	ole32 \
+	oleaut32 \
+	shell32 \
+	shlwapi \
+	unicows \
+	user32 \
+	uuid \
+	uwinapi \
 	winmm \
 
 gb_Library_LAYER := \
-    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_STLLIBS),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
-    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \
 
 gb_Library_FILENAMES :=\
-    $(foreach lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
 
 gb_Library_DLLEXT := .dll
 gb_Library_MAJORVER := 3
 gb_Library_RTEXT := gcc3$(gb_Library_DLLEXT)
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_STLEXT := port_gcc$(gb_Library_DLLEXT)
-else
-gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_DLLEXT)
-endif
-gb_Library_OOOEXT := gi$(gb_Library_DLLEXT)
+gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_DLLEXT)
 gb_Library_UNOEXT := .uno$(gb_Library_DLLEXT)
 gb_Library_UNOVEREXT := $(gb_Library_MAJORVER)$(gb_Library_DLLEXT)
 gb_Library_RTVEREXT := $(gb_Library_MAJORVER)$(gb_Library_RTEXT)
 
 gb_Library_DLLFILENAMES := \
-    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(lib)$(gb_Library_OOOEXT)) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
-    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \
-    $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(lib)$(gb_Library_RTEXT)) \
-    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVEREXT)) \
-    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVEREXT)) \
+	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(lib)$(gb_Library_OOOEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \
+	$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(lib)$(gb_Library_RTEXT)) \
+	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVEREXT)) \
+	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVEREXT)) \
 
 gb_Library_IARCSYSPRE := lib
 gb_Library_IARCEXT := .a
@@ -514,7 +526,7 @@ define gb_Library_Library_platform
 $(call gb_LinkTarget_set_dlltarget,$(2),$(3))
 
 $(call gb_LinkTarget_set_auxtargets,$(2),\
-    $(patsubst %.dll,%.map,$(3)) \
+	$(patsubst %.dll,%.map,$(3)) \
 )
 
 $(call gb_Library_get_target,$(1)) \
@@ -528,10 +540,10 @@ define gb_Library_add_default_nativeres
 $(call gb_WinResTarget_WinResTarget_init,$(1)/$(2))
 $(call gb_WinResTarget_add_file,$(1)/$(2),solenv/inc/shlinfo)
 $(call gb_WinResTarget_set_defs,$(1)/$(2),\
-        $$(DEFS) \
-        -DADDITIONAL_VERINFO1 \
-        -DADDITIONAL_VERINFO2 \
-        -DADDITIONAL_VERINFO3 \
+		$$(DEFS) \
+		-DADDITIONAL_VERINFO1 \
+		-DADDITIONAL_VERINFO2 \
+		-DADDITIONAL_VERINFO3 \
 )
 $(call gb_Library_add_nativeres,$(1),$(2))
 $(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(1)/$(2))
@@ -557,8 +569,8 @@ gb_StaticLibrary_PLAINEXT := .a
 gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
 
 gb_StaticLibrary_FILENAMES := \
-    $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
-    $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
+	$(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
+	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
 
 gb_StaticLibrary_FILENAMES := $(patsubst salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES))
 
@@ -584,7 +596,7 @@ define gb_CppunitTest_CppunitTest_platform
 $(call gb_LinkTarget_set_dlltarget,$(2),$(3))
 
 $(call gb_LinkTarget_set_auxtargets,$(2),\
-    $(patsubst %.dll,%.map,$(3)) \
+	$(patsubst %.dll,%.map,$(3)) \
 )
 
 endef
@@ -605,18 +617,18 @@ gb_SrsPartTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCT
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_SrsPartTarget__command_dep
 $(call gb_Helper_abbreviate_dirs_native,\
-    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
-        $(INCLUDE) \
-        $(DEFS) \
-        $(2) \
-        -f - \
-    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-        -v OBJECTFILE=$(call gb_SrsPartTarget_get_target,$(1)) \
-        -v OUTDIR=$(OUTDIR)/ \
-        -v WORKDIR=$(WORKDIR)/ \
-        -v SRCDIR=$(SRCDIR)/ \
-        -v REPODIR=$(REPODIR)/ \
-    > $(call gb_SrsPartTarget_get_dep_target,$(1)))
+	$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+		$(INCLUDE) \
+		$(DEFS) \
+		$(2) \
+		-f - \
+	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+		-v OBJECTFILE=$(call gb_SrsPartTarget_get_target,$(1)) \
+		-v OUTDIR=$(OUTDIR)/ \
+		-v WORKDIR=$(WORKDIR)/ \
+		-v SRCDIR=$(SRCDIR)/ \
+		-v REPODIR=$(REPODIR)/ \
+	> $(call gb_SrsPartTarget_get_dep_target,$(1)))
 endef
 else
 gb_SrsPartTarget__command_dep =
@@ -629,36 +641,36 @@ gb_WinResTarget_POSTFIX :=_res.o
 define gb_WinResTarget__command
 $(call gb_Output_announce,$(2),$(true),RES,3)
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) && \
-    $(gb_RC) \
-        $(DEFS) $(FLAGS) \
-        -I$(dir $(3)) \
-        $(INCLUDE) \
-        -Fo$(patsubst %_res.o,%.res,$(1)) \
-        $(RCFILE) )
-    windres $(patsubst %_res.o,%.res,$(1)) $(1)
-    rm $(patsubst %_res.o,%.res,$(1))
+	mkdir -p $(dir $(1)) && \
+	$(gb_RC) \
+		$(DEFS) $(FLAGS) \
+		-I$(dir $(3)) \
+		$(INCLUDE) \
+		-Fo$(patsubst %_res.o,%.res,$(1)) \
+		$(RCFILE) )
+	windres $(patsubst %_res.o,%.res,$(1)) $(1)
+	rm $(patsubst %_res.o,%.res,$(1))
 endef
 
 $(eval $(call gb_Helper_make_dep_targets,\
-    WinResTarget \
+	WinResTarget \
 ))
 
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_WinResTarget__command_dep
 $(call gb_Helper_abbreviate_dirs_native,\
-    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
-        $(INCLUDE) \
-        $(DEFS) \
-        $(2) \
-        -f - \
-    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-        -v OBJECTFILE=$(call gb_WinResTarget_get_target,$(1)) \
-        -v OUTDIR=$(OUTDIR)/ \
-        -v WORKDIR=$(WORKDIR)/ \
-        -v SRCDIR=$(SRCDIR)/ \
-        -v REPODIR=$(REPODIR)/ \
-    > $(call gb_WinResTarget_get_dep_target,$(1)))
+	$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+		$(INCLUDE) \
+		$(DEFS) \
+		$(2) \
+		-f - \
+	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+		-v OBJECTFILE=$(call gb_WinResTarget_get_target,$(1)) \
+		-v OUTDIR=$(OUTDIR)/ \
+		-v WORKDIR=$(WORKDIR)/ \
+		-v SRCDIR=$(SRCDIR)/ \
+		-v REPODIR=$(REPODIR)/ \
+	> $(call gb_WinResTarget_get_dep_target,$(1)))
 endef
 else
 gb_WinResTarget__command_dep =
@@ -668,8 +680,8 @@ endif
 
 gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
 gb_Library_COMPONENTPREFIXES := \
-    OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
-    URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+	OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
+	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
     NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/AllLangResTarget.mk b/solenv/gbuild/templates/AllLangResTarget.mk
index c38b8ea42fc2..3f8d1237938d 100644
--- a/solenv/gbuild/templates/AllLangResTarget.mk
+++ b/solenv/gbuild/templates/AllLangResTarget.mk
@@ -39,11 +39,11 @@ $(eval $(call gb_SrsTarget_SrsTarget,RES/res))
 
 # add any additional include paths here
 $(eval $(call gb_SrsTarget_set_include,RES/res,\
-    $$(INCLUDE) \
+	$$(INCLUDE) \
 ))
 
 # add src files here (complete path relative to repository root)
 $(eval $(call gb_SrsTarget_add_files,RES/res,\
 ))
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/CppunitTest.mk b/solenv/gbuild/templates/CppunitTest.mk
index 56f3452ede14..28e940688019 100644
--- a/solenv/gbuild/templates/CppunitTest.mk
+++ b/solenv/gbuild/templates/CppunitTest.mk
@@ -31,11 +31,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,MODULE_NAME, \
 ))
 
 $(eval $(call gb_CppunitTest_add_linked_libs,MODULE_NAME, \
-    $(gb_STDLIBS) \
+	$(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,MODULE_NAME,\
-    $$(INCLUDE) \
+	$$(INCLUDE) \
 ))
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/Executable.mk b/solenv/gbuild/templates/Executable.mk
index 84248be3a150..5a11ca65a055 100644
--- a/solenv/gbuild/templates/Executable.mk
+++ b/solenv/gbuild/templates/Executable.mk
@@ -28,7 +28,7 @@
 $(eval $(call gb_Executable_Executable,EXEC))
 
 $(eval $(call gb_Executable_set_include,EXEC,\
-    $$(INCLUDE) \
+	$$(INCLUDE) \
 ))
 
 #$(eval $(call gb_Executable_add_defs,EXEC,\
@@ -36,7 +36,7 @@ $(eval $(call gb_Executable_set_include,EXEC,\
 #))
 
 $(eval $(call gb_Executable_add_linked_libs,EXEC,\
-    $(gb_STDLIBS) \
+	$(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,EXEC,\
@@ -45,4 +45,4 @@ $(eval $(call gb_Executable_add_exception_objects,EXEC,\
 $(eval $(call gb_Executable_set_targettype_gui,EXEC,\
 ))
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/JunitTest.mk b/solenv/gbuild/templates/JunitTest.mk
index 4492d9ef45f3..d4e515fa2d8e 100644
--- a/solenv/gbuild/templates/JunitTest.mk
+++ b/solenv/gbuild/templates/JunitTest.mk
@@ -28,16 +28,16 @@
 $(eval $(call gb_JunitTest_JunitTest,MODULE_TYPE))
 
 $(eval $(call gb_JunitTest_set_defs,MODULE_TYPE,\
-    $$(DEFS) \
-    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/MODULE/DOCUMENTPATH \
+	$$(DEFS) \
+	-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/MODULE/DOCUMENTPATH \
 ))
 
 $(eval $(call gb_JunitTest_add_jars,MODULE_TYPE,\
-    $(OUTDIR)/bin/OOoRunner.jar \
-    $(OUTDIR)/bin/ridl.jar \
-    $(OUTDIR)/bin/test.jar \
-    $(OUTDIR)/bin/unoil.jar \
-    $(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/OOoRunner.jar \
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/test.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/jurt.jar \
 ))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,MODULE_TYPE,\
@@ -46,4 +46,4 @@ $(eval $(call gb_JunitTest_add_sourcefiles,MODULE_TYPE,\
 $(eval $(call gb_JunitTest_add_classes,MODULE_COMPLEX,\
 ))
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/Library.mk b/solenv/gbuild/templates/Library.mk
index 4b6603a05eee..249bbdfced2c 100644
--- a/solenv/gbuild/templates/Library.mk
+++ b/solenv/gbuild/templates/Library.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_set_componentfile,LIB,MODULE/COMPONENT_FILE))
 
 # add any additional include paths for this library here
 $(eval $(call gb_Library_set_include,LIB,\
-    $$(INCLUDE) \
+	$$(INCLUDE) \
 ))
 
 # add any additional definitions to be set for compilation here
@@ -55,7 +55,7 @@ $(eval $(call gb_Library_set_include,LIB,\
 # add libraries to be linked to LIB; again these names need to be given as
 # specified in Repository.mk
 $(eval $(call gb_Library_add_linked_libs,LIB,\
-    $(gb_STDLIBS) \
+	$(gb_STDLIBS) \
 ))
 
 # add all source files that shall be compiled with exceptions enabled
@@ -70,16 +70,16 @@ $(eval $(call gb_SdiTarget_SdiTarget,MODULE/sdi/ROOT_SDI_FILE,MODULE/sdi/LIB))
 
 # add any additional include paths for sdi processing here
 $(eval $(call gb_SdiTarget_set_include,MODULE/sdi/ROOT_SDI_FILE,\
-    $$(INCLUDE) \
+	$$(INCLUDE) \
 ))
 
 # this is an example how files can be added that require special compiler settings, e.g. building without optimizing
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_add_cxxobjects,LIB,\
-    MODULE/source/foo/bar \
-    , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+	MODULE/source/foo/bar \
+	, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
 ))
 
 endif
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/Module.mk b/solenv/gbuild/templates/Module.mk
index 6adb9bfab4a2..3b2f7fa04d98 100644
--- a/solenv/gbuild/templates/Module.mk
+++ b/solenv/gbuild/templates/Module.mk
@@ -42,4 +42,4 @@ $(eval $(call gb_Module_add_check_targets,MODULE,\
 $(eval $(call gb_Module_add_subsequentcheck_targets,MODULE,\
 ))
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/Package.mk b/solenv/gbuild/templates/Package.mk
index 1b9ae0315990..c71ca5f4f3ae 100644
--- a/solenv/gbuild/templates/Package.mk
+++ b/solenv/gbuild/templates/Package.mk
@@ -39,4 +39,4 @@ $(eval $(call gb_Package_Package,MODULE_TYPE,$(SRCDIR)/MODULE/SOURCE))
 # DESTINATION_RELPATH/file.ext is the destination file (relative to $(OUTDIR))
 $(eval $(call gb_Package_add_file,MODULE_TYPE,DESTINATION_RELPATH/file.ext,SOURCE_RELPATH/file.ext))
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/StaticLibrary.mk b/solenv/gbuild/templates/StaticLibrary.mk
index 5b0176b8b41c..0bee7b930ab8 100644
--- a/solenv/gbuild/templates/StaticLibrary.mk
+++ b/solenv/gbuild/templates/StaticLibrary.mk
@@ -32,4 +32,4 @@ $(eval $(call gb_StaticLibrary_add_package_headers,LIB,MODULE_inc))
 $(eval $(call gb_StaticLibrary_add_exception_objects,LIB,\
 ))
 
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/makefile.mk b/solenv/gbuild/templates/makefile.mk
index e312a7ccab65..88cd9dfe08b8 100644
--- a/solenv/gbuild/templates/makefile.mk
+++ b/solenv/gbuild/templates/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index 960c8d229b76..cf56b9c31f9c 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -1,9 +1,5 @@
 # unroll begin
 
-.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP1DEF = $(MISC)/$(APP1TARGET).def
-.ENDIF
-
 .IF "$(APP1LINKTYPE)" != ""
 #must be either STATIC or SHARED
 APP1LINKTYPEFLAG=$(APPLINK$(APP1LINKTYPE))
@@ -59,7 +55,7 @@ APP1PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP1PRODUCTNAME)\"
 .ENDIF			# "$(APP1PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(APP1LIBS)"!=""
 $(MISC)/$(APP1TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -74,16 +70,8 @@ $(APP1TARGETN) : $(LINKINCTARGETS)
 # Allow for target specific LIBSALCPPRT override
 APP1LIBSALCPPRT*=$(LIBSALCPPRT)
 
-.IF "$(GUI)" == "OS2"
-_APP1IMP_ORD = $(APP1STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP1STDLIBS:^"$(LB)/") 
-APP1IMP_ORD = $(foreach,i,$(_APP1IMP_ORD) $(shell @-ls $i))
-.ELSE
-APP1IMP_ORD = 
-.ENDIF
-
 $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
     $(APP1RES) \
-    $(APP1IMP_ORD) \
     $(APP1ICON) $(APP1DEPN) $(USE_APP1DEF)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
@@ -94,7 +82,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
     @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP1OBJS:s/.obj/.o/) \
     `cat /dev/null $(APP1LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
     $(APP1LINKTYPEFLAG) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_1.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_1.cmd` \
@@ -147,7 +135,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
     @echo mingw
 .IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != ""
     @cat $(APP1LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP1RES)) >  $(MISC)/$(@:b)_all.res
-    windres $(MISC)/$(@:b)_all.res $(APP1RESO)
+    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP1RESO)
 .ENDIF
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP1BASEX) $(APP1STACKN) -o $@ $(APP1OBJS) \
@@ -218,76 +206,12 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
 
 .ENDIF			# "$(GUI)" == "WNT"
 
-.IF "$(GUI)" == "OS2"
-    @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
-.IF "$(APP1LINKRES)" != ""
-    @+-$(RM) $(MISC)/$(APP1LINKRES:b).rc >& $(NULLDEV)
-.IF "$(APP1ICON)" != ""
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP1ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP1LINKRES:b).rc
-.ENDIF		# "$(APP1ICON)" != ""
-.IF "$(APP1VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP1LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP1VERINFO)$(EMQ)" >> $(MISC)/$(APP1LINKRES:b).rc
-.ENDIF		# "$(APP1VERINFO)" != ""
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP1LINKRES:b).rc
-.ENDIF			# "$(APP1LINKRES)" != ""
-
-.IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP1TARGET) WINDOWAPI > $(MISC)/$(APP1TARGET).def
-.ENDIF
-
-  .IF "$(VERBOSE)" == "TRUE"
-    @+echo	$(APP1LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP1BASEX) \
-        $(APP1STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP1LINKRES) \
-        $(APP1RES) \
-        $(APP1DEF) \
-        $(APP1OBJS) \
-        $(APP1LIBS) \
-        $(APP1STDLIBS:^"-l") \
-        $(APP1STDLIB:^"-l") $(STDLIB1:^"-l") 
-  .ENDIF
-    $(COMMAND_ECHO)$(APP1LINKER) -v \
-        $(APP1LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP1BASEX) \
-        $(APP1STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP1LINKRES) \
-        $(APP1RES) \
-        $(APP1DEF) \
-        $(APP1OBJS) \
-        $(APP1LIBS) \
-        $(APP1STDLIBS:^"-l") \
-        $(APP1STDLIB:^"-l") $(STDLIB1:^"-l") 
-
-
-.IF "$(APP1TARGET)" == "loader"
-    $(COMMAND_ECHO)+$(PERL) loader.pl $@
-    $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)+$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(APP1TARGETN)"!=""
 
 
 # Instruction for linking
 # unroll begin
 
-.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP2DEF = $(MISC)/$(APP2TARGET).def
-.ENDIF
-
 .IF "$(APP2LINKTYPE)" != ""
 #must be either STATIC or SHARED
 APP2LINKTYPEFLAG=$(APPLINK$(APP2LINKTYPE))
@@ -343,7 +267,7 @@ APP2PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP2PRODUCTNAME)\"
 .ENDIF			# "$(APP2PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(APP2LIBS)"!=""
 $(MISC)/$(APP2TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -358,16 +282,8 @@ $(APP2TARGETN) : $(LINKINCTARGETS)
 # Allow for target specific LIBSALCPPRT override
 APP2LIBSALCPPRT*=$(LIBSALCPPRT)
 
-.IF "$(GUI)" == "OS2"
-_APP2IMP_ORD = $(APP2STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP2STDLIBS:^"$(LB)/") 
-APP2IMP_ORD = $(foreach,i,$(_APP2IMP_ORD) $(shell @-ls $i))
-.ELSE
-APP2IMP_ORD = 
-.ENDIF
-
 $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
     $(APP2RES) \
-    $(APP2IMP_ORD) \
     $(APP2ICON) $(APP2DEPN) $(USE_APP2DEF)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
@@ -378,7 +294,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
     @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP2OBJS:s/.obj/.o/) \
     `cat /dev/null $(APP2LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
     $(APP2LINKTYPEFLAG) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_2.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_2.cmd` \
@@ -431,7 +347,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
     @echo mingw
 .IF "$(APP2LINKRES)" != "" || "$(APP2RES)" != ""
     @cat $(APP2LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP2RES)) >  $(MISC)/$(@:b)_all.res
-    windres $(MISC)/$(@:b)_all.res $(APP2RESO)
+    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP2RESO)
 .ENDIF
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP2BASEX) $(APP2STACKN) -o $@ $(APP2OBJS) \
@@ -502,76 +418,12 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
 
 .ENDIF			# "$(GUI)" == "WNT"
 
-.IF "$(GUI)" == "OS2"
-    @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
-.IF "$(APP2LINKRES)" != ""
-    @+-$(RM) $(MISC)/$(APP2LINKRES:b).rc >& $(NULLDEV)
-.IF "$(APP2ICON)" != ""
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP2ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP2LINKRES:b).rc
-.ENDIF		# "$(APP2ICON)" != ""
-.IF "$(APP2VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP2LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP2VERINFO)$(EMQ)" >> $(MISC)/$(APP2LINKRES:b).rc
-.ENDIF		# "$(APP2VERINFO)" != ""
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP2LINKRES:b).rc
-.ENDIF			# "$(APP2LINKRES)" != ""
-
-.IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP2TARGET) WINDOWAPI > $(MISC)/$(APP2TARGET).def
-.ENDIF
-
-  .IF "$(VERBOSE)" == "TRUE"
-    @+echo	$(APP2LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP2BASEX) \
-        $(APP2STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP2LINKRES) \
-        $(APP2RES) \
-        $(APP2DEF) \
-        $(APP2OBJS) \
-        $(APP2LIBS) \
-        $(APP2STDLIBS:^"-l") \
-        $(APP2STDLIB:^"-l") $(STDLIB2:^"-l") 
-  .ENDIF
-    $(COMMAND_ECHO)$(APP2LINKER) -v \
-        $(APP2LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP2BASEX) \
-        $(APP2STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP2LINKRES) \
-        $(APP2RES) \
-        $(APP2DEF) \
-        $(APP2OBJS) \
-        $(APP2LIBS) \
-        $(APP2STDLIBS:^"-l") \
-        $(APP2STDLIB:^"-l") $(STDLIB2:^"-l") 
-
-
-.IF "$(APP2TARGET)" == "loader"
-    $(COMMAND_ECHO)+$(PERL) loader.pl $@
-    $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)+$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(APP2TARGETN)"!=""
 
 
 # Instruction for linking
 # unroll begin
 
-.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP3DEF = $(MISC)/$(APP3TARGET).def
-.ENDIF
-
 .IF "$(APP3LINKTYPE)" != ""
 #must be either STATIC or SHARED
 APP3LINKTYPEFLAG=$(APPLINK$(APP3LINKTYPE))
@@ -627,7 +479,7 @@ APP3PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP3PRODUCTNAME)\"
 .ENDIF			# "$(APP3PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(APP3LIBS)"!=""
 $(MISC)/$(APP3TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -642,16 +494,8 @@ $(APP3TARGETN) : $(LINKINCTARGETS)
 # Allow for target specific LIBSALCPPRT override
 APP3LIBSALCPPRT*=$(LIBSALCPPRT)
 
-.IF "$(GUI)" == "OS2"
-_APP3IMP_ORD = $(APP3STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP3STDLIBS:^"$(LB)/") 
-APP3IMP_ORD = $(foreach,i,$(_APP3IMP_ORD) $(shell @-ls $i))
-.ELSE
-APP3IMP_ORD = 
-.ENDIF
-
 $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
     $(APP3RES) \
-    $(APP3IMP_ORD) \
     $(APP3ICON) $(APP3DEPN) $(USE_APP3DEF)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
@@ -662,7 +506,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
     @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP3OBJS:s/.obj/.o/) \
     `cat /dev/null $(APP3LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
     $(APP3LINKTYPEFLAG) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_3.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_3.cmd` \
@@ -715,7 +559,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
     @echo mingw
 .IF "$(APP3LINKRES)" != "" || "$(APP3RES)" != ""
     @cat $(APP3LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP3RES)) >  $(MISC)/$(@:b)_all.res
-    windres $(MISC)/$(@:b)_all.res $(APP3RESO)
+    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP3RESO)
 .ENDIF
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP3BASEX) $(APP3STACKN) -o $@ $(APP3OBJS) \
@@ -786,76 +630,12 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
 
 .ENDIF			# "$(GUI)" == "WNT"
 
-.IF "$(GUI)" == "OS2"
-    @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
-.IF "$(APP3LINKRES)" != ""
-    @+-$(RM) $(MISC)/$(APP3LINKRES:b).rc >& $(NULLDEV)
-.IF "$(APP3ICON)" != ""
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP3ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP3LINKRES:b).rc
-.ENDIF		# "$(APP3ICON)" != ""
-.IF "$(APP3VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP3LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP3VERINFO)$(EMQ)" >> $(MISC)/$(APP3LINKRES:b).rc
-.ENDIF		# "$(APP3VERINFO)" != ""
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP3LINKRES:b).rc
-.ENDIF			# "$(APP3LINKRES)" != ""
-
-.IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP3TARGET) WINDOWAPI > $(MISC)/$(APP3TARGET).def
-.ENDIF
-
-  .IF "$(VERBOSE)" == "TRUE"
-    @+echo	$(APP3LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP3BASEX) \
-        $(APP3STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP3LINKRES) \
-        $(APP3RES) \
-        $(APP3DEF) \
-        $(APP3OBJS) \
-        $(APP3LIBS) \
-        $(APP3STDLIBS:^"-l") \
-        $(APP3STDLIB:^"-l") $(STDLIB3:^"-l") 
-  .ENDIF
-    $(COMMAND_ECHO)$(APP3LINKER) -v \
-        $(APP3LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP3BASEX) \
-        $(APP3STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP3LINKRES) \
-        $(APP3RES) \
-        $(APP3DEF) \
-        $(APP3OBJS) \
-        $(APP3LIBS) \
-        $(APP3STDLIBS:^"-l") \
-        $(APP3STDLIB:^"-l") $(STDLIB3:^"-l") 
-
-
-.IF "$(APP3TARGET)" == "loader"
-    $(COMMAND_ECHO)+$(PERL) loader.pl $@
-    $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)+$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(APP3TARGETN)"!=""
 
 
 # Instruction for linking
 # unroll begin
 
-.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP4DEF = $(MISC)/$(APP4TARGET).def
-.ENDIF
-
 .IF "$(APP4LINKTYPE)" != ""
 #must be either STATIC or SHARED
 APP4LINKTYPEFLAG=$(APPLINK$(APP4LINKTYPE))
@@ -911,7 +691,7 @@ APP4PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP4PRODUCTNAME)\"
 .ENDIF			# "$(APP4PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(APP4LIBS)"!=""
 $(MISC)/$(APP4TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -926,16 +706,8 @@ $(APP4TARGETN) : $(LINKINCTARGETS)
 # Allow for target specific LIBSALCPPRT override
 APP4LIBSALCPPRT*=$(LIBSALCPPRT)
 
-.IF "$(GUI)" == "OS2"
-_APP4IMP_ORD = $(APP4STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP4STDLIBS:^"$(LB)/") 
-APP4IMP_ORD = $(foreach,i,$(_APP4IMP_ORD) $(shell @-ls $i))
-.ELSE
-APP4IMP_ORD = 
-.ENDIF
-
 $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
     $(APP4RES) \
-    $(APP4IMP_ORD) \
     $(APP4ICON) $(APP4DEPN) $(USE_APP4DEF)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
@@ -946,7 +718,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
     @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP4OBJS:s/.obj/.o/) \
     `cat /dev/null $(APP4LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
     $(APP4LINKTYPEFLAG) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_4.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_4.cmd` \
@@ -999,7 +771,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
     @echo mingw
 .IF "$(APP4LINKRES)" != "" || "$(APP4RES)" != ""
     @cat $(APP4LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP4RES)) >  $(MISC)/$(@:b)_all.res
-    windres $(MISC)/$(@:b)_all.res $(APP4RESO)
+    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP4RESO)
 .ENDIF
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP4BASEX) $(APP4STACKN) -o $@ $(APP4OBJS) \
@@ -1070,76 +842,12 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
 
 .ENDIF			# "$(GUI)" == "WNT"
 
-.IF "$(GUI)" == "OS2"
-    @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
-.IF "$(APP4LINKRES)" != ""
-    @+-$(RM) $(MISC)/$(APP4LINKRES:b).rc >& $(NULLDEV)
-.IF "$(APP4ICON)" != ""
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP4ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP4LINKRES:b).rc
-.ENDIF		# "$(APP4ICON)" != ""
-.IF "$(APP4VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP4LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP4VERINFO)$(EMQ)" >> $(MISC)/$(APP4LINKRES:b).rc
-.ENDIF		# "$(APP4VERINFO)" != ""
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP4LINKRES:b).rc
-.ENDIF			# "$(APP4LINKRES)" != ""
-
-.IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP4TARGET) WINDOWAPI > $(MISC)/$(APP4TARGET).def
-.ENDIF
-
-  .IF "$(VERBOSE)" == "TRUE"
-    @+echo	$(APP4LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP4BASEX) \
-        $(APP4STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP4LINKRES) \
-        $(APP4RES) \
-        $(APP4DEF) \
-        $(APP4OBJS) \
-        $(APP4LIBS) \
-        $(APP4STDLIBS:^"-l") \
-        $(APP4STDLIB:^"-l") $(STDLIB4:^"-l") 
-  .ENDIF
-    $(COMMAND_ECHO)$(APP4LINKER) -v \
-        $(APP4LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP4BASEX) \
-        $(APP4STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP4LINKRES) \
-        $(APP4RES) \
-        $(APP4DEF) \
-        $(APP4OBJS) \
-        $(APP4LIBS) \
-        $(APP4STDLIBS:^"-l") \
-        $(APP4STDLIB:^"-l") $(STDLIB4:^"-l") 
-
-
-.IF "$(APP4TARGET)" == "loader"
-    $(COMMAND_ECHO)+$(PERL) loader.pl $@
-    $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)+$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(APP4TARGETN)"!=""
 
 
 # Instruction for linking
 # unroll begin
 
-.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP5DEF = $(MISC)/$(APP5TARGET).def
-.ENDIF
-
 .IF "$(APP5LINKTYPE)" != ""
 #must be either STATIC or SHARED
 APP5LINKTYPEFLAG=$(APPLINK$(APP5LINKTYPE))
@@ -1195,7 +903,7 @@ APP5PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP5PRODUCTNAME)\"
 .ENDIF			# "$(APP5PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(APP5LIBS)"!=""
 $(MISC)/$(APP5TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -1210,16 +918,8 @@ $(APP5TARGETN) : $(LINKINCTARGETS)
 # Allow for target specific LIBSALCPPRT override
 APP5LIBSALCPPRT*=$(LIBSALCPPRT)
 
-.IF "$(GUI)" == "OS2"
-_APP5IMP_ORD = $(APP5STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP5STDLIBS:^"$(LB)/") 
-APP5IMP_ORD = $(foreach,i,$(_APP5IMP_ORD) $(shell @-ls $i))
-.ELSE
-APP5IMP_ORD = 
-.ENDIF
-
 $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
     $(APP5RES) \
-    $(APP5IMP_ORD) \
     $(APP5ICON) $(APP5DEPN) $(USE_APP5DEF)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
@@ -1230,7 +930,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
     @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP5OBJS:s/.obj/.o/) \
     `cat /dev/null $(APP5LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
     $(APP5LINKTYPEFLAG) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_5.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_5.cmd` \
@@ -1283,7 +983,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
     @echo mingw
 .IF "$(APP5LINKRES)" != "" || "$(APP5RES)" != ""
     @cat $(APP5LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP5RES)) >  $(MISC)/$(@:b)_all.res
-    windres $(MISC)/$(@:b)_all.res $(APP5RESO)
+    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP5RESO)
 .ENDIF
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP5BASEX) $(APP5STACKN) -o $@ $(APP5OBJS) \
@@ -1354,76 +1054,12 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
 
 .ENDIF			# "$(GUI)" == "WNT"
 
-.IF "$(GUI)" == "OS2"
-    @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
-.IF "$(APP5LINKRES)" != ""
-    @+-$(RM) $(MISC)/$(APP5LINKRES:b).rc >& $(NULLDEV)
-.IF "$(APP5ICON)" != ""
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP5ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP5LINKRES:b).rc
-.ENDIF		# "$(APP5ICON)" != ""
-.IF "$(APP5VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP5LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP5VERINFO)$(EMQ)" >> $(MISC)/$(APP5LINKRES:b).rc
-.ENDIF		# "$(APP5VERINFO)" != ""
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP5LINKRES:b).rc
-.ENDIF			# "$(APP5LINKRES)" != ""
-
-.IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP5TARGET) WINDOWAPI > $(MISC)/$(APP5TARGET).def
-.ENDIF
-
-  .IF "$(VERBOSE)" == "TRUE"
-    @+echo	$(APP5LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP5BASEX) \
-        $(APP5STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP5LINKRES) \
-        $(APP5RES) \
-        $(APP5DEF) \
-        $(APP5OBJS) \
-        $(APP5LIBS) \
-        $(APP5STDLIBS:^"-l") \
-        $(APP5STDLIB:^"-l") $(STDLIB5:^"-l") 
-  .ENDIF
-    $(COMMAND_ECHO)$(APP5LINKER) -v \
-        $(APP5LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP5BASEX) \
-        $(APP5STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP5LINKRES) \
-        $(APP5RES) \
-        $(APP5DEF) \
-        $(APP5OBJS) \
-        $(APP5LIBS) \
-        $(APP5STDLIBS:^"-l") \
-        $(APP5STDLIB:^"-l") $(STDLIB5:^"-l") 
-
-
-.IF "$(APP5TARGET)" == "loader"
-    $(COMMAND_ECHO)+$(PERL) loader.pl $@
-    $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)+$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(APP5TARGETN)"!=""
 
 
 # Instruction for linking
 # unroll begin
 
-.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP6DEF = $(MISC)/$(APP6TARGET).def
-.ENDIF
-
 .IF "$(APP6LINKTYPE)" != ""
 #must be either STATIC or SHARED
 APP6LINKTYPEFLAG=$(APPLINK$(APP6LINKTYPE))
@@ -1479,7 +1115,7 @@ APP6PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP6PRODUCTNAME)\"
 .ENDIF			# "$(APP6PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(APP6LIBS)"!=""
 $(MISC)/$(APP6TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -1494,16 +1130,8 @@ $(APP6TARGETN) : $(LINKINCTARGETS)
 # Allow for target specific LIBSALCPPRT override
 APP6LIBSALCPPRT*=$(LIBSALCPPRT)
 
-.IF "$(GUI)" == "OS2"
-_APP6IMP_ORD = $(APP6STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP6STDLIBS:^"$(LB)/") 
-APP6IMP_ORD = $(foreach,i,$(_APP6IMP_ORD) $(shell @-ls $i))
-.ELSE
-APP6IMP_ORD = 
-.ENDIF
-
 $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
     $(APP6RES) \
-    $(APP6IMP_ORD) \
     $(APP6ICON) $(APP6DEPN) $(USE_APP6DEF)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
@@ -1514,7 +1142,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
     @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP6OBJS:s/.obj/.o/) \
     `cat /dev/null $(APP6LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
     $(APP6LINKTYPEFLAG) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_6.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_6.cmd` \
@@ -1567,7 +1195,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
     @echo mingw
 .IF "$(APP6LINKRES)" != "" || "$(APP6RES)" != ""
     @cat $(APP6LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP6RES)) >  $(MISC)/$(@:b)_all.res
-    windres $(MISC)/$(@:b)_all.res $(APP6RESO)
+    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP6RESO)
 .ENDIF
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP6BASEX) $(APP6STACKN) -o $@ $(APP6OBJS) \
@@ -1638,76 +1266,12 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
 
 .ENDIF			# "$(GUI)" == "WNT"
 
-.IF "$(GUI)" == "OS2"
-    @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
-.IF "$(APP6LINKRES)" != ""
-    @+-$(RM) $(MISC)/$(APP6LINKRES:b).rc >& $(NULLDEV)
-.IF "$(APP6ICON)" != ""
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP6ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP6LINKRES:b).rc
-.ENDIF		# "$(APP6ICON)" != ""
-.IF "$(APP6VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP6LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP6VERINFO)$(EMQ)" >> $(MISC)/$(APP6LINKRES:b).rc
-.ENDIF		# "$(APP6VERINFO)" != ""
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP6LINKRES:b).rc
-.ENDIF			# "$(APP6LINKRES)" != ""
-
-.IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP6TARGET) WINDOWAPI > $(MISC)/$(APP6TARGET).def
-.ENDIF
-
-  .IF "$(VERBOSE)" == "TRUE"
-    @+echo	$(APP6LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP6BASEX) \
-        $(APP6STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP6LINKRES) \
-        $(APP6RES) \
-        $(APP6DEF) \
-        $(APP6OBJS) \
-        $(APP6LIBS) \
-        $(APP6STDLIBS:^"-l") \
-        $(APP6STDLIB:^"-l") $(STDLIB6:^"-l") 
-  .ENDIF
-    $(COMMAND_ECHO)$(APP6LINKER) -v \
-        $(APP6LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP6BASEX) \
-        $(APP6STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP6LINKRES) \
-        $(APP6RES) \
-        $(APP6DEF) \
-        $(APP6OBJS) \
-        $(APP6LIBS) \
-        $(APP6STDLIBS:^"-l") \
-        $(APP6STDLIB:^"-l") $(STDLIB6:^"-l") 
-
-
-.IF "$(APP6TARGET)" == "loader"
-    $(COMMAND_ECHO)+$(PERL) loader.pl $@
-    $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)+$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(APP6TARGETN)"!=""
 
 
 # Instruction for linking
 # unroll begin
 
-.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP7DEF = $(MISC)/$(APP7TARGET).def
-.ENDIF
-
 .IF "$(APP7LINKTYPE)" != ""
 #must be either STATIC or SHARED
 APP7LINKTYPEFLAG=$(APPLINK$(APP7LINKTYPE))
@@ -1763,7 +1327,7 @@ APP7PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP7PRODUCTNAME)\"
 .ENDIF			# "$(APP7PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(APP7LIBS)"!=""
 $(MISC)/$(APP7TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -1778,16 +1342,8 @@ $(APP7TARGETN) : $(LINKINCTARGETS)
 # Allow for target specific LIBSALCPPRT override
 APP7LIBSALCPPRT*=$(LIBSALCPPRT)
 
-.IF "$(GUI)" == "OS2"
-_APP7IMP_ORD = $(APP7STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP7STDLIBS:^"$(LB)/") 
-APP7IMP_ORD = $(foreach,i,$(_APP7IMP_ORD) $(shell @-ls $i))
-.ELSE
-APP7IMP_ORD = 
-.ENDIF
-
 $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
     $(APP7RES) \
-    $(APP7IMP_ORD) \
     $(APP7ICON) $(APP7DEPN) $(USE_APP7DEF)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
@@ -1798,7 +1354,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
     @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP7OBJS:s/.obj/.o/) \
     `cat /dev/null $(APP7LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
     $(APP7LINKTYPEFLAG) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_7.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_7.cmd` \
@@ -1851,7 +1407,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
     @echo mingw
 .IF "$(APP7LINKRES)" != "" || "$(APP7RES)" != ""
     @cat $(APP7LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP7RES)) >  $(MISC)/$(@:b)_all.res
-    windres $(MISC)/$(@:b)_all.res $(APP7RESO)
+    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP7RESO)
 .ENDIF
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP7BASEX) $(APP7STACKN) -o $@ $(APP7OBJS) \
@@ -1922,76 +1478,12 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
 
 .ENDIF			# "$(GUI)" == "WNT"
 
-.IF "$(GUI)" == "OS2"
-    @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
-.IF "$(APP7LINKRES)" != ""
-    @+-$(RM) $(MISC)/$(APP7LINKRES:b).rc >& $(NULLDEV)
-.IF "$(APP7ICON)" != ""
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP7ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP7LINKRES:b).rc
-.ENDIF		# "$(APP7ICON)" != ""
-.IF "$(APP7VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP7LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP7VERINFO)$(EMQ)" >> $(MISC)/$(APP7LINKRES:b).rc
-.ENDIF		# "$(APP7VERINFO)" != ""
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP7LINKRES:b).rc
-.ENDIF			# "$(APP7LINKRES)" != ""
-
-.IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP7TARGET) WINDOWAPI > $(MISC)/$(APP7TARGET).def
-.ENDIF
-
-  .IF "$(VERBOSE)" == "TRUE"
-    @+echo	$(APP7LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP7BASEX) \
-        $(APP7STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP7LINKRES) \
-        $(APP7RES) \
-        $(APP7DEF) \
-        $(APP7OBJS) \
-        $(APP7LIBS) \
-        $(APP7STDLIBS:^"-l") \
-        $(APP7STDLIB:^"-l") $(STDLIB7:^"-l") 
-  .ENDIF
-    $(COMMAND_ECHO)$(APP7LINKER) -v \
-        $(APP7LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP7BASEX) \
-        $(APP7STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP7LINKRES) \
-        $(APP7RES) \
-        $(APP7DEF) \
-        $(APP7OBJS) \
-        $(APP7LIBS) \
-        $(APP7STDLIBS:^"-l") \
-        $(APP7STDLIB:^"-l") $(STDLIB7:^"-l") 
-
-
-.IF "$(APP7TARGET)" == "loader"
-    $(COMMAND_ECHO)+$(PERL) loader.pl $@
-    $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)+$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(APP7TARGETN)"!=""
 
 
 # Instruction for linking
 # unroll begin
 
-.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP8DEF = $(MISC)/$(APP8TARGET).def
-.ENDIF
-
 .IF "$(APP8LINKTYPE)" != ""
 #must be either STATIC or SHARED
 APP8LINKTYPEFLAG=$(APPLINK$(APP8LINKTYPE))
@@ -2047,7 +1539,7 @@ APP8PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP8PRODUCTNAME)\"
 .ENDIF			# "$(APP8PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(APP8LIBS)"!=""
 $(MISC)/$(APP8TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -2062,16 +1554,8 @@ $(APP8TARGETN) : $(LINKINCTARGETS)
 # Allow for target specific LIBSALCPPRT override
 APP8LIBSALCPPRT*=$(LIBSALCPPRT)
 
-.IF "$(GUI)" == "OS2"
-_APP8IMP_ORD = $(APP8STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP8STDLIBS:^"$(LB)/") 
-APP8IMP_ORD = $(foreach,i,$(_APP8IMP_ORD) $(shell @-ls $i))
-.ELSE
-APP8IMP_ORD = 
-.ENDIF
-
 $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
     $(APP8RES) \
-    $(APP8IMP_ORD) \
     $(APP8ICON) $(APP8DEPN) $(USE_APP8DEF)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
@@ -2082,7 +1566,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
     @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP8OBJS:s/.obj/.o/) \
     `cat /dev/null $(APP8LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
     $(APP8LINKTYPEFLAG) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_8.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_8.cmd` \
@@ -2135,7 +1619,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
     @echo mingw
 .IF "$(APP8LINKRES)" != "" || "$(APP8RES)" != ""
     @cat $(APP8LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP8RES)) >  $(MISC)/$(@:b)_all.res
-    windres $(MISC)/$(@:b)_all.res $(APP8RESO)
+    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP8RESO)
 .ENDIF
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP8BASEX) $(APP8STACKN) -o $@ $(APP8OBJS) \
@@ -2206,76 +1690,12 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
 
 .ENDIF			# "$(GUI)" == "WNT"
 
-.IF "$(GUI)" == "OS2"
-    @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
-.IF "$(APP8LINKRES)" != ""
-    @+-$(RM) $(MISC)/$(APP8LINKRES:b).rc >& $(NULLDEV)
-.IF "$(APP8ICON)" != ""
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP8ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP8LINKRES:b).rc
-.ENDIF		# "$(APP8ICON)" != ""
-.IF "$(APP8VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP8LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP8VERINFO)$(EMQ)" >> $(MISC)/$(APP8LINKRES:b).rc
-.ENDIF		# "$(APP8VERINFO)" != ""
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP8LINKRES:b).rc
-.ENDIF			# "$(APP8LINKRES)" != ""
-
-.IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP8TARGET) WINDOWAPI > $(MISC)/$(APP8TARGET).def
-.ENDIF
-
-  .IF "$(VERBOSE)" == "TRUE"
-    @+echo	$(APP8LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP8BASEX) \
-        $(APP8STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP8LINKRES) \
-        $(APP8RES) \
-        $(APP8DEF) \
-        $(APP8OBJS) \
-        $(APP8LIBS) \
-        $(APP8STDLIBS:^"-l") \
-        $(APP8STDLIB:^"-l") $(STDLIB8:^"-l") 
-  .ENDIF
-    $(COMMAND_ECHO)$(APP8LINKER) -v \
-        $(APP8LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP8BASEX) \
-        $(APP8STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP8LINKRES) \
-        $(APP8RES) \
-        $(APP8DEF) \
-        $(APP8OBJS) \
-        $(APP8LIBS) \
-        $(APP8STDLIBS:^"-l") \
-        $(APP8STDLIB:^"-l") $(STDLIB8:^"-l") 
-
-
-.IF "$(APP8TARGET)" == "loader"
-    $(COMMAND_ECHO)+$(PERL) loader.pl $@
-    $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)+$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(APP8TARGETN)"!=""
 
 
 # Instruction for linking
 # unroll begin
 
-.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP9DEF = $(MISC)/$(APP9TARGET).def
-.ENDIF
-
 .IF "$(APP9LINKTYPE)" != ""
 #must be either STATIC or SHARED
 APP9LINKTYPEFLAG=$(APPLINK$(APP9LINKTYPE))
@@ -2331,7 +1751,7 @@ APP9PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP9PRODUCTNAME)\"
 .ENDIF			# "$(APP9PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(APP9LIBS)"!=""
 $(MISC)/$(APP9TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -2346,16 +1766,8 @@ $(APP9TARGETN) : $(LINKINCTARGETS)
 # Allow for target specific LIBSALCPPRT override
 APP9LIBSALCPPRT*=$(LIBSALCPPRT)
 
-.IF "$(GUI)" == "OS2"
-_APP9IMP_ORD = $(APP9STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP9STDLIBS:^"$(LB)/") 
-APP9IMP_ORD = $(foreach,i,$(_APP9IMP_ORD) $(shell @-ls $i))
-.ELSE
-APP9IMP_ORD = 
-.ENDIF
-
 $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
     $(APP9RES) \
-    $(APP9IMP_ORD) \
     $(APP9ICON) $(APP9DEPN) $(USE_APP9DEF)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
@@ -2366,7 +1778,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
     @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP9OBJS:s/.obj/.o/) \
     `cat /dev/null $(APP9LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
     $(APP9LINKTYPEFLAG) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_9.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_9.cmd` \
@@ -2419,7 +1831,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
     @echo mingw
 .IF "$(APP9LINKRES)" != "" || "$(APP9RES)" != ""
     @cat $(APP9LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP9RES)) >  $(MISC)/$(@:b)_all.res
-    windres $(MISC)/$(@:b)_all.res $(APP9RESO)
+    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP9RESO)
 .ENDIF
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP9BASEX) $(APP9STACKN) -o $@ $(APP9OBJS) \
@@ -2490,76 +1902,12 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
 
 .ENDIF			# "$(GUI)" == "WNT"
 
-.IF "$(GUI)" == "OS2"
-    @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
-.IF "$(APP9LINKRES)" != ""
-    @+-$(RM) $(MISC)/$(APP9LINKRES:b).rc >& $(NULLDEV)
-.IF "$(APP9ICON)" != ""
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP9ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP9LINKRES:b).rc
-.ENDIF		# "$(APP9ICON)" != ""
-.IF "$(APP9VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP9LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP9VERINFO)$(EMQ)" >> $(MISC)/$(APP9LINKRES:b).rc
-.ENDIF		# "$(APP9VERINFO)" != ""
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP9LINKRES:b).rc
-.ENDIF			# "$(APP9LINKRES)" != ""
-
-.IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP9TARGET) WINDOWAPI > $(MISC)/$(APP9TARGET).def
-.ENDIF
-
-  .IF "$(VERBOSE)" == "TRUE"
-    @+echo	$(APP9LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP9BASEX) \
-        $(APP9STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP9LINKRES) \
-        $(APP9RES) \
-        $(APP9DEF) \
-        $(APP9OBJS) \
-        $(APP9LIBS) \
-        $(APP9STDLIBS:^"-l") \
-        $(APP9STDLIB:^"-l") $(STDLIB9:^"-l") 
-  .ENDIF
-    $(COMMAND_ECHO)$(APP9LINKER) -v \
-        $(APP9LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP9BASEX) \
-        $(APP9STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP9LINKRES) \
-        $(APP9RES) \
-        $(APP9DEF) \
-        $(APP9OBJS) \
-        $(APP9LIBS) \
-        $(APP9STDLIBS:^"-l") \
-        $(APP9STDLIB:^"-l") $(STDLIB9:^"-l") 
-
-
-.IF "$(APP9TARGET)" == "loader"
-    $(COMMAND_ECHO)+$(PERL) loader.pl $@
-    $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)+$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(APP9TARGETN)"!=""
 
 
 # Instruction for linking
 # unroll begin
 
-.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP10DEF = $(MISC)/$(APP10TARGET).def
-.ENDIF
-
 .IF "$(APP10LINKTYPE)" != ""
 #must be either STATIC or SHARED
 APP10LINKTYPEFLAG=$(APPLINK$(APP10LINKTYPE))
@@ -2615,7 +1963,7 @@ APP10PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP10PRODUCTNAME)\"
 .ENDIF			# "$(APP10PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(APP10LIBS)"!=""
 $(MISC)/$(APP10TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -2630,16 +1978,8 @@ $(APP10TARGETN) : $(LINKINCTARGETS)
 # Allow for target specific LIBSALCPPRT override
 APP10LIBSALCPPRT*=$(LIBSALCPPRT)
 
-.IF "$(GUI)" == "OS2"
-_APP10IMP_ORD = $(APP10STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP10STDLIBS:^"$(LB)/") 
-APP10IMP_ORD = $(foreach,i,$(_APP10IMP_ORD) $(shell @-ls $i))
-.ELSE
-APP10IMP_ORD = 
-.ENDIF
-
 $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
     $(APP10RES) \
-    $(APP10IMP_ORD) \
     $(APP10ICON) $(APP10DEPN) $(USE_APP10DEF)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
@@ -2650,7 +1990,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
     @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP10OBJS:s/.obj/.o/) \
     `cat /dev/null $(APP10LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
     $(APP10LINKTYPEFLAG) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_10.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_10.cmd` \
@@ -2703,7 +2043,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
     @echo mingw
 .IF "$(APP10LINKRES)" != "" || "$(APP10RES)" != ""
     @cat $(APP10LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP10RES)) >  $(MISC)/$(@:b)_all.res
-    windres $(MISC)/$(@:b)_all.res $(APP10RESO)
+    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP10RESO)
 .ENDIF
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP10BASEX) $(APP10STACKN) -o $@ $(APP10OBJS) \
@@ -2774,66 +2114,6 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
 
 .ENDIF			# "$(GUI)" == "WNT"
 
-.IF "$(GUI)" == "OS2"
-    @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
-.IF "$(APP10LINKRES)" != ""
-    @+-$(RM) $(MISC)/$(APP10LINKRES:b).rc >& $(NULLDEV)
-.IF "$(APP10ICON)" != ""
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP10ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP10LINKRES:b).rc
-.ENDIF		# "$(APP10ICON)" != ""
-.IF "$(APP10VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP10LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP10VERINFO)$(EMQ)" >> $(MISC)/$(APP10LINKRES:b).rc
-.ENDIF		# "$(APP10VERINFO)" != ""
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP10LINKRES:b).rc
-.ENDIF			# "$(APP10LINKRES)" != ""
-
-.IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP10TARGET) WINDOWAPI > $(MISC)/$(APP10TARGET).def
-.ENDIF
-
-  .IF "$(VERBOSE)" == "TRUE"
-    @+echo	$(APP10LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP10BASEX) \
-        $(APP10STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP10LINKRES) \
-        $(APP10RES) \
-        $(APP10DEF) \
-        $(APP10OBJS) \
-        $(APP10LIBS) \
-        $(APP10STDLIBS:^"-l") \
-        $(APP10STDLIB:^"-l") $(STDLIB10:^"-l") 
-  .ENDIF
-    $(COMMAND_ECHO)$(APP10LINKER) -v \
-        $(APP10LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP10BASEX) \
-        $(APP10STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP10LINKRES) \
-        $(APP10RES) \
-        $(APP10DEF) \
-        $(APP10OBJS) \
-        $(APP10LIBS) \
-        $(APP10STDLIBS:^"-l") \
-        $(APP10STDLIB:^"-l") $(STDLIB10:^"-l") 
-
-
-.IF "$(APP10TARGET)" == "loader"
-    $(COMMAND_ECHO)+$(PERL) loader.pl $@
-    $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)+$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(APP10TARGETN)"!=""
 
 
diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk
index cf4414ae4e1f..ea9d53ed5ea2 100644
--- a/solenv/inc/_tg_def.mk
+++ b/solenv/inc/_tg_def.mk
@@ -26,7 +26,7 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
     $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)nm -gP $(SHL1OBJS) \
+    $(COMMAND_ECHO)$(NM) -gP $(SHL1OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
         | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
@@ -36,12 +36,6 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
 
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-DEF1EXPORTFILE=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET).dxp
-$(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.ENDIF			# "$(GUI)"=="OS2"
-
 .ENDIF			# "$(DEF1EXPORTFILE)"==""
 .ENDIF			# "$(SHL1VERSIONMAP)"!=""
 
@@ -163,112 +157,6 @@ $(DEF1TARGETN) .PHONY :
     @$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL1TARGET8=$(shell @fix_shl $(SHL1TARGETN:f))
-
-DEF1FILTER=$(SOLARENV)/inc/dummy.flt
-DEF1NAMELIST=$(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib)
-
-.IF "$(link_always)"==""
-$(DEF1TARGETN) : \
-        $(DEF1DEPN) \
-        $(DEF1EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF1TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    @+-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(SHL1TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
-    @echo DATA MULTIPLE	 >>$@.tmpfile
-    @echo DESCRIPTION	'StarView 3.00 $(DEF1DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-    @echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    @echo _GetVersionInfo		>$@.tmp_ord
-.ENDIF
-
-.IF "$(DEFLIB1NAME)"!=""
-    @+echo $(SLB)/$(DEFLIB1NAME).lib
-    @+emxexpr $(DEF1NAMELIST) | fix_exp_file >> $@.tmp_ord
-.ENDIF				# "$(DEFLIB1NAME)"!=""
-
-.IF "$(DEF1EXPORT1)"!=""
-    @echo $(DEF1EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT2)"!=""
-    @echo $(DEF1EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT3)"!=""
-    @echo $(DEF1EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT4)"!=""
-    @echo $(DEF1EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT5)"!=""
-    @echo $(DEF1EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT6)"!=""
-    @echo $(DEF1EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT7)"!=""
-    @echo $(DEF1EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT8)"!=""
-    @echo $(DEF1EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT9)"!=""
-    @echo $(DEF1EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT10)"!=""
-    @echo $(DEF1EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT11)"!=""
-    @echo $(DEF1EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT12)"!=""
-    @echo $(DEF1EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT13)"!=""
-    @echo $(DEF1EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT14)"!=""
-    @echo $(DEF1EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT15)"!=""
-    @echo $(DEF1EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT16)"!=""
-    @echo $(DEF1EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT17)"!=""
-    @echo $(DEF1EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT18)"!=""
-    @echo $(DEF1EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT19)"!=""
-    @echo $(DEF1EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT20)"!=""
-    @echo $(DEF1EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORTFILE)"!=""
-    @fix_def_file < $(DEF1EXPORTFILE) >> $@.tmp_ord
-.ENDIF
-    @sort < $@.tmp_ord | uniq > $@.exptmpfile
-    @fix_def_ord < $@.exptmpfile >> $@.tmpfile
-    @+-$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
-    @+-$(RM) $@.tmp_ord
-    @+-$(RM) $@.exptmpfile
-    $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL1IMPLIBN:s/.lib/.a/) $@
-    $(COMMAND_ECHO)+emxomf -o $(SHL1IMPLIBN) $(SHL1IMPLIBN:s/.lib/.a/) 
-
-.ENDIF			# "$(GUI)"=="OS2"
-
 .IF "$(GUI)"=="UNX"
 $(DEF1TARGETN): \
         $(DEF1DEPN) \
@@ -307,7 +195,7 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
     $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)nm -gP $(SHL2OBJS) \
+    $(COMMAND_ECHO)$(NM) -gP $(SHL2OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
         | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
@@ -317,12 +205,6 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
 
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-DEF2EXPORTFILE=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET).dxp
-$(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.ENDIF			# "$(GUI)"=="OS2"
-
 .ENDIF			# "$(DEF2EXPORTFILE)"==""
 .ENDIF			# "$(SHL2VERSIONMAP)"!=""
 
@@ -444,112 +326,6 @@ $(DEF2TARGETN) .PHONY :
     @$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL2TARGET8=$(shell @fix_shl $(SHL2TARGETN:f))
-
-DEF2FILTER=$(SOLARENV)/inc/dummy.flt
-DEF2NAMELIST=$(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib)
-
-.IF "$(link_always)"==""
-$(DEF2TARGETN) : \
-        $(DEF2DEPN) \
-        $(DEF2EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF2TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    @+-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(SHL2TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
-    @echo DATA MULTIPLE	 >>$@.tmpfile
-    @echo DESCRIPTION	'StarView 3.00 $(DEF2DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-    @echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    @echo _GetVersionInfo		>$@.tmp_ord
-.ENDIF
-
-.IF "$(DEFLIB2NAME)"!=""
-    @+echo $(SLB)/$(DEFLIB2NAME).lib
-    @+emxexpr $(DEF2NAMELIST) | fix_exp_file >> $@.tmp_ord
-.ENDIF				# "$(DEFLIB2NAME)"!=""
-
-.IF "$(DEF2EXPORT1)"!=""
-    @echo $(DEF2EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT2)"!=""
-    @echo $(DEF2EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT3)"!=""
-    @echo $(DEF2EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT4)"!=""
-    @echo $(DEF2EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT5)"!=""
-    @echo $(DEF2EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT6)"!=""
-    @echo $(DEF2EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT7)"!=""
-    @echo $(DEF2EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT8)"!=""
-    @echo $(DEF2EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT9)"!=""
-    @echo $(DEF2EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT10)"!=""
-    @echo $(DEF2EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT11)"!=""
-    @echo $(DEF2EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT12)"!=""
-    @echo $(DEF2EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT13)"!=""
-    @echo $(DEF2EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT14)"!=""
-    @echo $(DEF2EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT15)"!=""
-    @echo $(DEF2EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT16)"!=""
-    @echo $(DEF2EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT17)"!=""
-    @echo $(DEF2EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT18)"!=""
-    @echo $(DEF2EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT19)"!=""
-    @echo $(DEF2EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT20)"!=""
-    @echo $(DEF2EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORTFILE)"!=""
-    @fix_def_file < $(DEF2EXPORTFILE) >> $@.tmp_ord
-.ENDIF
-    @sort < $@.tmp_ord | uniq > $@.exptmpfile
-    @fix_def_ord < $@.exptmpfile >> $@.tmpfile
-    @+-$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
-    @+-$(RM) $@.tmp_ord
-    @+-$(RM) $@.exptmpfile
-    $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL2IMPLIBN:s/.lib/.a/) $@
-    $(COMMAND_ECHO)+emxomf -o $(SHL2IMPLIBN) $(SHL2IMPLIBN:s/.lib/.a/) 
-
-.ENDIF			# "$(GUI)"=="OS2"
-
 .IF "$(GUI)"=="UNX"
 $(DEF2TARGETN): \
         $(DEF2DEPN) \
@@ -588,7 +364,7 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
     $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)nm -gP $(SHL3OBJS) \
+    $(COMMAND_ECHO)$(NM) -gP $(SHL3OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
         | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
@@ -598,12 +374,6 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
 
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-DEF3EXPORTFILE=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET).dxp
-$(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.ENDIF			# "$(GUI)"=="OS2"
-
 .ENDIF			# "$(DEF3EXPORTFILE)"==""
 .ENDIF			# "$(SHL3VERSIONMAP)"!=""
 
@@ -725,112 +495,6 @@ $(DEF3TARGETN) .PHONY :
     @$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL3TARGET8=$(shell @fix_shl $(SHL3TARGETN:f))
-
-DEF3FILTER=$(SOLARENV)/inc/dummy.flt
-DEF3NAMELIST=$(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib)
-
-.IF "$(link_always)"==""
-$(DEF3TARGETN) : \
-        $(DEF3DEPN) \
-        $(DEF3EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF3TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    @+-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(SHL3TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
-    @echo DATA MULTIPLE	 >>$@.tmpfile
-    @echo DESCRIPTION	'StarView 3.00 $(DEF3DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-    @echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    @echo _GetVersionInfo		>$@.tmp_ord
-.ENDIF
-
-.IF "$(DEFLIB3NAME)"!=""
-    @+echo $(SLB)/$(DEFLIB3NAME).lib
-    @+emxexpr $(DEF3NAMELIST) | fix_exp_file >> $@.tmp_ord
-.ENDIF				# "$(DEFLIB3NAME)"!=""
-
-.IF "$(DEF3EXPORT1)"!=""
-    @echo $(DEF3EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT2)"!=""
-    @echo $(DEF3EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT3)"!=""
-    @echo $(DEF3EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT4)"!=""
-    @echo $(DEF3EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT5)"!=""
-    @echo $(DEF3EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT6)"!=""
-    @echo $(DEF3EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT7)"!=""
-    @echo $(DEF3EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT8)"!=""
-    @echo $(DEF3EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT9)"!=""
-    @echo $(DEF3EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT10)"!=""
-    @echo $(DEF3EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT11)"!=""
-    @echo $(DEF3EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT12)"!=""
-    @echo $(DEF3EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT13)"!=""
-    @echo $(DEF3EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT14)"!=""
-    @echo $(DEF3EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT15)"!=""
-    @echo $(DEF3EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT16)"!=""
-    @echo $(DEF3EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT17)"!=""
-    @echo $(DEF3EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT18)"!=""
-    @echo $(DEF3EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT19)"!=""
-    @echo $(DEF3EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT20)"!=""
-    @echo $(DEF3EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORTFILE)"!=""
-    @fix_def_file < $(DEF3EXPORTFILE) >> $@.tmp_ord
-.ENDIF
-    @sort < $@.tmp_ord | uniq > $@.exptmpfile
-    @fix_def_ord < $@.exptmpfile >> $@.tmpfile
-    @+-$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
-    @+-$(RM) $@.tmp_ord
-    @+-$(RM) $@.exptmpfile
-    $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL3IMPLIBN:s/.lib/.a/) $@
-    $(COMMAND_ECHO)+emxomf -o $(SHL3IMPLIBN) $(SHL3IMPLIBN:s/.lib/.a/) 
-
-.ENDIF			# "$(GUI)"=="OS2"
-
 .IF "$(GUI)"=="UNX"
 $(DEF3TARGETN): \
         $(DEF3DEPN) \
@@ -869,7 +533,7 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
     $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)nm -gP $(SHL4OBJS) \
+    $(COMMAND_ECHO)$(NM) -gP $(SHL4OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
         | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
@@ -879,12 +543,6 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
 
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-DEF4EXPORTFILE=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET).dxp
-$(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.ENDIF			# "$(GUI)"=="OS2"
-
 .ENDIF			# "$(DEF4EXPORTFILE)"==""
 .ENDIF			# "$(SHL4VERSIONMAP)"!=""
 
@@ -1006,112 +664,6 @@ $(DEF4TARGETN) .PHONY :
     @$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL4TARGET8=$(shell @fix_shl $(SHL4TARGETN:f))
-
-DEF4FILTER=$(SOLARENV)/inc/dummy.flt
-DEF4NAMELIST=$(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib)
-
-.IF "$(link_always)"==""
-$(DEF4TARGETN) : \
-        $(DEF4DEPN) \
-        $(DEF4EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF4TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    @+-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(SHL4TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
-    @echo DATA MULTIPLE	 >>$@.tmpfile
-    @echo DESCRIPTION	'StarView 3.00 $(DEF4DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-    @echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    @echo _GetVersionInfo		>$@.tmp_ord
-.ENDIF
-
-.IF "$(DEFLIB4NAME)"!=""
-    @+echo $(SLB)/$(DEFLIB4NAME).lib
-    @+emxexpr $(DEF4NAMELIST) | fix_exp_file >> $@.tmp_ord
-.ENDIF				# "$(DEFLIB4NAME)"!=""
-
-.IF "$(DEF4EXPORT1)"!=""
-    @echo $(DEF4EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT2)"!=""
-    @echo $(DEF4EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT3)"!=""
-    @echo $(DEF4EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT4)"!=""
-    @echo $(DEF4EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT5)"!=""
-    @echo $(DEF4EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT6)"!=""
-    @echo $(DEF4EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT7)"!=""
-    @echo $(DEF4EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT8)"!=""
-    @echo $(DEF4EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT9)"!=""
-    @echo $(DEF4EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT10)"!=""
-    @echo $(DEF4EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT11)"!=""
-    @echo $(DEF4EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT12)"!=""
-    @echo $(DEF4EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT13)"!=""
-    @echo $(DEF4EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT14)"!=""
-    @echo $(DEF4EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT15)"!=""
-    @echo $(DEF4EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT16)"!=""
-    @echo $(DEF4EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT17)"!=""
-    @echo $(DEF4EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT18)"!=""
-    @echo $(DEF4EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT19)"!=""
-    @echo $(DEF4EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT20)"!=""
-    @echo $(DEF4EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORTFILE)"!=""
-    @fix_def_file < $(DEF4EXPORTFILE) >> $@.tmp_ord
-.ENDIF
-    @sort < $@.tmp_ord | uniq > $@.exptmpfile
-    @fix_def_ord < $@.exptmpfile >> $@.tmpfile
-    @+-$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
-    @+-$(RM) $@.tmp_ord
-    @+-$(RM) $@.exptmpfile
-    $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL4IMPLIBN:s/.lib/.a/) $@
-    $(COMMAND_ECHO)+emxomf -o $(SHL4IMPLIBN) $(SHL4IMPLIBN:s/.lib/.a/) 
-
-.ENDIF			# "$(GUI)"=="OS2"
-
 .IF "$(GUI)"=="UNX"
 $(DEF4TARGETN): \
         $(DEF4DEPN) \
@@ -1150,7 +702,7 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
     $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)nm -gP $(SHL5OBJS) \
+    $(COMMAND_ECHO)$(NM) -gP $(SHL5OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
         | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
@@ -1160,12 +712,6 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
 
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-DEF5EXPORTFILE=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET).dxp
-$(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.ENDIF			# "$(GUI)"=="OS2"
-
 .ENDIF			# "$(DEF5EXPORTFILE)"==""
 .ENDIF			# "$(SHL5VERSIONMAP)"!=""
 
@@ -1287,112 +833,6 @@ $(DEF5TARGETN) .PHONY :
     @$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL5TARGET8=$(shell @fix_shl $(SHL5TARGETN:f))
-
-DEF5FILTER=$(SOLARENV)/inc/dummy.flt
-DEF5NAMELIST=$(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib)
-
-.IF "$(link_always)"==""
-$(DEF5TARGETN) : \
-        $(DEF5DEPN) \
-        $(DEF5EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF5TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    @+-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(SHL5TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
-    @echo DATA MULTIPLE	 >>$@.tmpfile
-    @echo DESCRIPTION	'StarView 3.00 $(DEF5DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-    @echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    @echo _GetVersionInfo		>$@.tmp_ord
-.ENDIF
-
-.IF "$(DEFLIB5NAME)"!=""
-    @+echo $(SLB)/$(DEFLIB5NAME).lib
-    @+emxexpr $(DEF5NAMELIST) | fix_exp_file >> $@.tmp_ord
-.ENDIF				# "$(DEFLIB5NAME)"!=""
-
-.IF "$(DEF5EXPORT1)"!=""
-    @echo $(DEF5EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT2)"!=""
-    @echo $(DEF5EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT3)"!=""
-    @echo $(DEF5EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT4)"!=""
-    @echo $(DEF5EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT5)"!=""
-    @echo $(DEF5EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT6)"!=""
-    @echo $(DEF5EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT7)"!=""
-    @echo $(DEF5EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT8)"!=""
-    @echo $(DEF5EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT9)"!=""
-    @echo $(DEF5EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT10)"!=""
-    @echo $(DEF5EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT11)"!=""
-    @echo $(DEF5EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT12)"!=""
-    @echo $(DEF5EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT13)"!=""
-    @echo $(DEF5EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT14)"!=""
-    @echo $(DEF5EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT15)"!=""
-    @echo $(DEF5EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT16)"!=""
-    @echo $(DEF5EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT17)"!=""
-    @echo $(DEF5EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT18)"!=""
-    @echo $(DEF5EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT19)"!=""
-    @echo $(DEF5EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT20)"!=""
-    @echo $(DEF5EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORTFILE)"!=""
-    @fix_def_file < $(DEF5EXPORTFILE) >> $@.tmp_ord
-.ENDIF
-    @sort < $@.tmp_ord | uniq > $@.exptmpfile
-    @fix_def_ord < $@.exptmpfile >> $@.tmpfile
-    @+-$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
-    @+-$(RM) $@.tmp_ord
-    @+-$(RM) $@.exptmpfile
-    $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL5IMPLIBN:s/.lib/.a/) $@
-    $(COMMAND_ECHO)+emxomf -o $(SHL5IMPLIBN) $(SHL5IMPLIBN:s/.lib/.a/) 
-
-.ENDIF			# "$(GUI)"=="OS2"
-
 .IF "$(GUI)"=="UNX"
 $(DEF5TARGETN): \
         $(DEF5DEPN) \
@@ -1431,7 +871,7 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
     $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)nm -gP $(SHL6OBJS) \
+    $(COMMAND_ECHO)$(NM) -gP $(SHL6OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
         | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
@@ -1441,12 +881,6 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
 
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-DEF6EXPORTFILE=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET).dxp
-$(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.ENDIF			# "$(GUI)"=="OS2"
-
 .ENDIF			# "$(DEF6EXPORTFILE)"==""
 .ENDIF			# "$(SHL6VERSIONMAP)"!=""
 
@@ -1568,112 +1002,6 @@ $(DEF6TARGETN) .PHONY :
     @$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL6TARGET8=$(shell @fix_shl $(SHL6TARGETN:f))
-
-DEF6FILTER=$(SOLARENV)/inc/dummy.flt
-DEF6NAMELIST=$(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib)
-
-.IF "$(link_always)"==""
-$(DEF6TARGETN) : \
-        $(DEF6DEPN) \
-        $(DEF6EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF6TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    @+-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(SHL6TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
-    @echo DATA MULTIPLE	 >>$@.tmpfile
-    @echo DESCRIPTION	'StarView 3.00 $(DEF6DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-    @echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    @echo _GetVersionInfo		>$@.tmp_ord
-.ENDIF
-
-.IF "$(DEFLIB6NAME)"!=""
-    @+echo $(SLB)/$(DEFLIB6NAME).lib
-    @+emxexpr $(DEF6NAMELIST) | fix_exp_file >> $@.tmp_ord
-.ENDIF				# "$(DEFLIB6NAME)"!=""
-
-.IF "$(DEF6EXPORT1)"!=""
-    @echo $(DEF6EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT2)"!=""
-    @echo $(DEF6EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT3)"!=""
-    @echo $(DEF6EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT4)"!=""
-    @echo $(DEF6EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT5)"!=""
-    @echo $(DEF6EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT6)"!=""
-    @echo $(DEF6EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT7)"!=""
-    @echo $(DEF6EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT8)"!=""
-    @echo $(DEF6EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT9)"!=""
-    @echo $(DEF6EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT10)"!=""
-    @echo $(DEF6EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT11)"!=""
-    @echo $(DEF6EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT12)"!=""
-    @echo $(DEF6EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT13)"!=""
-    @echo $(DEF6EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT14)"!=""
-    @echo $(DEF6EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT15)"!=""
-    @echo $(DEF6EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT16)"!=""
-    @echo $(DEF6EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT17)"!=""
-    @echo $(DEF6EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT18)"!=""
-    @echo $(DEF6EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT19)"!=""
-    @echo $(DEF6EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT20)"!=""
-    @echo $(DEF6EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORTFILE)"!=""
-    @fix_def_file < $(DEF6EXPORTFILE) >> $@.tmp_ord
-.ENDIF
-    @sort < $@.tmp_ord | uniq > $@.exptmpfile
-    @fix_def_ord < $@.exptmpfile >> $@.tmpfile
-    @+-$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
-    @+-$(RM) $@.tmp_ord
-    @+-$(RM) $@.exptmpfile
-    $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL6IMPLIBN:s/.lib/.a/) $@
-    $(COMMAND_ECHO)+emxomf -o $(SHL6IMPLIBN) $(SHL6IMPLIBN:s/.lib/.a/) 
-
-.ENDIF			# "$(GUI)"=="OS2"
-
 .IF "$(GUI)"=="UNX"
 $(DEF6TARGETN): \
         $(DEF6DEPN) \
@@ -1712,7 +1040,7 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
     $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)nm -gP $(SHL7OBJS) \
+    $(COMMAND_ECHO)$(NM) -gP $(SHL7OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
         | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
@@ -1722,12 +1050,6 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
 
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-DEF7EXPORTFILE=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET).dxp
-$(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.ENDIF			# "$(GUI)"=="OS2"
-
 .ENDIF			# "$(DEF7EXPORTFILE)"==""
 .ENDIF			# "$(SHL7VERSIONMAP)"!=""
 
@@ -1849,112 +1171,6 @@ $(DEF7TARGETN) .PHONY :
     @$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL7TARGET8=$(shell @fix_shl $(SHL7TARGETN:f))
-
-DEF7FILTER=$(SOLARENV)/inc/dummy.flt
-DEF7NAMELIST=$(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib)
-
-.IF "$(link_always)"==""
-$(DEF7TARGETN) : \
-        $(DEF7DEPN) \
-        $(DEF7EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF7TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    @+-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(SHL7TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
-    @echo DATA MULTIPLE	 >>$@.tmpfile
-    @echo DESCRIPTION	'StarView 3.00 $(DEF7DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-    @echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    @echo _GetVersionInfo		>$@.tmp_ord
-.ENDIF
-
-.IF "$(DEFLIB7NAME)"!=""
-    @+echo $(SLB)/$(DEFLIB7NAME).lib
-    @+emxexpr $(DEF7NAMELIST) | fix_exp_file >> $@.tmp_ord
-.ENDIF				# "$(DEFLIB7NAME)"!=""
-
-.IF "$(DEF7EXPORT1)"!=""
-    @echo $(DEF7EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT2)"!=""
-    @echo $(DEF7EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT3)"!=""
-    @echo $(DEF7EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT4)"!=""
-    @echo $(DEF7EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT5)"!=""
-    @echo $(DEF7EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT6)"!=""
-    @echo $(DEF7EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT7)"!=""
-    @echo $(DEF7EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT8)"!=""
-    @echo $(DEF7EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT9)"!=""
-    @echo $(DEF7EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT10)"!=""
-    @echo $(DEF7EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT11)"!=""
-    @echo $(DEF7EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT12)"!=""
-    @echo $(DEF7EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT13)"!=""
-    @echo $(DEF7EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT14)"!=""
-    @echo $(DEF7EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT15)"!=""
-    @echo $(DEF7EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT16)"!=""
-    @echo $(DEF7EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT17)"!=""
-    @echo $(DEF7EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT18)"!=""
-    @echo $(DEF7EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT19)"!=""
-    @echo $(DEF7EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT20)"!=""
-    @echo $(DEF7EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORTFILE)"!=""
-    @fix_def_file < $(DEF7EXPORTFILE) >> $@.tmp_ord
-.ENDIF
-    @sort < $@.tmp_ord | uniq > $@.exptmpfile
-    @fix_def_ord < $@.exptmpfile >> $@.tmpfile
-    @+-$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
-    @+-$(RM) $@.tmp_ord
-    @+-$(RM) $@.exptmpfile
-    $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL7IMPLIBN:s/.lib/.a/) $@
-    $(COMMAND_ECHO)+emxomf -o $(SHL7IMPLIBN) $(SHL7IMPLIBN:s/.lib/.a/) 
-
-.ENDIF			# "$(GUI)"=="OS2"
-
 .IF "$(GUI)"=="UNX"
 $(DEF7TARGETN): \
         $(DEF7DEPN) \
@@ -1993,7 +1209,7 @@ $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
     $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)nm -gP $(SHL8OBJS) \
+    $(COMMAND_ECHO)$(NM) -gP $(SHL8OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
         | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
@@ -2003,12 +1219,6 @@ $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
 
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-DEF8EXPORTFILE=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET).dxp
-$(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.ENDIF			# "$(GUI)"=="OS2"
-
 .ENDIF			# "$(DEF8EXPORTFILE)"==""
 .ENDIF			# "$(SHL8VERSIONMAP)"!=""
 
@@ -2130,112 +1340,6 @@ $(DEF8TARGETN) .PHONY :
     @$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL8TARGET8=$(shell @fix_shl $(SHL8TARGETN:f))
-
-DEF8FILTER=$(SOLARENV)/inc/dummy.flt
-DEF8NAMELIST=$(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib)
-
-.IF "$(link_always)"==""
-$(DEF8TARGETN) : \
-        $(DEF8DEPN) \
-        $(DEF8EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF8TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    @+-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(SHL8TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
-    @echo DATA MULTIPLE	 >>$@.tmpfile
-    @echo DESCRIPTION	'StarView 3.00 $(DEF8DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-    @echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    @echo _GetVersionInfo		>$@.tmp_ord
-.ENDIF
-
-.IF "$(DEFLIB8NAME)"!=""
-    @+echo $(SLB)/$(DEFLIB8NAME).lib
-    @+emxexpr $(DEF8NAMELIST) | fix_exp_file >> $@.tmp_ord
-.ENDIF				# "$(DEFLIB8NAME)"!=""
-
-.IF "$(DEF8EXPORT1)"!=""
-    @echo $(DEF8EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT2)"!=""
-    @echo $(DEF8EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT3)"!=""
-    @echo $(DEF8EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT4)"!=""
-    @echo $(DEF8EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT5)"!=""
-    @echo $(DEF8EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT6)"!=""
-    @echo $(DEF8EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT7)"!=""
-    @echo $(DEF8EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT8)"!=""
-    @echo $(DEF8EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT9)"!=""
-    @echo $(DEF8EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT10)"!=""
-    @echo $(DEF8EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT11)"!=""
-    @echo $(DEF8EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT12)"!=""
-    @echo $(DEF8EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT13)"!=""
-    @echo $(DEF8EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT14)"!=""
-    @echo $(DEF8EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT15)"!=""
-    @echo $(DEF8EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT16)"!=""
-    @echo $(DEF8EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT17)"!=""
-    @echo $(DEF8EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT18)"!=""
-    @echo $(DEF8EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT19)"!=""
-    @echo $(DEF8EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT20)"!=""
-    @echo $(DEF8EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORTFILE)"!=""
-    @fix_def_file < $(DEF8EXPORTFILE) >> $@.tmp_ord
-.ENDIF
-    @sort < $@.tmp_ord | uniq > $@.exptmpfile
-    @fix_def_ord < $@.exptmpfile >> $@.tmpfile
-    @+-$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
-    @+-$(RM) $@.tmp_ord
-    @+-$(RM) $@.exptmpfile
-    $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL8IMPLIBN:s/.lib/.a/) $@
-    $(COMMAND_ECHO)+emxomf -o $(SHL8IMPLIBN) $(SHL8IMPLIBN:s/.lib/.a/) 
-
-.ENDIF			# "$(GUI)"=="OS2"
-
 .IF "$(GUI)"=="UNX"
 $(DEF8TARGETN): \
         $(DEF8DEPN) \
@@ -2274,7 +1378,7 @@ $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
     $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)nm -gP $(SHL9OBJS) \
+    $(COMMAND_ECHO)$(NM) -gP $(SHL9OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
         | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
@@ -2284,12 +1388,6 @@ $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
 
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-DEF9EXPORTFILE=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET).dxp
-$(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.ENDIF			# "$(GUI)"=="OS2"
-
 .ENDIF			# "$(DEF9EXPORTFILE)"==""
 .ENDIF			# "$(SHL9VERSIONMAP)"!=""
 
@@ -2411,112 +1509,6 @@ $(DEF9TARGETN) .PHONY :
     @$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL9TARGET8=$(shell @fix_shl $(SHL9TARGETN:f))
-
-DEF9FILTER=$(SOLARENV)/inc/dummy.flt
-DEF9NAMELIST=$(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib)
-
-.IF "$(link_always)"==""
-$(DEF9TARGETN) : \
-        $(DEF9DEPN) \
-        $(DEF9EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF9TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    @+-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(SHL9TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
-    @echo DATA MULTIPLE	 >>$@.tmpfile
-    @echo DESCRIPTION	'StarView 3.00 $(DEF9DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-    @echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    @echo _GetVersionInfo		>$@.tmp_ord
-.ENDIF
-
-.IF "$(DEFLIB9NAME)"!=""
-    @+echo $(SLB)/$(DEFLIB9NAME).lib
-    @+emxexpr $(DEF9NAMELIST) | fix_exp_file >> $@.tmp_ord
-.ENDIF				# "$(DEFLIB9NAME)"!=""
-
-.IF "$(DEF9EXPORT1)"!=""
-    @echo $(DEF9EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT2)"!=""
-    @echo $(DEF9EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT3)"!=""
-    @echo $(DEF9EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT4)"!=""
-    @echo $(DEF9EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT5)"!=""
-    @echo $(DEF9EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT6)"!=""
-    @echo $(DEF9EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT7)"!=""
-    @echo $(DEF9EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT8)"!=""
-    @echo $(DEF9EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT9)"!=""
-    @echo $(DEF9EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT10)"!=""
-    @echo $(DEF9EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT11)"!=""
-    @echo $(DEF9EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT12)"!=""
-    @echo $(DEF9EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT13)"!=""
-    @echo $(DEF9EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT14)"!=""
-    @echo $(DEF9EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT15)"!=""
-    @echo $(DEF9EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT16)"!=""
-    @echo $(DEF9EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT17)"!=""
-    @echo $(DEF9EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT18)"!=""
-    @echo $(DEF9EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT19)"!=""
-    @echo $(DEF9EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT20)"!=""
-    @echo $(DEF9EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORTFILE)"!=""
-    @fix_def_file < $(DEF9EXPORTFILE) >> $@.tmp_ord
-.ENDIF
-    @sort < $@.tmp_ord | uniq > $@.exptmpfile
-    @fix_def_ord < $@.exptmpfile >> $@.tmpfile
-    @+-$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
-    @+-$(RM) $@.tmp_ord
-    @+-$(RM) $@.exptmpfile
-    $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL9IMPLIBN:s/.lib/.a/) $@
-    $(COMMAND_ECHO)+emxomf -o $(SHL9IMPLIBN) $(SHL9IMPLIBN:s/.lib/.a/) 
-
-.ENDIF			# "$(GUI)"=="OS2"
-
 .IF "$(GUI)"=="UNX"
 $(DEF9TARGETN): \
         $(DEF9DEPN) \
@@ -2555,7 +1547,7 @@ $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
     $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)nm -gP $(SHL10OBJS) \
+    $(COMMAND_ECHO)$(NM) -gP $(SHL10OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
         | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
@@ -2565,12 +1557,6 @@ $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
 
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-DEF10EXPORTFILE=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET).dxp
-$(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.ENDIF			# "$(GUI)"=="OS2"
-
 .ENDIF			# "$(DEF10EXPORTFILE)"==""
 .ENDIF			# "$(SHL10VERSIONMAP)"!=""
 
@@ -2692,112 +1678,6 @@ $(DEF10TARGETN) .PHONY :
     @$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL10TARGET8=$(shell @fix_shl $(SHL10TARGETN:f))
-
-DEF10FILTER=$(SOLARENV)/inc/dummy.flt
-DEF10NAMELIST=$(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib)
-
-.IF "$(link_always)"==""
-$(DEF10TARGETN) : \
-        $(DEF10DEPN) \
-        $(DEF10EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF10TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    @+-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(SHL10TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
-    @echo DATA MULTIPLE	 >>$@.tmpfile
-    @echo DESCRIPTION	'StarView 3.00 $(DEF10DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-    @echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    @echo _GetVersionInfo		>$@.tmp_ord
-.ENDIF
-
-.IF "$(DEFLIB10NAME)"!=""
-    @+echo $(SLB)/$(DEFLIB10NAME).lib
-    @+emxexpr $(DEF10NAMELIST) | fix_exp_file >> $@.tmp_ord
-.ENDIF				# "$(DEFLIB10NAME)"!=""
-
-.IF "$(DEF10EXPORT1)"!=""
-    @echo $(DEF10EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT2)"!=""
-    @echo $(DEF10EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT3)"!=""
-    @echo $(DEF10EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT4)"!=""
-    @echo $(DEF10EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT5)"!=""
-    @echo $(DEF10EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT6)"!=""
-    @echo $(DEF10EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT7)"!=""
-    @echo $(DEF10EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT8)"!=""
-    @echo $(DEF10EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT9)"!=""
-    @echo $(DEF10EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT10)"!=""
-    @echo $(DEF10EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT11)"!=""
-    @echo $(DEF10EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT12)"!=""
-    @echo $(DEF10EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT13)"!=""
-    @echo $(DEF10EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT14)"!=""
-    @echo $(DEF10EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT15)"!=""
-    @echo $(DEF10EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT16)"!=""
-    @echo $(DEF10EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT17)"!=""
-    @echo $(DEF10EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT18)"!=""
-    @echo $(DEF10EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT19)"!=""
-    @echo $(DEF10EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT20)"!=""
-    @echo $(DEF10EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORTFILE)"!=""
-    @fix_def_file < $(DEF10EXPORTFILE) >> $@.tmp_ord
-.ENDIF
-    @sort < $@.tmp_ord | uniq > $@.exptmpfile
-    @fix_def_ord < $@.exptmpfile >> $@.tmpfile
-    @+-$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
-    @+-$(RM) $@.tmp_ord
-    @+-$(RM) $@.exptmpfile
-    $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL10IMPLIBN:s/.lib/.a/) $@
-    $(COMMAND_ECHO)+emxomf -o $(SHL10IMPLIBN) $(SHL10IMPLIBN:s/.lib/.a/) 
-
-.ENDIF			# "$(GUI)"=="OS2"
-
 .IF "$(GUI)"=="UNX"
 $(DEF10TARGETN): \
         $(DEF10DEPN) \
diff --git a/solenv/inc/_tg_lib.mk b/solenv/inc/_tg_lib.mk
index 378c3230420b..5b6c463559f4 100644
--- a/solenv/inc/_tg_lib.mk
+++ b/solenv/inc/_tg_lib.mk
@@ -8,12 +8,6 @@ $(LIB1ARCHIV) :	$(LIB1TARGET)
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
     @-$(RM) $(MISC)/$(LIB1ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)/$(LIB1ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB1ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)/$(LIB1ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)/$(LIB1ARCHIV:b)_closetempl.cmd
-.ENDIF
     @echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB1ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @echo  ranlib $(LIB1ARCHIV) >> $(MISC)/$(LIB1ARCHIV:b).cmd
@@ -29,7 +23,7 @@ $(LIB1ARCHIV) :	$(LIB1TARGET)
 .IF "$(GUI)$(COM)"=="WNTGCC"
     @+-$(RM) $(MISC)/$(LIB1ARCHIV:b).cmd
     @+echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB1ARCHIV:b).cmd
-    @+echo  ranlib $(LIB1ARCHIV) >> $(MISC)/$(LIB1ARCHIV:b).cmd
+    @+echo $(RANLIB) $(LIB1ARCHIV) >> $(MISC)/$(LIB1ARCHIV:b).cmd
 .IF "$(VERBOSE)" == "TRUE"
     @cat $(MISC)/$(LIB1ARCHIV:b).cmd
 .ENDIF
@@ -62,17 +56,6 @@ $(LIB1TARGET) :	$(LIB1FILES) \
     @nm `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
-.ELIF "$(GUI)"=="OS2"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB1FILES) $(LIB1OBJFILES)
-    @+-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB1OBJFILES)"!=""    
-    @+$(TYPE) $(mktmp $(LIB1OBJFILES)) > $(null,$(LIB1OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB1OBJFILES)"!=""    
-.IF "$(LIB1FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB1FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB1FILES)"!=""    
-    @+$(ECHONL)
-
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
@@ -110,12 +93,6 @@ $(LIB2ARCHIV) :	$(LIB2TARGET)
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
     @-$(RM) $(MISC)/$(LIB2ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)/$(LIB2ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB2ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)/$(LIB2ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)/$(LIB2ARCHIV:b)_closetempl.cmd
-.ENDIF
     @echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB2ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @echo  ranlib $(LIB2ARCHIV) >> $(MISC)/$(LIB2ARCHIV:b).cmd
@@ -131,7 +108,7 @@ $(LIB2ARCHIV) :	$(LIB2TARGET)
 .IF "$(GUI)$(COM)"=="WNTGCC"
     @+-$(RM) $(MISC)/$(LIB2ARCHIV:b).cmd
     @+echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB2ARCHIV:b).cmd
-    @+echo  ranlib $(LIB2ARCHIV) >> $(MISC)/$(LIB2ARCHIV:b).cmd
+    @+echo $(RANLIB) $(LIB2ARCHIV) >> $(MISC)/$(LIB2ARCHIV:b).cmd
 .IF "$(VERBOSE)" == "TRUE"
     @cat $(MISC)/$(LIB2ARCHIV:b).cmd
 .ENDIF
@@ -164,17 +141,6 @@ $(LIB2TARGET) :	$(LIB2FILES) \
     @nm `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
-.ELIF "$(GUI)"=="OS2"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB2FILES) $(LIB2OBJFILES)
-    @+-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB2OBJFILES)"!=""    
-    @+$(TYPE) $(mktmp $(LIB2OBJFILES)) > $(null,$(LIB2OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB2OBJFILES)"!=""    
-.IF "$(LIB2FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB2FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB2FILES)"!=""    
-    @+$(ECHONL)
-
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
@@ -212,12 +178,6 @@ $(LIB3ARCHIV) :	$(LIB3TARGET)
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
     @-$(RM) $(MISC)/$(LIB3ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)/$(LIB3ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB3ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)/$(LIB3ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)/$(LIB3ARCHIV:b)_closetempl.cmd
-.ENDIF
     @echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB3ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @echo  ranlib $(LIB3ARCHIV) >> $(MISC)/$(LIB3ARCHIV:b).cmd
@@ -233,7 +193,7 @@ $(LIB3ARCHIV) :	$(LIB3TARGET)
 .IF "$(GUI)$(COM)"=="WNTGCC"
     @+-$(RM) $(MISC)/$(LIB3ARCHIV:b).cmd
     @+echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB3ARCHIV:b).cmd
-    @+echo  ranlib $(LIB3ARCHIV) >> $(MISC)/$(LIB3ARCHIV:b).cmd
+    @+echo $(RANLIB) $(LIB3ARCHIV) >> $(MISC)/$(LIB3ARCHIV:b).cmd
 .IF "$(VERBOSE)" == "TRUE"
     @cat $(MISC)/$(LIB3ARCHIV:b).cmd
 .ENDIF
@@ -266,17 +226,6 @@ $(LIB3TARGET) :	$(LIB3FILES) \
     @nm `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
-.ELIF "$(GUI)"=="OS2"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB3FILES) $(LIB3OBJFILES)
-    @+-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB3OBJFILES)"!=""    
-    @+$(TYPE) $(mktmp $(LIB3OBJFILES)) > $(null,$(LIB3OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB3OBJFILES)"!=""    
-.IF "$(LIB3FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB3FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB3FILES)"!=""    
-    @+$(ECHONL)
-
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
@@ -314,12 +263,6 @@ $(LIB4ARCHIV) :	$(LIB4TARGET)
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
     @-$(RM) $(MISC)/$(LIB4ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)/$(LIB4ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB4ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)/$(LIB4ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)/$(LIB4ARCHIV:b)_closetempl.cmd
-.ENDIF
     @echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB4ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @echo  ranlib $(LIB4ARCHIV) >> $(MISC)/$(LIB4ARCHIV:b).cmd
@@ -335,7 +278,7 @@ $(LIB4ARCHIV) :	$(LIB4TARGET)
 .IF "$(GUI)$(COM)"=="WNTGCC"
     @+-$(RM) $(MISC)/$(LIB4ARCHIV:b).cmd
     @+echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB4ARCHIV:b).cmd
-    @+echo  ranlib $(LIB4ARCHIV) >> $(MISC)/$(LIB4ARCHIV:b).cmd
+    @+echo $(RANLIB) $(LIB4ARCHIV) >> $(MISC)/$(LIB4ARCHIV:b).cmd
 .IF "$(VERBOSE)" == "TRUE"
     @cat $(MISC)/$(LIB4ARCHIV:b).cmd
 .ENDIF
@@ -368,17 +311,6 @@ $(LIB4TARGET) :	$(LIB4FILES) \
     @nm `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
-.ELIF "$(GUI)"=="OS2"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB4FILES) $(LIB4OBJFILES)
-    @+-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB4OBJFILES)"!=""    
-    @+$(TYPE) $(mktmp $(LIB4OBJFILES)) > $(null,$(LIB4OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB4OBJFILES)"!=""    
-.IF "$(LIB4FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB4FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB4FILES)"!=""    
-    @+$(ECHONL)
-
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
@@ -416,12 +348,6 @@ $(LIB5ARCHIV) :	$(LIB5TARGET)
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
     @-$(RM) $(MISC)/$(LIB5ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)/$(LIB5ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB5ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)/$(LIB5ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)/$(LIB5ARCHIV:b)_closetempl.cmd
-.ENDIF
     @echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB5ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @echo  ranlib $(LIB5ARCHIV) >> $(MISC)/$(LIB5ARCHIV:b).cmd
@@ -437,7 +363,7 @@ $(LIB5ARCHIV) :	$(LIB5TARGET)
 .IF "$(GUI)$(COM)"=="WNTGCC"
     @+-$(RM) $(MISC)/$(LIB5ARCHIV:b).cmd
     @+echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB5ARCHIV:b).cmd
-    @+echo  ranlib $(LIB5ARCHIV) >> $(MISC)/$(LIB5ARCHIV:b).cmd
+    @+echo $(RANLIB) $(LIB5ARCHIV) >> $(MISC)/$(LIB5ARCHIV:b).cmd
 .IF "$(VERBOSE)" == "TRUE"
     @cat $(MISC)/$(LIB5ARCHIV:b).cmd
 .ENDIF
@@ -470,17 +396,6 @@ $(LIB5TARGET) :	$(LIB5FILES) \
     @nm `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
-.ELIF "$(GUI)"=="OS2"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB5FILES) $(LIB5OBJFILES)
-    @+-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB5OBJFILES)"!=""    
-    @+$(TYPE) $(mktmp $(LIB5OBJFILES)) > $(null,$(LIB5OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB5OBJFILES)"!=""    
-.IF "$(LIB5FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB5FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB5FILES)"!=""    
-    @+$(ECHONL)
-
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
@@ -518,12 +433,6 @@ $(LIB6ARCHIV) :	$(LIB6TARGET)
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
     @-$(RM) $(MISC)/$(LIB6ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)/$(LIB6ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB6ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)/$(LIB6ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)/$(LIB6ARCHIV:b)_closetempl.cmd
-.ENDIF
     @echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB6ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @echo  ranlib $(LIB6ARCHIV) >> $(MISC)/$(LIB6ARCHIV:b).cmd
@@ -539,7 +448,7 @@ $(LIB6ARCHIV) :	$(LIB6TARGET)
 .IF "$(GUI)$(COM)"=="WNTGCC"
     @+-$(RM) $(MISC)/$(LIB6ARCHIV:b).cmd
     @+echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB6ARCHIV:b).cmd
-    @+echo  ranlib $(LIB6ARCHIV) >> $(MISC)/$(LIB6ARCHIV:b).cmd
+    @+echo $(RANLIB) $(LIB6ARCHIV) >> $(MISC)/$(LIB6ARCHIV:b).cmd
 .IF "$(VERBOSE)" == "TRUE"
     @cat $(MISC)/$(LIB6ARCHIV:b).cmd
 .ENDIF
@@ -572,17 +481,6 @@ $(LIB6TARGET) :	$(LIB6FILES) \
     @nm `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
-.ELIF "$(GUI)"=="OS2"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB6FILES) $(LIB6OBJFILES)
-    @+-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB6OBJFILES)"!=""    
-    @+$(TYPE) $(mktmp $(LIB6OBJFILES)) > $(null,$(LIB6OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB6OBJFILES)"!=""    
-.IF "$(LIB6FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB6FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB6FILES)"!=""    
-    @+$(ECHONL)
-
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
@@ -620,12 +518,6 @@ $(LIB7ARCHIV) :	$(LIB7TARGET)
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
     @-$(RM) $(MISC)/$(LIB7ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)/$(LIB7ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB7ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)/$(LIB7ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)/$(LIB7ARCHIV:b)_closetempl.cmd
-.ENDIF
     @echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB7ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @echo  ranlib $(LIB7ARCHIV) >> $(MISC)/$(LIB7ARCHIV:b).cmd
@@ -641,7 +533,7 @@ $(LIB7ARCHIV) :	$(LIB7TARGET)
 .IF "$(GUI)$(COM)"=="WNTGCC"
     @+-$(RM) $(MISC)/$(LIB7ARCHIV:b).cmd
     @+echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB7ARCHIV:b).cmd
-    @+echo  ranlib $(LIB7ARCHIV) >> $(MISC)/$(LIB7ARCHIV:b).cmd
+    @+echo $(RANLIB) $(LIB7ARCHIV) >> $(MISC)/$(LIB7ARCHIV:b).cmd
 .IF "$(VERBOSE)" == "TRUE"
     @cat $(MISC)/$(LIB7ARCHIV:b).cmd
 .ENDIF
@@ -674,17 +566,6 @@ $(LIB7TARGET) :	$(LIB7FILES) \
     @nm `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
-.ELIF "$(GUI)"=="OS2"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB7FILES) $(LIB7OBJFILES)
-    @+-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB7OBJFILES)"!=""    
-    @+$(TYPE) $(mktmp $(LIB7OBJFILES)) > $(null,$(LIB7OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB7OBJFILES)"!=""    
-.IF "$(LIB7FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB7FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB7FILES)"!=""    
-    @+$(ECHONL)
-
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
@@ -722,12 +603,6 @@ $(LIB8ARCHIV) :	$(LIB8TARGET)
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
     @-$(RM) $(MISC)/$(LIB8ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)/$(LIB8ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB8ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)/$(LIB8ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)/$(LIB8ARCHIV:b)_closetempl.cmd
-.ENDIF
     @echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB8ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @echo  ranlib $(LIB8ARCHIV) >> $(MISC)/$(LIB8ARCHIV:b).cmd
@@ -743,7 +618,7 @@ $(LIB8ARCHIV) :	$(LIB8TARGET)
 .IF "$(GUI)$(COM)"=="WNTGCC"
     @+-$(RM) $(MISC)/$(LIB8ARCHIV:b).cmd
     @+echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB8ARCHIV:b).cmd
-    @+echo  ranlib $(LIB8ARCHIV) >> $(MISC)/$(LIB8ARCHIV:b).cmd
+    @+echo $(RANLIB) $(LIB8ARCHIV) >> $(MISC)/$(LIB8ARCHIV:b).cmd
 .IF "$(VERBOSE)" == "TRUE"
     @cat $(MISC)/$(LIB8ARCHIV:b).cmd
 .ENDIF
@@ -776,17 +651,6 @@ $(LIB8TARGET) :	$(LIB8FILES) \
     @nm `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
-.ELIF "$(GUI)"=="OS2"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB8FILES) $(LIB8OBJFILES)
-    @+-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB8OBJFILES)"!=""    
-    @+$(TYPE) $(mktmp $(LIB8OBJFILES)) > $(null,$(LIB8OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB8OBJFILES)"!=""    
-.IF "$(LIB8FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB8FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB8FILES)"!=""    
-    @+$(ECHONL)
-
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
@@ -824,12 +688,6 @@ $(LIB9ARCHIV) :	$(LIB9TARGET)
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
     @-$(RM) $(MISC)/$(LIB9ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)/$(LIB9ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB9ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)/$(LIB9ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)/$(LIB9ARCHIV:b)_closetempl.cmd
-.ENDIF
     @echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB9ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @echo  ranlib $(LIB9ARCHIV) >> $(MISC)/$(LIB9ARCHIV:b).cmd
@@ -845,7 +703,7 @@ $(LIB9ARCHIV) :	$(LIB9TARGET)
 .IF "$(GUI)$(COM)"=="WNTGCC"
     @+-$(RM) $(MISC)/$(LIB9ARCHIV:b).cmd
     @+echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB9ARCHIV:b).cmd
-    @+echo  ranlib $(LIB9ARCHIV) >> $(MISC)/$(LIB9ARCHIV:b).cmd
+    @+echo $(RANLIB) $(LIB9ARCHIV) >> $(MISC)/$(LIB9ARCHIV:b).cmd
 .IF "$(VERBOSE)" == "TRUE"
     @cat $(MISC)/$(LIB9ARCHIV:b).cmd
 .ENDIF
@@ -878,17 +736,6 @@ $(LIB9TARGET) :	$(LIB9FILES) \
     @nm `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
-.ELIF "$(GUI)"=="OS2"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB9FILES) $(LIB9OBJFILES)
-    @+-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB9OBJFILES)"!=""    
-    @+$(TYPE) $(mktmp $(LIB9OBJFILES)) > $(null,$(LIB9OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB9OBJFILES)"!=""    
-.IF "$(LIB9FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB9FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB9FILES)"!=""    
-    @+$(ECHONL)
-
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
@@ -926,12 +773,6 @@ $(LIB10ARCHIV) :	$(LIB10TARGET)
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
     @-$(RM) $(MISC)/$(LIB10ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)/$(LIB10ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB10ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)/$(LIB10ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)/$(LIB10ARCHIV:b)_closetempl.cmd
-.ENDIF
     @echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB10ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @echo  ranlib $(LIB10ARCHIV) >> $(MISC)/$(LIB10ARCHIV:b).cmd
@@ -980,17 +821,6 @@ $(LIB10TARGET) :	$(LIB10FILES) \
     @nm `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
-.ELIF "$(GUI)"=="OS2"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB10FILES) $(LIB10OBJFILES)
-    @+-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB10OBJFILES)"!=""    
-    @+$(TYPE) $(mktmp $(LIB10OBJFILES)) > $(null,$(LIB10OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB10OBJFILES)"!=""    
-.IF "$(LIB10FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB10FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB10FILES)"!=""    
-    @+$(ECHONL)
-
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk
index 561b4224e649..1edebb8a04df 100755
--- a/solenv/inc/_tg_rslb.mk
+++ b/solenv/inc/_tg_rslb.mk
@@ -13,12 +13,11 @@ $(RSC_MULTI1) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB1NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC1HEADER) $(RESLIB1SRSFILES) \
@@ -29,12 +28,11 @@ $(RSC_MULTI1) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB1NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC1HEADER) $(RESLIB1SRSFILES) \
@@ -76,12 +74,11 @@ $(RSC_MULTI2) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB2NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC2HEADER) $(RESLIB2SRSFILES) \
@@ -92,12 +89,11 @@ $(RSC_MULTI2) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB2NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC2HEADER) $(RESLIB2SRSFILES) \
@@ -139,12 +135,11 @@ $(RSC_MULTI3) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB3NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC3HEADER) $(RESLIB3SRSFILES) \
@@ -155,12 +150,11 @@ $(RSC_MULTI3) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB3NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC3HEADER) $(RESLIB3SRSFILES) \
@@ -202,12 +196,11 @@ $(RSC_MULTI4) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB4NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC4HEADER) $(RESLIB4SRSFILES) \
@@ -218,12 +211,11 @@ $(RSC_MULTI4) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB4NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC4HEADER) $(RESLIB4SRSFILES) \
@@ -265,12 +257,11 @@ $(RSC_MULTI5) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB5NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC5HEADER) $(RESLIB5SRSFILES) \
@@ -281,12 +272,11 @@ $(RSC_MULTI5) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB5NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC5HEADER) $(RESLIB5SRSFILES) \
@@ -328,12 +318,11 @@ $(RSC_MULTI6) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB6NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC6HEADER) $(RESLIB6SRSFILES) \
@@ -344,12 +333,11 @@ $(RSC_MULTI6) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB6NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC6HEADER) $(RESLIB6SRSFILES) \
@@ -391,12 +379,11 @@ $(RSC_MULTI7) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB7NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC7HEADER) $(RESLIB7SRSFILES) \
@@ -407,12 +394,11 @@ $(RSC_MULTI7) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB7NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC7HEADER) $(RESLIB7SRSFILES) \
@@ -454,12 +440,11 @@ $(RSC_MULTI8) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB8NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC8HEADER) $(RESLIB8SRSFILES) \
@@ -470,12 +455,11 @@ $(RSC_MULTI8) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB8NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC8HEADER) $(RESLIB8SRSFILES) \
@@ -517,12 +501,11 @@ $(RSC_MULTI9) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB9NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC9HEADER) $(RESLIB9SRSFILES) \
@@ -533,12 +516,11 @@ $(RSC_MULTI9) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB9NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC9HEADER) $(RESLIB9SRSFILES) \
@@ -580,12 +562,11 @@ $(RSC_MULTI10) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB10NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC10HEADER) $(RESLIB10SRSFILES) \
@@ -596,12 +577,11 @@ $(RSC_MULTI10) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB10NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC10HEADER) $(RESLIB10SRSFILES) \
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index ac930bdd8a08..4f1d099dbdf8 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -2,10 +2,6 @@
 
 .IF "$(SHL1TARGETN)"!=""
 
-.IF "$(OS)"=="AIX"
-SHL1STDLIBS=
-.ENDIF
-
 .IF "$(SHLLINKARCONLY)" != ""
 SHL1STDLIBS=
 STDSHL=
@@ -62,20 +58,23 @@ $(MISC)/$(SHL1VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL1VERSIO
 .ENDIF
 
 .IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)" == "WNT"
 .IF "$(SHL1IMPLIB)" == ""
 SHL1IMPLIB=i$(TARGET)_t1
 .ENDIF			# "$(SHL1IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
 USE_1IMPLIB=-implib:$(LB)/$(SHL1IMPLIB).lib
-.ENDIF			# "$(COM)" != "GCC"
 SHL1IMPLIBN=$(LB)/$(SHL1IMPLIB).lib
+.ELSE
+SHL1IMPLIBN=$(LB)/lib$(SHL1IMPLIB).dll.a
+USE_1IMPLIB=-Wl,--out-implib=$(SHL1IMPLIBN)
+.ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL1IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
 USE_1IMPLIB_DEPS=$(LB)/$(SHL1IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.ENDIF			# "$(GUI)" == "WNT"
 USE_SHL1DEF=$(SHL1DEF)
 .ELSE			# "$(GUI)" != "UNX"
 USE_SHL1DEF=
@@ -100,7 +99,9 @@ $(USE_SHL1VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL1VERSIONMAP)"!=""
 
+.IF "$(OS)" != "AIX"
 SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP)
+.ENDIF
 
 $(USE_SHL1VERSIONMAP): \
                     $(SHL1OBJS)\
@@ -137,7 +138,9 @@ $(USE_SHL1VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL1VERSIONMAP)"!=""
 USE_SHL1VERSIONMAP=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET)$(SHL1VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
 SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP)
+.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL1VERSIONMAP): $(SHL1OBJS) $(SHL1LIBS)
@@ -185,7 +188,7 @@ $(USE_SHL1VERSIONMAP) .ERRREMOVE: $(SHL1VERSIONMAP)
 .ENDIF			# "$(GUI)" != "UNX"
 
 .IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
 .IF "$(GUI)"=="UNX"
 SHL1SONAME=\"$(SONAME_SWITCH)$(SHL1TARGETN:f)\"
 .ENDIF			# "$(GUI)"!="UNX"
@@ -208,7 +211,7 @@ SHL1LINKRESO*=$(MISC)/$(SHL1TARGET)_res.o
 #.IF "$(SHL1TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL1LIBS)"!=""
 $(MISC)/$(SHL1TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -221,7 +224,7 @@ $(SHL1TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
 .IF "$(SHL1USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL1LIBS)"!=""
 SHL1LINKLIST=$(MISC)/$(SHL1TARGET)_link.lst
@@ -238,20 +241,6 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
-.IF "$(GUI)" == "OS2"
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL1TARGET8=$(shell @fix_shl $(SHL1TARGET))
-.ENDIF
-
-.IF "$(GUI)" == "OS2"
-_SHL1IMP_ORD = $(SHL1STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL1STDLIBS:^"$(LB)/") 
-SHL1IMP_ORD = $(foreach,i,$(_SHL1IMP_ORD) $(shell @-ls $i))
-.ELSE
-SHL1IMP_ORD = 
-.ENDIF
-
-
 $(SHL1TARGETN) : \
                     $(SHL1OBJS)\
                     $(SHL1LIBS)\
@@ -260,7 +249,6 @@ $(SHL1TARGETN) : \
                     $(USE_SHL1VERSIONMAP)\
                     $(SHL1RES)\
                     $(SHL1DEPN) \
-                    $(SHL1IMP_ORD) \
                     $(SHL1LINKLIST)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
@@ -282,39 +270,69 @@ $(SHL1TARGETN) : \
     @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
     @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL1DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL1DEFAULTRES:b).rc
+.IF "$(RCFLAGSOUTRES)"!=""
+# rc, takes separate flag naming output file, source .rc file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL1DEFAULTRES) $(MISC)/$(SHL1DEFAULTRES:b).rc
+.ELSE
+# windres, just takes output file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL1DEFAULTRES:b).rc $(SHL1DEFAULTRES)
+.ENDIF
 .ENDIF			# "$(SHL1DEFAULTRES)"!=""
 .IF "$(SHL1ALLRES)"!=""
     $(COMMAND_ECHO)$(TYPE) $(SHL1ALLRES) > $(SHL1LINKRES)
 .IF "$(COM)"=="GCC"
-    windres $(SHL1LINKRES) $(SHL1LINKRESO)
+    $(WINDRES) $(SHL1LINKRES) $(SHL1LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL1ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --dllname $(SHL1TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_1.cmd
+# GNU ld since 2.17 supports @cmdfile syntax
+.IF "$(USE_DEFFILE)"!=""
+    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL1LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(SHL1DEF) \
+        $(USE_1IMPLIB) \
+        $(STDOBJ) \
+        $(SHL1VERSIONOBJ) $(SHL1OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL1LIBS))) \
+        -Wl,--exclude-libs,ALL,--start-group $(SHL1STDLIBS) -Wl,--end-group \
+        $(SHL1STDSHL) $(STDSHL1) \
+        $(SHL1LINKRESO) \
+    ))
+.ELSE
     @noop $(assign ALL1OBJLIST:=$(STDOBJ) $(SHL1OBJS) $(SHL1LINKRESO) $(shell $(TYPE) /dev/null $(SHL1LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB1NAME)"!=""	# do not have to include objs
     @noop $(assign DEF1OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF1OBJLIST) $(assign ALL1OBJLIST:=$(ALL1OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB1NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_1.cmd
-.IF "$(SHL1DEF)"!=""
-    @echo	--input-def $(SHL1DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_1.cmd
-.ELSE
-    @echo	$(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_1.cmd
-.ENDIF
-    @echo	$(ALL1OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_1.cmd
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
-        $(STDOBJ) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) $(SHL1OBJS) $(SHL1LINKRESO) \
-        `$(TYPE) /dev/null $(SHL1LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
+        --dllname $(SHL1TARGET)$(DLLPOST) \
+        --kill-at \
+        --output-exp $(MISC)/$(@:b)_exp.o \
+        $(SHL1VERSIONOBJ) \
+        @(ALL1OBJLIST)
+    )
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL1LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(MISC)/$(@:b)_exp.o \
+        $(USE_1IMPLIB) \
+        $(STDOBJ) \
+        $(SHL1VERSIONOBJ) $(SHL1OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL1LIBS))) \
         -Wl,--exclude-libs,ALL,--start-group $(SHL1STDLIBS) -Wl,--end-group \
-        $(SHL1STDSHL) $(STDSHL1) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_1.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_1.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
+        $(SHL1STDSHL) $(STDSHL1) \
+        $(SHL1LINKRESO) \
+    ))
+.ENDIF
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL1USE_EXPORTS)"!="name"
@@ -429,7 +447,7 @@ $(SHL1TARGETN) : \
     @echo $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
     $(SHL1VERSIONOBJ) \
     `cat /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
     $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_1.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_1.cmd` \
@@ -449,6 +467,9 @@ $(SHL1TARGETN) : \
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN)
 .ENDIF				# "$(SHL1NOCHECK)"!=""
 .ENDIF
+.ELIF "$(OS)"=="IOS"
+    $(COMMAND_ECHO)$(AR) $(LIB1FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL1OBJS)) $(shell cat /dev/null $(LIB1TARGET) $(SHL1LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
+    $(COMMAND_ECHO)$(RANLIB) $@
 .ELSE			# "$(OS)"=="MACOSX"
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd
     @echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
@@ -471,7 +492,7 @@ $(SHL1TARGETN) : \
 .ENDIF				# "$(SHL1NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!=""
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
     $(COMMAND_ECHO)$(RM) $(LB)/$(SHL1TARGETN:b)
     $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL1TARGETN:f) $(SHL1TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -480,75 +501,12 @@ $(SHL1TARGETN) : \
 .ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
-.IF "$(GUI)" == "OS2"
-
-.IF "$(SHL1DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)/$(SHL1DEFAULTRES:b).rc >& $(NULLDEV)
-.IF "$(SHL1ICON)" != ""
-    @-+echo 1 ICON $(SHL1ICON) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL1ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL1ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL1DEFAULTRES:b).rc
-.ENDIF			# "$(SHL1ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL1DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-# YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL1DEFAULTRES:b).rc
-.ENDIF			# "$(SHL1DEFAULTRES)"!=""
-
-.IF "$(SHL1ALLRES)"!=""
-    $(COMMAND_ECHO)+$(TYPE) $(SHL1ALLRES) > $(SHL1LINKRES)
-.ENDIF			# "$(SHL1ALLRES)"!=""
-
-.IF "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL1LINKER) $(SHL1LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
-        $(SHL1DEF) \
-        $(STDOBJ) \
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL1OBJS) $(SHL1VERSIONOBJ) \
-        $(SHL1LIBS) \
-        $(SHL1STDLIBS:^"-l") \
-        $(SHL1LINKRES) \
-        $(SHL1STDSHL:^"-l") $(STDSHL1:^"-l") 
-
-.ELSE			# "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL1LINKER) -v 	$(SHL1LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL1BASEX)		\
-        $(SHL1STACK) -o $(SHL1TARGETN)	\
-        $(SHL1DEF) \
-        $(STDOBJ)							\
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL1OBJS) $(SHL1VERSIONOBJ) \
-        $(SHL1LIBS) \
-        $(SHL1STDLIBS:^"-l") \
-        $(SHL1LINKRES) \
-        $(SHL1STDSHL:^"-l") $(STDSHL1:^"-l")                           \
-    @$(LS) $@ >& $(NULLDEV)
-
-.ENDIF			# "$(USE_DEFFILE)"!=""
-
-.IF "$(SHL1TARGET8)" != "$(SHL1TARGET)"
-    $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL1TARGET8).dll
-.ENDIF
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(SHL1TARGETN)"!=""
 
 # unroll begin
 
 .IF "$(SHL2TARGETN)"!=""
 
-.IF "$(OS)"=="AIX"
-SHL2STDLIBS=
-.ENDIF
-
 .IF "$(SHLLINKARCONLY)" != ""
 SHL2STDLIBS=
 STDSHL=
@@ -605,20 +563,23 @@ $(MISC)/$(SHL2VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL2VERSIO
 .ENDIF
 
 .IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)" == "WNT"
 .IF "$(SHL2IMPLIB)" == ""
 SHL2IMPLIB=i$(TARGET)_t2
 .ENDIF			# "$(SHL2IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
 USE_2IMPLIB=-implib:$(LB)/$(SHL2IMPLIB).lib
-.ENDIF			# "$(COM)" != "GCC"
 SHL2IMPLIBN=$(LB)/$(SHL2IMPLIB).lib
+.ELSE
+SHL2IMPLIBN=$(LB)/lib$(SHL2IMPLIB).dll.a
+USE_2IMPLIB=-Wl,--out-implib=$(SHL2IMPLIBN)
+.ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL2IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
 USE_2IMPLIB_DEPS=$(LB)/$(SHL2IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.ENDIF			# "$(GUI)" == "WNT"
 USE_SHL2DEF=$(SHL2DEF)
 .ELSE			# "$(GUI)" != "UNX"
 USE_SHL2DEF=
@@ -643,7 +604,9 @@ $(USE_SHL2VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL2VERSIONMAP)"!=""
 
+.IF "$(OS)" != "AIX"
 SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP)
+.ENDIF
 
 $(USE_SHL2VERSIONMAP): \
                     $(SHL2OBJS)\
@@ -680,7 +643,9 @@ $(USE_SHL2VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL2VERSIONMAP)"!=""
 USE_SHL2VERSIONMAP=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET)$(SHL2VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
 SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP)
+.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL2VERSIONMAP): $(SHL2OBJS) $(SHL2LIBS)
@@ -728,7 +693,7 @@ $(USE_SHL2VERSIONMAP) .ERRREMOVE: $(SHL2VERSIONMAP)
 .ENDIF			# "$(GUI)" != "UNX"
 
 .IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
 .IF "$(GUI)"=="UNX"
 SHL2SONAME=\"$(SONAME_SWITCH)$(SHL2TARGETN:f)\"
 .ENDIF			# "$(GUI)"!="UNX"
@@ -751,7 +716,7 @@ SHL2LINKRESO*=$(MISC)/$(SHL2TARGET)_res.o
 #.IF "$(SHL2TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL2LIBS)"!=""
 $(MISC)/$(SHL2TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -764,7 +729,7 @@ $(SHL2TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
 .IF "$(SHL2USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL2LIBS)"!=""
 SHL2LINKLIST=$(MISC)/$(SHL2TARGET)_link.lst
@@ -781,20 +746,6 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
-.IF "$(GUI)" == "OS2"
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL2TARGET8=$(shell @fix_shl $(SHL2TARGET))
-.ENDIF
-
-.IF "$(GUI)" == "OS2"
-_SHL2IMP_ORD = $(SHL2STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL2STDLIBS:^"$(LB)/") 
-SHL2IMP_ORD = $(foreach,i,$(_SHL2IMP_ORD) $(shell @-ls $i))
-.ELSE
-SHL2IMP_ORD = 
-.ENDIF
-
-
 $(SHL2TARGETN) : \
                     $(SHL2OBJS)\
                     $(SHL2LIBS)\
@@ -803,7 +754,6 @@ $(SHL2TARGETN) : \
                     $(USE_SHL2VERSIONMAP)\
                     $(SHL2RES)\
                     $(SHL2DEPN) \
-                    $(SHL2IMP_ORD) \
                     $(SHL2LINKLIST)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
@@ -825,39 +775,69 @@ $(SHL2TARGETN) : \
     @echo $(EMQ)#define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
     @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL2DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL2DEFAULTRES:b).rc
+.IF "$(RCFLAGSOUTRES)"!=""
+# rc, takes separate flag naming output file, source .rc file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL2DEFAULTRES) $(MISC)/$(SHL2DEFAULTRES:b).rc
+.ELSE
+# windres, just takes output file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL2DEFAULTRES:b).rc $(SHL2DEFAULTRES)
+.ENDIF
 .ENDIF			# "$(SHL2DEFAULTRES)"!=""
 .IF "$(SHL2ALLRES)"!=""
     $(COMMAND_ECHO)$(TYPE) $(SHL2ALLRES) > $(SHL2LINKRES)
 .IF "$(COM)"=="GCC"
-    windres $(SHL2LINKRES) $(SHL2LINKRESO)
+    $(WINDRES) $(SHL2LINKRES) $(SHL2LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL2ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --dllname $(SHL2TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_2.cmd
+# GNU ld since 2.17 supports @cmdfile syntax
+.IF "$(USE_DEFFILE)"!=""
+    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL2LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(SHL2DEF) \
+        $(USE_2IMPLIB) \
+        $(STDOBJ) \
+        $(SHL2VERSIONOBJ) $(SHL2OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL2LIBS))) \
+        -Wl,--exclude-libs,ALL,--start-group $(SHL2STDLIBS) -Wl,--end-group \
+        $(SHL2STDSHL) $(STDSHL2) \
+        $(SHL2LINKRESO) \
+    ))
+.ELSE
     @noop $(assign ALL2OBJLIST:=$(STDOBJ) $(SHL2OBJS) $(SHL2LINKRESO) $(shell $(TYPE) /dev/null $(SHL2LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB2NAME)"!=""	# do not have to include objs
     @noop $(assign DEF2OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF2OBJLIST) $(assign ALL2OBJLIST:=$(ALL2OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB2NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_2.cmd
-.IF "$(SHL2DEF)"!=""
-    @echo	--input-def $(SHL2DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_2.cmd
-.ELSE
-    @echo	$(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_2.cmd
-.ENDIF
-    @echo	$(ALL2OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_2.cmd
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
-        $(STDOBJ) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) $(SHL2OBJS) $(SHL2LINKRESO) \
-        `$(TYPE) /dev/null $(SHL2LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
+        --dllname $(SHL2TARGET)$(DLLPOST) \
+        --kill-at \
+        --output-exp $(MISC)/$(@:b)_exp.o \
+        $(SHL2VERSIONOBJ) \
+        @(ALL2OBJLIST)
+    )
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL2LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(MISC)/$(@:b)_exp.o \
+        $(USE_2IMPLIB) \
+        $(STDOBJ) \
+        $(SHL2VERSIONOBJ) $(SHL2OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL2LIBS))) \
         -Wl,--exclude-libs,ALL,--start-group $(SHL2STDLIBS) -Wl,--end-group \
-        $(SHL2STDSHL) $(STDSHL2) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_2.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_2.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
+        $(SHL2STDSHL) $(STDSHL2) \
+        $(SHL2LINKRESO) \
+    ))
+.ENDIF
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL2USE_EXPORTS)"!="name"
@@ -972,7 +952,7 @@ $(SHL2TARGETN) : \
     @echo $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
     $(SHL2VERSIONOBJ) \
     `cat /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
     $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_2.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_2.cmd` \
@@ -992,6 +972,9 @@ $(SHL2TARGETN) : \
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN)
 .ENDIF				# "$(SHL2NOCHECK)"!=""
 .ENDIF
+.ELIF "$(OS)"=="IOS"
+    $(COMMAND_ECHO)$(AR) $(LIB2FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL2OBJS)) $(shell cat /dev/null $(LIB2TARGET) $(SHL2LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
+    $(COMMAND_ECHO)$(RANLIB) $@
 .ELSE			# "$(OS)"=="MACOSX"
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd
     @echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
@@ -1014,7 +997,7 @@ $(SHL2TARGETN) : \
 .ENDIF				# "$(SHL2NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!=""
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
     $(COMMAND_ECHO)$(RM) $(LB)/$(SHL2TARGETN:b)
     $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL2TARGETN:f) $(SHL2TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -1023,75 +1006,12 @@ $(SHL2TARGETN) : \
 .ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
-.IF "$(GUI)" == "OS2"
-
-.IF "$(SHL2DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)/$(SHL2DEFAULTRES:b).rc >& $(NULLDEV)
-.IF "$(SHL2ICON)" != ""
-    @-+echo 1 ICON $(SHL2ICON) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL2ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL2ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL2DEFAULTRES:b).rc
-.ENDIF			# "$(SHL2ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL2DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-# YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL2DEFAULTRES:b).rc
-.ENDIF			# "$(SHL2DEFAULTRES)"!=""
-
-.IF "$(SHL2ALLRES)"!=""
-    $(COMMAND_ECHO)+$(TYPE) $(SHL2ALLRES) > $(SHL2LINKRES)
-.ENDIF			# "$(SHL2ALLRES)"!=""
-
-.IF "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL2LINKER) $(SHL2LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
-        $(SHL2DEF) \
-        $(STDOBJ) \
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL2OBJS) $(SHL2VERSIONOBJ) \
-        $(SHL2LIBS) \
-        $(SHL2STDLIBS:^"-l") \
-        $(SHL2LINKRES) \
-        $(SHL2STDSHL:^"-l") $(STDSHL2:^"-l") 
-
-.ELSE			# "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL2LINKER) -v 	$(SHL2LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL2BASEX)		\
-        $(SHL2STACK) -o $(SHL2TARGETN)	\
-        $(SHL2DEF) \
-        $(STDOBJ)							\
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL2OBJS) $(SHL2VERSIONOBJ) \
-        $(SHL2LIBS) \
-        $(SHL2STDLIBS:^"-l") \
-        $(SHL2LINKRES) \
-        $(SHL2STDSHL:^"-l") $(STDSHL2:^"-l")                           \
-    @$(LS) $@ >& $(NULLDEV)
-
-.ENDIF			# "$(USE_DEFFILE)"!=""
-
-.IF "$(SHL2TARGET8)" != "$(SHL2TARGET)"
-    $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL2TARGET8).dll
-.ENDIF
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(SHL2TARGETN)"!=""
 
 # unroll begin
 
 .IF "$(SHL3TARGETN)"!=""
 
-.IF "$(OS)"=="AIX"
-SHL3STDLIBS=
-.ENDIF
-
 .IF "$(SHLLINKARCONLY)" != ""
 SHL3STDLIBS=
 STDSHL=
@@ -1148,20 +1068,23 @@ $(MISC)/$(SHL3VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL3VERSIO
 .ENDIF
 
 .IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)" == "WNT"
 .IF "$(SHL3IMPLIB)" == ""
 SHL3IMPLIB=i$(TARGET)_t3
 .ENDIF			# "$(SHL3IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
 USE_3IMPLIB=-implib:$(LB)/$(SHL3IMPLIB).lib
-.ENDIF			# "$(COM)" != "GCC"
 SHL3IMPLIBN=$(LB)/$(SHL3IMPLIB).lib
+.ELSE
+SHL3IMPLIBN=$(LB)/lib$(SHL3IMPLIB).dll.a
+USE_3IMPLIB=-Wl,--out-implib=$(SHL3IMPLIBN)
+.ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL3IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
 USE_3IMPLIB_DEPS=$(LB)/$(SHL3IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.ENDIF			# "$(GUI)" == "WNT"
 USE_SHL3DEF=$(SHL3DEF)
 .ELSE			# "$(GUI)" != "UNX"
 USE_SHL3DEF=
@@ -1186,7 +1109,9 @@ $(USE_SHL3VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL3VERSIONMAP)"!=""
 
+.IF "$(OS)" != "AIX"
 SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP)
+.ENDIF
 
 $(USE_SHL3VERSIONMAP): \
                     $(SHL3OBJS)\
@@ -1223,7 +1148,9 @@ $(USE_SHL3VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL3VERSIONMAP)"!=""
 USE_SHL3VERSIONMAP=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET)$(SHL3VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
 SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP)
+.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL3VERSIONMAP): $(SHL3OBJS) $(SHL3LIBS)
@@ -1271,7 +1198,7 @@ $(USE_SHL3VERSIONMAP) .ERRREMOVE: $(SHL3VERSIONMAP)
 .ENDIF			# "$(GUI)" != "UNX"
 
 .IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
 .IF "$(GUI)"=="UNX"
 SHL3SONAME=\"$(SONAME_SWITCH)$(SHL3TARGETN:f)\"
 .ENDIF			# "$(GUI)"!="UNX"
@@ -1294,7 +1221,7 @@ SHL3LINKRESO*=$(MISC)/$(SHL3TARGET)_res.o
 #.IF "$(SHL3TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL3LIBS)"!=""
 $(MISC)/$(SHL3TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -1307,7 +1234,7 @@ $(SHL3TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
 .IF "$(SHL3USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL3LIBS)"!=""
 SHL3LINKLIST=$(MISC)/$(SHL3TARGET)_link.lst
@@ -1324,20 +1251,6 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
-.IF "$(GUI)" == "OS2"
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL3TARGET8=$(shell @fix_shl $(SHL3TARGET))
-.ENDIF
-
-.IF "$(GUI)" == "OS2"
-_SHL3IMP_ORD = $(SHL3STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL3STDLIBS:^"$(LB)/") 
-SHL3IMP_ORD = $(foreach,i,$(_SHL3IMP_ORD) $(shell @-ls $i))
-.ELSE
-SHL3IMP_ORD = 
-.ENDIF
-
-
 $(SHL3TARGETN) : \
                     $(SHL3OBJS)\
                     $(SHL3LIBS)\
@@ -1346,7 +1259,6 @@ $(SHL3TARGETN) : \
                     $(USE_SHL3VERSIONMAP)\
                     $(SHL3RES)\
                     $(SHL3DEPN) \
-                    $(SHL3IMP_ORD) \
                     $(SHL3LINKLIST)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
@@ -1368,39 +1280,69 @@ $(SHL3TARGETN) : \
     @echo $(EMQ)#define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
     @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL3DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL3DEFAULTRES:b).rc
+.IF "$(RCFLAGSOUTRES)"!=""
+# rc, takes separate flag naming output file, source .rc file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL3DEFAULTRES) $(MISC)/$(SHL3DEFAULTRES:b).rc
+.ELSE
+# windres, just takes output file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL3DEFAULTRES:b).rc $(SHL3DEFAULTRES)
+.ENDIF
 .ENDIF			# "$(SHL3DEFAULTRES)"!=""
 .IF "$(SHL3ALLRES)"!=""
     $(COMMAND_ECHO)$(TYPE) $(SHL3ALLRES) > $(SHL3LINKRES)
 .IF "$(COM)"=="GCC"
-    windres $(SHL3LINKRES) $(SHL3LINKRESO)
+    $(WINDRES) $(SHL3LINKRES) $(SHL3LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL3ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --dllname $(SHL3TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_3.cmd
+# GNU ld since 2.17 supports @cmdfile syntax
+.IF "$(USE_DEFFILE)"!=""
+    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL3LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(SHL3DEF) \
+        $(USE_3IMPLIB) \
+        $(STDOBJ) \
+        $(SHL3VERSIONOBJ) $(SHL3OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL3LIBS))) \
+        -Wl,--exclude-libs,ALL,--start-group $(SHL3STDLIBS) -Wl,--end-group \
+        $(SHL3STDSHL) $(STDSHL3) \
+        $(SHL3LINKRESO) \
+    ))
+.ELSE
     @noop $(assign ALL3OBJLIST:=$(STDOBJ) $(SHL3OBJS) $(SHL3LINKRESO) $(shell $(TYPE) /dev/null $(SHL3LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB3NAME)"!=""	# do not have to include objs
     @noop $(assign DEF3OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF3OBJLIST) $(assign ALL3OBJLIST:=$(ALL3OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB3NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_3.cmd
-.IF "$(SHL3DEF)"!=""
-    @echo	--input-def $(SHL3DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_3.cmd
-.ELSE
-    @echo	$(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_3.cmd
-.ENDIF
-    @echo	$(ALL3OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_3.cmd
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
-        $(STDOBJ) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) $(SHL3OBJS) $(SHL3LINKRESO) \
-        `$(TYPE) /dev/null $(SHL3LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
+        --dllname $(SHL3TARGET)$(DLLPOST) \
+        --kill-at \
+        --output-exp $(MISC)/$(@:b)_exp.o \
+        $(SHL3VERSIONOBJ) \
+        @(ALL3OBJLIST)
+    )
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL3LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(MISC)/$(@:b)_exp.o \
+        $(USE_3IMPLIB) \
+        $(STDOBJ) \
+        $(SHL3VERSIONOBJ) $(SHL3OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL3LIBS))) \
         -Wl,--exclude-libs,ALL,--start-group $(SHL3STDLIBS) -Wl,--end-group \
-        $(SHL3STDSHL) $(STDSHL3) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_3.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_3.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
+        $(SHL3STDSHL) $(STDSHL3) \
+        $(SHL3LINKRESO) \
+    ))
+.ENDIF
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL3USE_EXPORTS)"!="name"
@@ -1515,7 +1457,7 @@ $(SHL3TARGETN) : \
     @echo $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
     $(SHL3VERSIONOBJ) \
     `cat /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
     $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_3.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_3.cmd` \
@@ -1535,6 +1477,9 @@ $(SHL3TARGETN) : \
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN)
 .ENDIF				# "$(SHL3NOCHECK)"!=""
 .ENDIF
+.ELIF "$(OS)"=="IOS"
+    $(COMMAND_ECHO)$(AR) $(LIB3FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL3OBJS)) $(shell cat /dev/null $(LIB3TARGET) $(SHL3LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
+    $(COMMAND_ECHO)$(RANLIB) $@
 .ELSE			# "$(OS)"=="MACOSX"
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd
     @echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
@@ -1557,7 +1502,7 @@ $(SHL3TARGETN) : \
 .ENDIF				# "$(SHL3NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!=""
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
     $(COMMAND_ECHO)$(RM) $(LB)/$(SHL3TARGETN:b)
     $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL3TARGETN:f) $(SHL3TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -1566,75 +1511,12 @@ $(SHL3TARGETN) : \
 .ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
-.IF "$(GUI)" == "OS2"
-
-.IF "$(SHL3DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)/$(SHL3DEFAULTRES:b).rc >& $(NULLDEV)
-.IF "$(SHL3ICON)" != ""
-    @-+echo 1 ICON $(SHL3ICON) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL3ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL3ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL3DEFAULTRES:b).rc
-.ENDIF			# "$(SHL3ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL3DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-# YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL3DEFAULTRES:b).rc
-.ENDIF			# "$(SHL3DEFAULTRES)"!=""
-
-.IF "$(SHL3ALLRES)"!=""
-    $(COMMAND_ECHO)+$(TYPE) $(SHL3ALLRES) > $(SHL3LINKRES)
-.ENDIF			# "$(SHL3ALLRES)"!=""
-
-.IF "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL3LINKER) $(SHL3LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
-        $(SHL3DEF) \
-        $(STDOBJ) \
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL3OBJS) $(SHL3VERSIONOBJ) \
-        $(SHL3LIBS) \
-        $(SHL3STDLIBS:^"-l") \
-        $(SHL3LINKRES) \
-        $(SHL3STDSHL:^"-l") $(STDSHL3:^"-l") 
-
-.ELSE			# "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL3LINKER) -v 	$(SHL3LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL3BASEX)		\
-        $(SHL3STACK) -o $(SHL3TARGETN)	\
-        $(SHL3DEF) \
-        $(STDOBJ)							\
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL3OBJS) $(SHL3VERSIONOBJ) \
-        $(SHL3LIBS) \
-        $(SHL3STDLIBS:^"-l") \
-        $(SHL3LINKRES) \
-        $(SHL3STDSHL:^"-l") $(STDSHL3:^"-l")                           \
-    @$(LS) $@ >& $(NULLDEV)
-
-.ENDIF			# "$(USE_DEFFILE)"!=""
-
-.IF "$(SHL3TARGET8)" != "$(SHL3TARGET)"
-    $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL3TARGET8).dll
-.ENDIF
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(SHL3TARGETN)"!=""
 
 # unroll begin
 
 .IF "$(SHL4TARGETN)"!=""
 
-.IF "$(OS)"=="AIX"
-SHL4STDLIBS=
-.ENDIF
-
 .IF "$(SHLLINKARCONLY)" != ""
 SHL4STDLIBS=
 STDSHL=
@@ -1691,20 +1573,23 @@ $(MISC)/$(SHL4VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL4VERSIO
 .ENDIF
 
 .IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)" == "WNT"
 .IF "$(SHL4IMPLIB)" == ""
 SHL4IMPLIB=i$(TARGET)_t4
 .ENDIF			# "$(SHL4IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
 USE_4IMPLIB=-implib:$(LB)/$(SHL4IMPLIB).lib
-.ENDIF			# "$(COM)" != "GCC"
 SHL4IMPLIBN=$(LB)/$(SHL4IMPLIB).lib
+.ELSE
+SHL4IMPLIBN=$(LB)/lib$(SHL4IMPLIB).dll.a
+USE_4IMPLIB=-Wl,--out-implib=$(SHL4IMPLIBN)
+.ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL4IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
 USE_4IMPLIB_DEPS=$(LB)/$(SHL4IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.ENDIF			# "$(GUI)" == "WNT"
 USE_SHL4DEF=$(SHL4DEF)
 .ELSE			# "$(GUI)" != "UNX"
 USE_SHL4DEF=
@@ -1729,7 +1614,9 @@ $(USE_SHL4VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL4VERSIONMAP)"!=""
 
+.IF "$(OS)" != "AIX"
 SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP)
+.ENDIF
 
 $(USE_SHL4VERSIONMAP): \
                     $(SHL4OBJS)\
@@ -1766,7 +1653,9 @@ $(USE_SHL4VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL4VERSIONMAP)"!=""
 USE_SHL4VERSIONMAP=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET)$(SHL4VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
 SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP)
+.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL4VERSIONMAP): $(SHL4OBJS) $(SHL4LIBS)
@@ -1814,7 +1703,7 @@ $(USE_SHL4VERSIONMAP) .ERRREMOVE: $(SHL4VERSIONMAP)
 .ENDIF			# "$(GUI)" != "UNX"
 
 .IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
 .IF "$(GUI)"=="UNX"
 SHL4SONAME=\"$(SONAME_SWITCH)$(SHL4TARGETN:f)\"
 .ENDIF			# "$(GUI)"!="UNX"
@@ -1837,7 +1726,7 @@ SHL4LINKRESO*=$(MISC)/$(SHL4TARGET)_res.o
 #.IF "$(SHL4TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL4LIBS)"!=""
 $(MISC)/$(SHL4TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -1850,7 +1739,7 @@ $(SHL4TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
 .IF "$(SHL4USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL4LIBS)"!=""
 SHL4LINKLIST=$(MISC)/$(SHL4TARGET)_link.lst
@@ -1867,20 +1756,6 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
-.IF "$(GUI)" == "OS2"
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL4TARGET8=$(shell @fix_shl $(SHL4TARGET))
-.ENDIF
-
-.IF "$(GUI)" == "OS2"
-_SHL4IMP_ORD = $(SHL4STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL4STDLIBS:^"$(LB)/") 
-SHL4IMP_ORD = $(foreach,i,$(_SHL4IMP_ORD) $(shell @-ls $i))
-.ELSE
-SHL4IMP_ORD = 
-.ENDIF
-
-
 $(SHL4TARGETN) : \
                     $(SHL4OBJS)\
                     $(SHL4LIBS)\
@@ -1889,7 +1764,6 @@ $(SHL4TARGETN) : \
                     $(USE_SHL4VERSIONMAP)\
                     $(SHL4RES)\
                     $(SHL4DEPN) \
-                    $(SHL4IMP_ORD) \
                     $(SHL4LINKLIST)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
@@ -1911,39 +1785,69 @@ $(SHL4TARGETN) : \
     @echo $(EMQ)#define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
     @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL4DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL4DEFAULTRES:b).rc
+.IF "$(RCFLAGSOUTRES)"!=""
+# rc, takes separate flag naming output file, source .rc file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL4DEFAULTRES) $(MISC)/$(SHL4DEFAULTRES:b).rc
+.ELSE
+# windres, just takes output file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL4DEFAULTRES:b).rc $(SHL4DEFAULTRES)
+.ENDIF
 .ENDIF			# "$(SHL4DEFAULTRES)"!=""
 .IF "$(SHL4ALLRES)"!=""
     $(COMMAND_ECHO)$(TYPE) $(SHL4ALLRES) > $(SHL4LINKRES)
 .IF "$(COM)"=="GCC"
-    windres $(SHL4LINKRES) $(SHL4LINKRESO)
+    $(WINDRES) $(SHL4LINKRES) $(SHL4LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL4ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --dllname $(SHL4TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_4.cmd
+# GNU ld since 2.17 supports @cmdfile syntax
+.IF "$(USE_DEFFILE)"!=""
+    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL4LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(SHL4DEF) \
+        $(USE_4IMPLIB) \
+        $(STDOBJ) \
+        $(SHL4VERSIONOBJ) $(SHL4OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL4LIBS))) \
+        -Wl,--exclude-libs,ALL,--start-group $(SHL4STDLIBS) -Wl,--end-group \
+        $(SHL4STDSHL) $(STDSHL4) \
+        $(SHL4LINKRESO) \
+    ))
+.ELSE
     @noop $(assign ALL4OBJLIST:=$(STDOBJ) $(SHL4OBJS) $(SHL4LINKRESO) $(shell $(TYPE) /dev/null $(SHL4LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB4NAME)"!=""	# do not have to include objs
     @noop $(assign DEF4OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF4OBJLIST) $(assign ALL4OBJLIST:=$(ALL4OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB4NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_4.cmd
-.IF "$(SHL4DEF)"!=""
-    @echo	--input-def $(SHL4DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_4.cmd
-.ELSE
-    @echo	$(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_4.cmd
-.ENDIF
-    @echo	$(ALL4OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_4.cmd
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
-        $(STDOBJ) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) $(SHL4OBJS) $(SHL4LINKRESO) \
-        `$(TYPE) /dev/null $(SHL4LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
+        --dllname $(SHL4TARGET)$(DLLPOST) \
+        --kill-at \
+        --output-exp $(MISC)/$(@:b)_exp.o \
+        $(SHL4VERSIONOBJ) \
+        @(ALL4OBJLIST)
+    )
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL4LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(MISC)/$(@:b)_exp.o \
+        $(USE_4IMPLIB) \
+        $(STDOBJ) \
+        $(SHL4VERSIONOBJ) $(SHL4OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL4LIBS))) \
         -Wl,--exclude-libs,ALL,--start-group $(SHL4STDLIBS) -Wl,--end-group \
-        $(SHL4STDSHL) $(STDSHL4) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_4.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_4.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
+        $(SHL4STDSHL) $(STDSHL4) \
+        $(SHL4LINKRESO) \
+    ))
+.ENDIF
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL4USE_EXPORTS)"!="name"
@@ -2058,7 +1962,7 @@ $(SHL4TARGETN) : \
     @echo $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
     $(SHL4VERSIONOBJ) \
     `cat /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
     $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_4.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_4.cmd` \
@@ -2078,6 +1982,9 @@ $(SHL4TARGETN) : \
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN)
 .ENDIF				# "$(SHL4NOCHECK)"!=""
 .ENDIF
+.ELIF "$(OS)"=="IOS"
+    $(COMMAND_ECHO)$(AR) $(LIB4FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL4OBJS)) $(shell cat /dev/null $(LIB4TARGET) $(SHL4LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
+    $(COMMAND_ECHO)$(RANLIB) $@
 .ELSE			# "$(OS)"=="MACOSX"
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd
     @echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
@@ -2100,7 +2007,7 @@ $(SHL4TARGETN) : \
 .ENDIF				# "$(SHL4NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!=""
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
     $(COMMAND_ECHO)$(RM) $(LB)/$(SHL4TARGETN:b)
     $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL4TARGETN:f) $(SHL4TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -2109,75 +2016,12 @@ $(SHL4TARGETN) : \
 .ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
-.IF "$(GUI)" == "OS2"
-
-.IF "$(SHL4DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)/$(SHL4DEFAULTRES:b).rc >& $(NULLDEV)
-.IF "$(SHL4ICON)" != ""
-    @-+echo 1 ICON $(SHL4ICON) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL4ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL4ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL4DEFAULTRES:b).rc
-.ENDIF			# "$(SHL4ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL4DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-# YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL4DEFAULTRES:b).rc
-.ENDIF			# "$(SHL4DEFAULTRES)"!=""
-
-.IF "$(SHL4ALLRES)"!=""
-    $(COMMAND_ECHO)+$(TYPE) $(SHL4ALLRES) > $(SHL4LINKRES)
-.ENDIF			# "$(SHL4ALLRES)"!=""
-
-.IF "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL4LINKER) $(SHL4LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
-        $(SHL4DEF) \
-        $(STDOBJ) \
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL4OBJS) $(SHL4VERSIONOBJ) \
-        $(SHL4LIBS) \
-        $(SHL4STDLIBS:^"-l") \
-        $(SHL4LINKRES) \
-        $(SHL4STDSHL:^"-l") $(STDSHL4:^"-l") 
-
-.ELSE			# "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL4LINKER) -v 	$(SHL4LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL4BASEX)		\
-        $(SHL4STACK) -o $(SHL4TARGETN)	\
-        $(SHL4DEF) \
-        $(STDOBJ)							\
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL4OBJS) $(SHL4VERSIONOBJ) \
-        $(SHL4LIBS) \
-        $(SHL4STDLIBS:^"-l") \
-        $(SHL4LINKRES) \
-        $(SHL4STDSHL:^"-l") $(STDSHL4:^"-l")                           \
-    @$(LS) $@ >& $(NULLDEV)
-
-.ENDIF			# "$(USE_DEFFILE)"!=""
-
-.IF "$(SHL4TARGET8)" != "$(SHL4TARGET)"
-    $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL4TARGET8).dll
-.ENDIF
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(SHL4TARGETN)"!=""
 
 # unroll begin
 
 .IF "$(SHL5TARGETN)"!=""
 
-.IF "$(OS)"=="AIX"
-SHL5STDLIBS=
-.ENDIF
-
 .IF "$(SHLLINKARCONLY)" != ""
 SHL5STDLIBS=
 STDSHL=
@@ -2234,20 +2078,23 @@ $(MISC)/$(SHL5VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL5VERSIO
 .ENDIF
 
 .IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)" == "WNT"
 .IF "$(SHL5IMPLIB)" == ""
 SHL5IMPLIB=i$(TARGET)_t5
 .ENDIF			# "$(SHL5IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
 USE_5IMPLIB=-implib:$(LB)/$(SHL5IMPLIB).lib
-.ENDIF			# "$(COM)" != "GCC"
 SHL5IMPLIBN=$(LB)/$(SHL5IMPLIB).lib
+.ELSE
+SHL5IMPLIBN=$(LB)/lib$(SHL5IMPLIB).dll.a
+USE_5IMPLIB=-Wl,--out-implib=$(SHL5IMPLIBN)
+.ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL5IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
 USE_5IMPLIB_DEPS=$(LB)/$(SHL5IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.ENDIF			# "$(GUI)" == "WNT"
 USE_SHL5DEF=$(SHL5DEF)
 .ELSE			# "$(GUI)" != "UNX"
 USE_SHL5DEF=
@@ -2272,7 +2119,9 @@ $(USE_SHL5VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL5VERSIONMAP)"!=""
 
+.IF "$(OS)" != "AIX"
 SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP)
+.ENDIF
 
 $(USE_SHL5VERSIONMAP): \
                     $(SHL5OBJS)\
@@ -2309,7 +2158,9 @@ $(USE_SHL5VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL5VERSIONMAP)"!=""
 USE_SHL5VERSIONMAP=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET)$(SHL5VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
 SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP)
+.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL5VERSIONMAP): $(SHL5OBJS) $(SHL5LIBS)
@@ -2357,7 +2208,7 @@ $(USE_SHL5VERSIONMAP) .ERRREMOVE: $(SHL5VERSIONMAP)
 .ENDIF			# "$(GUI)" != "UNX"
 
 .IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
 .IF "$(GUI)"=="UNX"
 SHL5SONAME=\"$(SONAME_SWITCH)$(SHL5TARGETN:f)\"
 .ENDIF			# "$(GUI)"!="UNX"
@@ -2380,7 +2231,7 @@ SHL5LINKRESO*=$(MISC)/$(SHL5TARGET)_res.o
 #.IF "$(SHL5TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL5LIBS)"!=""
 $(MISC)/$(SHL5TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -2393,7 +2244,7 @@ $(SHL5TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
 .IF "$(SHL5USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL5LIBS)"!=""
 SHL5LINKLIST=$(MISC)/$(SHL5TARGET)_link.lst
@@ -2410,20 +2261,6 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
-.IF "$(GUI)" == "OS2"
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL5TARGET8=$(shell @fix_shl $(SHL5TARGET))
-.ENDIF
-
-.IF "$(GUI)" == "OS2"
-_SHL5IMP_ORD = $(SHL5STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL5STDLIBS:^"$(LB)/") 
-SHL5IMP_ORD = $(foreach,i,$(_SHL5IMP_ORD) $(shell @-ls $i))
-.ELSE
-SHL5IMP_ORD = 
-.ENDIF
-
-
 $(SHL5TARGETN) : \
                     $(SHL5OBJS)\
                     $(SHL5LIBS)\
@@ -2432,7 +2269,6 @@ $(SHL5TARGETN) : \
                     $(USE_SHL5VERSIONMAP)\
                     $(SHL5RES)\
                     $(SHL5DEPN) \
-                    $(SHL5IMP_ORD) \
                     $(SHL5LINKLIST)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
@@ -2454,39 +2290,69 @@ $(SHL5TARGETN) : \
     @echo $(EMQ)#define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
     @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL5DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL5DEFAULTRES:b).rc
+.IF "$(RCFLAGSOUTRES)"!=""
+# rc, takes separate flag naming output file, source .rc file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL5DEFAULTRES) $(MISC)/$(SHL5DEFAULTRES:b).rc
+.ELSE
+# windres, just takes output file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL5DEFAULTRES:b).rc $(SHL5DEFAULTRES)
+.ENDIF
 .ENDIF			# "$(SHL5DEFAULTRES)"!=""
 .IF "$(SHL5ALLRES)"!=""
     $(COMMAND_ECHO)$(TYPE) $(SHL5ALLRES) > $(SHL5LINKRES)
 .IF "$(COM)"=="GCC"
-    windres $(SHL5LINKRES) $(SHL5LINKRESO)
+    $(WINDRES) $(SHL5LINKRES) $(SHL5LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL5ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --dllname $(SHL5TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_5.cmd
+# GNU ld since 2.17 supports @cmdfile syntax
+.IF "$(USE_DEFFILE)"!=""
+    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL5LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(SHL5DEF) \
+        $(USE_5IMPLIB) \
+        $(STDOBJ) \
+        $(SHL5VERSIONOBJ) $(SHL5OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL5LIBS))) \
+        -Wl,--exclude-libs,ALL,--start-group $(SHL5STDLIBS) -Wl,--end-group \
+        $(SHL5STDSHL) $(STDSHL5) \
+        $(SHL5LINKRESO) \
+    ))
+.ELSE
     @noop $(assign ALL5OBJLIST:=$(STDOBJ) $(SHL5OBJS) $(SHL5LINKRESO) $(shell $(TYPE) /dev/null $(SHL5LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB5NAME)"!=""	# do not have to include objs
     @noop $(assign DEF5OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF5OBJLIST) $(assign ALL5OBJLIST:=$(ALL5OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB5NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_5.cmd
-.IF "$(SHL5DEF)"!=""
-    @echo	--input-def $(SHL5DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_5.cmd
-.ELSE
-    @echo	$(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_5.cmd
-.ENDIF
-    @echo	$(ALL5OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_5.cmd
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
-        $(STDOBJ) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) $(SHL5OBJS) $(SHL5LINKRESO) \
-        `$(TYPE) /dev/null $(SHL5LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
+        --dllname $(SHL5TARGET)$(DLLPOST) \
+        --kill-at \
+        --output-exp $(MISC)/$(@:b)_exp.o \
+        $(SHL5VERSIONOBJ) \
+        @(ALL5OBJLIST)
+    )
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL5LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(MISC)/$(@:b)_exp.o \
+        $(USE_5IMPLIB) \
+        $(STDOBJ) \
+        $(SHL5VERSIONOBJ) $(SHL5OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL5LIBS))) \
         -Wl,--exclude-libs,ALL,--start-group $(SHL5STDLIBS) -Wl,--end-group \
-        $(SHL5STDSHL) $(STDSHL5) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_5.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_5.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
+        $(SHL5STDSHL) $(STDSHL5) \
+        $(SHL5LINKRESO) \
+    ))
+.ENDIF
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL5USE_EXPORTS)"!="name"
@@ -2601,7 +2467,7 @@ $(SHL5TARGETN) : \
     @echo $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
     $(SHL5VERSIONOBJ) \
     `cat /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
     $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_5.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_5.cmd` \
@@ -2621,6 +2487,9 @@ $(SHL5TARGETN) : \
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN)
 .ENDIF				# "$(SHL5NOCHECK)"!=""
 .ENDIF
+.ELIF "$(OS)"=="IOS"
+    $(COMMAND_ECHO)$(AR) $(LIB5FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL5OBJS)) $(shell cat /dev/null $(LIB5TARGET) $(SHL5LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
+    $(COMMAND_ECHO)$(RANLIB) $@
 .ELSE			# "$(OS)"=="MACOSX"
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd
     @echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
@@ -2643,7 +2512,7 @@ $(SHL5TARGETN) : \
 .ENDIF				# "$(SHL5NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!=""
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
     $(COMMAND_ECHO)$(RM) $(LB)/$(SHL5TARGETN:b)
     $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL5TARGETN:f) $(SHL5TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -2652,75 +2521,12 @@ $(SHL5TARGETN) : \
 .ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
-.IF "$(GUI)" == "OS2"
-
-.IF "$(SHL5DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)/$(SHL5DEFAULTRES:b).rc >& $(NULLDEV)
-.IF "$(SHL5ICON)" != ""
-    @-+echo 1 ICON $(SHL5ICON) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL5ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL5ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL5DEFAULTRES:b).rc
-.ENDIF			# "$(SHL5ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL5DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-# YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL5DEFAULTRES:b).rc
-.ENDIF			# "$(SHL5DEFAULTRES)"!=""
-
-.IF "$(SHL5ALLRES)"!=""
-    $(COMMAND_ECHO)+$(TYPE) $(SHL5ALLRES) > $(SHL5LINKRES)
-.ENDIF			# "$(SHL5ALLRES)"!=""
-
-.IF "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL5LINKER) $(SHL5LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
-        $(SHL5DEF) \
-        $(STDOBJ) \
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL5OBJS) $(SHL5VERSIONOBJ) \
-        $(SHL5LIBS) \
-        $(SHL5STDLIBS:^"-l") \
-        $(SHL5LINKRES) \
-        $(SHL5STDSHL:^"-l") $(STDSHL5:^"-l") 
-
-.ELSE			# "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL5LINKER) -v 	$(SHL5LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL5BASEX)		\
-        $(SHL5STACK) -o $(SHL5TARGETN)	\
-        $(SHL5DEF) \
-        $(STDOBJ)							\
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL5OBJS) $(SHL5VERSIONOBJ) \
-        $(SHL5LIBS) \
-        $(SHL5STDLIBS:^"-l") \
-        $(SHL5LINKRES) \
-        $(SHL5STDSHL:^"-l") $(STDSHL5:^"-l")                           \
-    @$(LS) $@ >& $(NULLDEV)
-
-.ENDIF			# "$(USE_DEFFILE)"!=""
-
-.IF "$(SHL5TARGET8)" != "$(SHL5TARGET)"
-    $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL5TARGET8).dll
-.ENDIF
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(SHL5TARGETN)"!=""
 
 # unroll begin
 
 .IF "$(SHL6TARGETN)"!=""
 
-.IF "$(OS)"=="AIX"
-SHL6STDLIBS=
-.ENDIF
-
 .IF "$(SHLLINKARCONLY)" != ""
 SHL6STDLIBS=
 STDSHL=
@@ -2777,20 +2583,23 @@ $(MISC)/$(SHL6VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL6VERSIO
 .ENDIF
 
 .IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)" == "WNT"
 .IF "$(SHL6IMPLIB)" == ""
 SHL6IMPLIB=i$(TARGET)_t6
 .ENDIF			# "$(SHL6IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
 USE_6IMPLIB=-implib:$(LB)/$(SHL6IMPLIB).lib
-.ENDIF			# "$(COM)" != "GCC"
 SHL6IMPLIBN=$(LB)/$(SHL6IMPLIB).lib
+.ELSE
+SHL6IMPLIBN=$(LB)/lib$(SHL6IMPLIB).dll.a
+USE_6IMPLIB=-Wl,--out-implib=$(SHL6IMPLIBN)
+.ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL6IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
 USE_6IMPLIB_DEPS=$(LB)/$(SHL6IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.ENDIF			# "$(GUI)" == "WNT"
 USE_SHL6DEF=$(SHL6DEF)
 .ELSE			# "$(GUI)" != "UNX"
 USE_SHL6DEF=
@@ -2815,7 +2624,9 @@ $(USE_SHL6VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL6VERSIONMAP)"!=""
 
+.IF "$(OS)" != "AIX"
 SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP)
+.ENDIF
 
 $(USE_SHL6VERSIONMAP): \
                     $(SHL6OBJS)\
@@ -2852,7 +2663,9 @@ $(USE_SHL6VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL6VERSIONMAP)"!=""
 USE_SHL6VERSIONMAP=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET)$(SHL6VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
 SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP)
+.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL6VERSIONMAP): $(SHL6OBJS) $(SHL6LIBS)
@@ -2900,7 +2713,7 @@ $(USE_SHL6VERSIONMAP) .ERRREMOVE: $(SHL6VERSIONMAP)
 .ENDIF			# "$(GUI)" != "UNX"
 
 .IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
 .IF "$(GUI)"=="UNX"
 SHL6SONAME=\"$(SONAME_SWITCH)$(SHL6TARGETN:f)\"
 .ENDIF			# "$(GUI)"!="UNX"
@@ -2923,7 +2736,7 @@ SHL6LINKRESO*=$(MISC)/$(SHL6TARGET)_res.o
 #.IF "$(SHL6TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL6LIBS)"!=""
 $(MISC)/$(SHL6TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -2936,7 +2749,7 @@ $(SHL6TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
 .IF "$(SHL6USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL6LIBS)"!=""
 SHL6LINKLIST=$(MISC)/$(SHL6TARGET)_link.lst
@@ -2953,20 +2766,6 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
-.IF "$(GUI)" == "OS2"
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL6TARGET8=$(shell @fix_shl $(SHL6TARGET))
-.ENDIF
-
-.IF "$(GUI)" == "OS2"
-_SHL6IMP_ORD = $(SHL6STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL6STDLIBS:^"$(LB)/") 
-SHL6IMP_ORD = $(foreach,i,$(_SHL6IMP_ORD) $(shell @-ls $i))
-.ELSE
-SHL6IMP_ORD = 
-.ENDIF
-
-
 $(SHL6TARGETN) : \
                     $(SHL6OBJS)\
                     $(SHL6LIBS)\
@@ -2975,7 +2774,6 @@ $(SHL6TARGETN) : \
                     $(USE_SHL6VERSIONMAP)\
                     $(SHL6RES)\
                     $(SHL6DEPN) \
-                    $(SHL6IMP_ORD) \
                     $(SHL6LINKLIST)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
@@ -2997,39 +2795,69 @@ $(SHL6TARGETN) : \
     @echo $(EMQ)#define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
     @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL6DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL6DEFAULTRES:b).rc
+.IF "$(RCFLAGSOUTRES)"!=""
+# rc, takes separate flag naming output file, source .rc file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL6DEFAULTRES) $(MISC)/$(SHL6DEFAULTRES:b).rc
+.ELSE
+# windres, just takes output file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL6DEFAULTRES:b).rc $(SHL6DEFAULTRES)
+.ENDIF
 .ENDIF			# "$(SHL6DEFAULTRES)"!=""
 .IF "$(SHL6ALLRES)"!=""
     $(COMMAND_ECHO)$(TYPE) $(SHL6ALLRES) > $(SHL6LINKRES)
 .IF "$(COM)"=="GCC"
-    windres $(SHL6LINKRES) $(SHL6LINKRESO)
+    $(WINDRES) $(SHL6LINKRES) $(SHL6LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL6ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --dllname $(SHL6TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_6.cmd
+# GNU ld since 2.17 supports @cmdfile syntax
+.IF "$(USE_DEFFILE)"!=""
+    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL6LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(SHL6DEF) \
+        $(USE_6IMPLIB) \
+        $(STDOBJ) \
+        $(SHL6VERSIONOBJ) $(SHL6OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL6LIBS))) \
+        -Wl,--exclude-libs,ALL,--start-group $(SHL6STDLIBS) -Wl,--end-group \
+        $(SHL6STDSHL) $(STDSHL6) \
+        $(SHL6LINKRESO) \
+    ))
+.ELSE
     @noop $(assign ALL6OBJLIST:=$(STDOBJ) $(SHL6OBJS) $(SHL6LINKRESO) $(shell $(TYPE) /dev/null $(SHL6LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB6NAME)"!=""	# do not have to include objs
     @noop $(assign DEF6OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF6OBJLIST) $(assign ALL6OBJLIST:=$(ALL6OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB6NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_6.cmd
-.IF "$(SHL6DEF)"!=""
-    @echo	--input-def $(SHL6DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_6.cmd
-.ELSE
-    @echo	$(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_6.cmd
-.ENDIF
-    @echo	$(ALL6OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_6.cmd
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
-        $(STDOBJ) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) $(SHL6OBJS) $(SHL6LINKRESO) \
-        `$(TYPE) /dev/null $(SHL6LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
+        --dllname $(SHL6TARGET)$(DLLPOST) \
+        --kill-at \
+        --output-exp $(MISC)/$(@:b)_exp.o \
+        $(SHL6VERSIONOBJ) \
+        @(ALL6OBJLIST)
+    )
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL6LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(MISC)/$(@:b)_exp.o \
+        $(USE_6IMPLIB) \
+        $(STDOBJ) \
+        $(SHL6VERSIONOBJ) $(SHL6OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL6LIBS))) \
         -Wl,--exclude-libs,ALL,--start-group $(SHL6STDLIBS) -Wl,--end-group \
-        $(SHL6STDSHL) $(STDSHL6) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_6.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_6.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
+        $(SHL6STDSHL) $(STDSHL6) \
+        $(SHL6LINKRESO) \
+    ))
+.ENDIF
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL6USE_EXPORTS)"!="name"
@@ -3144,7 +2972,7 @@ $(SHL6TARGETN) : \
     @echo $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
     $(SHL6VERSIONOBJ) \
     `cat /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
     $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_6.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_6.cmd` \
@@ -3164,6 +2992,9 @@ $(SHL6TARGETN) : \
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN)
 .ENDIF				# "$(SHL6NOCHECK)"!=""
 .ENDIF
+.ELIF "$(OS)"=="IOS"
+    $(COMMAND_ECHO)$(AR) $(LIB6FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL6OBJS)) $(shell cat /dev/null $(LIB6TARGET) $(SHL6LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
+    $(COMMAND_ECHO)$(RANLIB) $@
 .ELSE			# "$(OS)"=="MACOSX"
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd
     @echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
@@ -3186,7 +3017,7 @@ $(SHL6TARGETN) : \
 .ENDIF				# "$(SHL6NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!=""
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
     $(COMMAND_ECHO)$(RM) $(LB)/$(SHL6TARGETN:b)
     $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL6TARGETN:f) $(SHL6TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -3195,75 +3026,12 @@ $(SHL6TARGETN) : \
 .ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
-.IF "$(GUI)" == "OS2"
-
-.IF "$(SHL6DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)/$(SHL6DEFAULTRES:b).rc >& $(NULLDEV)
-.IF "$(SHL6ICON)" != ""
-    @-+echo 1 ICON $(SHL6ICON) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL6ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL6ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL6DEFAULTRES:b).rc
-.ENDIF			# "$(SHL6ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL6DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-# YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL6DEFAULTRES:b).rc
-.ENDIF			# "$(SHL6DEFAULTRES)"!=""
-
-.IF "$(SHL6ALLRES)"!=""
-    $(COMMAND_ECHO)+$(TYPE) $(SHL6ALLRES) > $(SHL6LINKRES)
-.ENDIF			# "$(SHL6ALLRES)"!=""
-
-.IF "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL6LINKER) $(SHL6LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
-        $(SHL6DEF) \
-        $(STDOBJ) \
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL6OBJS) $(SHL6VERSIONOBJ) \
-        $(SHL6LIBS) \
-        $(SHL6STDLIBS:^"-l") \
-        $(SHL6LINKRES) \
-        $(SHL6STDSHL:^"-l") $(STDSHL6:^"-l") 
-
-.ELSE			# "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL6LINKER) -v 	$(SHL6LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL6BASEX)		\
-        $(SHL6STACK) -o $(SHL6TARGETN)	\
-        $(SHL6DEF) \
-        $(STDOBJ)							\
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL6OBJS) $(SHL6VERSIONOBJ) \
-        $(SHL6LIBS) \
-        $(SHL6STDLIBS:^"-l") \
-        $(SHL6LINKRES) \
-        $(SHL6STDSHL:^"-l") $(STDSHL6:^"-l")                           \
-    @$(LS) $@ >& $(NULLDEV)
-
-.ENDIF			# "$(USE_DEFFILE)"!=""
-
-.IF "$(SHL6TARGET8)" != "$(SHL6TARGET)"
-    $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL6TARGET8).dll
-.ENDIF
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(SHL6TARGETN)"!=""
 
 # unroll begin
 
 .IF "$(SHL7TARGETN)"!=""
 
-.IF "$(OS)"=="AIX"
-SHL7STDLIBS=
-.ENDIF
-
 .IF "$(SHLLINKARCONLY)" != ""
 SHL7STDLIBS=
 STDSHL=
@@ -3320,20 +3088,23 @@ $(MISC)/$(SHL7VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL7VERSIO
 .ENDIF
 
 .IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)" == "WNT"
 .IF "$(SHL7IMPLIB)" == ""
 SHL7IMPLIB=i$(TARGET)_t7
 .ENDIF			# "$(SHL7IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
 USE_7IMPLIB=-implib:$(LB)/$(SHL7IMPLIB).lib
-.ENDIF			# "$(COM)" != "GCC"
 SHL7IMPLIBN=$(LB)/$(SHL7IMPLIB).lib
+.ELSE
+SHL7IMPLIBN=$(LB)/lib$(SHL7IMPLIB).dll.a
+USE_7IMPLIB=-Wl,--out-implib=$(SHL7IMPLIBN)
+.ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL7IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
 USE_7IMPLIB_DEPS=$(LB)/$(SHL7IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.ENDIF			# "$(GUI)" == "WNT"
 USE_SHL7DEF=$(SHL7DEF)
 .ELSE			# "$(GUI)" != "UNX"
 USE_SHL7DEF=
@@ -3358,7 +3129,9 @@ $(USE_SHL7VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL7VERSIONMAP)"!=""
 
+.IF "$(OS)" != "AIX"
 SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP)
+.ENDIF
 
 $(USE_SHL7VERSIONMAP): \
                     $(SHL7OBJS)\
@@ -3395,7 +3168,9 @@ $(USE_SHL7VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL7VERSIONMAP)"!=""
 USE_SHL7VERSIONMAP=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET)$(SHL7VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
 SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP)
+.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL7VERSIONMAP): $(SHL7OBJS) $(SHL7LIBS)
@@ -3443,7 +3218,7 @@ $(USE_SHL7VERSIONMAP) .ERRREMOVE: $(SHL7VERSIONMAP)
 .ENDIF			# "$(GUI)" != "UNX"
 
 .IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
 .IF "$(GUI)"=="UNX"
 SHL7SONAME=\"$(SONAME_SWITCH)$(SHL7TARGETN:f)\"
 .ENDIF			# "$(GUI)"!="UNX"
@@ -3466,7 +3241,7 @@ SHL7LINKRESO*=$(MISC)/$(SHL7TARGET)_res.o
 #.IF "$(SHL7TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL7LIBS)"!=""
 $(MISC)/$(SHL7TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -3479,7 +3254,7 @@ $(SHL7TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
 .IF "$(SHL7USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL7LIBS)"!=""
 SHL7LINKLIST=$(MISC)/$(SHL7TARGET)_link.lst
@@ -3496,20 +3271,6 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
-.IF "$(GUI)" == "OS2"
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL7TARGET8=$(shell @fix_shl $(SHL7TARGET))
-.ENDIF
-
-.IF "$(GUI)" == "OS2"
-_SHL7IMP_ORD = $(SHL7STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL7STDLIBS:^"$(LB)/") 
-SHL7IMP_ORD = $(foreach,i,$(_SHL7IMP_ORD) $(shell @-ls $i))
-.ELSE
-SHL7IMP_ORD = 
-.ENDIF
-
-
 $(SHL7TARGETN) : \
                     $(SHL7OBJS)\
                     $(SHL7LIBS)\
@@ -3518,7 +3279,6 @@ $(SHL7TARGETN) : \
                     $(USE_SHL7VERSIONMAP)\
                     $(SHL7RES)\
                     $(SHL7DEPN) \
-                    $(SHL7IMP_ORD) \
                     $(SHL7LINKLIST)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
@@ -3540,39 +3300,69 @@ $(SHL7TARGETN) : \
     @echo $(EMQ)#define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
     @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL7DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL7DEFAULTRES:b).rc
+.IF "$(RCFLAGSOUTRES)"!=""
+# rc, takes separate flag naming output file, source .rc file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL7DEFAULTRES) $(MISC)/$(SHL7DEFAULTRES:b).rc
+.ELSE
+# windres, just takes output file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL7DEFAULTRES:b).rc $(SHL7DEFAULTRES)
+.ENDIF
 .ENDIF			# "$(SHL7DEFAULTRES)"!=""
 .IF "$(SHL7ALLRES)"!=""
     $(COMMAND_ECHO)$(TYPE) $(SHL7ALLRES) > $(SHL7LINKRES)
 .IF "$(COM)"=="GCC"
-    windres $(SHL7LINKRES) $(SHL7LINKRESO)
+    $(WINDRES) $(SHL7LINKRES) $(SHL7LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL7ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --dllname $(SHL7TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_7.cmd
+# GNU ld since 2.17 supports @cmdfile syntax
+.IF "$(USE_DEFFILE)"!=""
+    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL7LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(SHL7DEF) \
+        $(USE_7IMPLIB) \
+        $(STDOBJ) \
+        $(SHL7VERSIONOBJ) $(SHL7OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL7LIBS))) \
+        -Wl,--exclude-libs,ALL,--start-group $(SHL7STDLIBS) -Wl,--end-group \
+        $(SHL7STDSHL) $(STDSHL7) \
+        $(SHL7LINKRESO) \
+    ))
+.ELSE
     @noop $(assign ALL7OBJLIST:=$(STDOBJ) $(SHL7OBJS) $(SHL7LINKRESO) $(shell $(TYPE) /dev/null $(SHL7LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB7NAME)"!=""	# do not have to include objs
     @noop $(assign DEF7OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF7OBJLIST) $(assign ALL7OBJLIST:=$(ALL7OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB7NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_7.cmd
-.IF "$(SHL7DEF)"!=""
-    @echo	--input-def $(SHL7DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_7.cmd
-.ELSE
-    @echo	$(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_7.cmd
-.ENDIF
-    @echo	$(ALL7OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_7.cmd
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
-        $(STDOBJ) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) $(SHL7OBJS) $(SHL7LINKRESO) \
-        `$(TYPE) /dev/null $(SHL7LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
+        --dllname $(SHL7TARGET)$(DLLPOST) \
+        --kill-at \
+        --output-exp $(MISC)/$(@:b)_exp.o \
+        $(SHL7VERSIONOBJ) \
+        @(ALL7OBJLIST)
+    )
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL7LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(MISC)/$(@:b)_exp.o \
+        $(USE_7IMPLIB) \
+        $(STDOBJ) \
+        $(SHL7VERSIONOBJ) $(SHL7OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL7LIBS))) \
         -Wl,--exclude-libs,ALL,--start-group $(SHL7STDLIBS) -Wl,--end-group \
-        $(SHL7STDSHL) $(STDSHL7) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_7.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_7.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
+        $(SHL7STDSHL) $(STDSHL7) \
+        $(SHL7LINKRESO) \
+    ))
+.ENDIF
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL7USE_EXPORTS)"!="name"
@@ -3687,7 +3477,7 @@ $(SHL7TARGETN) : \
     @echo $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
     $(SHL7VERSIONOBJ) \
     `cat /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
     $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_7.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_7.cmd` \
@@ -3707,6 +3497,9 @@ $(SHL7TARGETN) : \
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN)
 .ENDIF				# "$(SHL7NOCHECK)"!=""
 .ENDIF
+.ELIF "$(OS)"=="IOS"
+    $(COMMAND_ECHO)$(AR) $(LIB7FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL7OBJS)) $(shell cat /dev/null $(LIB7TARGET) $(SHL7LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
+    $(COMMAND_ECHO)$(RANLIB) $@
 .ELSE			# "$(OS)"=="MACOSX"
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd
     @echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
@@ -3729,7 +3522,7 @@ $(SHL7TARGETN) : \
 .ENDIF				# "$(SHL7NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!=""
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
     $(COMMAND_ECHO)$(RM) $(LB)/$(SHL7TARGETN:b)
     $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL7TARGETN:f) $(SHL7TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -3738,75 +3531,12 @@ $(SHL7TARGETN) : \
 .ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
-.IF "$(GUI)" == "OS2"
-
-.IF "$(SHL7DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)/$(SHL7DEFAULTRES:b).rc >& $(NULLDEV)
-.IF "$(SHL7ICON)" != ""
-    @-+echo 1 ICON $(SHL7ICON) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL7ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL7ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL7DEFAULTRES:b).rc
-.ENDIF			# "$(SHL7ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL7DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-# YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL7DEFAULTRES:b).rc
-.ENDIF			# "$(SHL7DEFAULTRES)"!=""
-
-.IF "$(SHL7ALLRES)"!=""
-    $(COMMAND_ECHO)+$(TYPE) $(SHL7ALLRES) > $(SHL7LINKRES)
-.ENDIF			# "$(SHL7ALLRES)"!=""
-
-.IF "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL7LINKER) $(SHL7LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
-        $(SHL7DEF) \
-        $(STDOBJ) \
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL7OBJS) $(SHL7VERSIONOBJ) \
-        $(SHL7LIBS) \
-        $(SHL7STDLIBS:^"-l") \
-        $(SHL7LINKRES) \
-        $(SHL7STDSHL:^"-l") $(STDSHL7:^"-l") 
-
-.ELSE			# "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL7LINKER) -v 	$(SHL7LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL7BASEX)		\
-        $(SHL7STACK) -o $(SHL7TARGETN)	\
-        $(SHL7DEF) \
-        $(STDOBJ)							\
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL7OBJS) $(SHL7VERSIONOBJ) \
-        $(SHL7LIBS) \
-        $(SHL7STDLIBS:^"-l") \
-        $(SHL7LINKRES) \
-        $(SHL7STDSHL:^"-l") $(STDSHL7:^"-l")                           \
-    @$(LS) $@ >& $(NULLDEV)
-
-.ENDIF			# "$(USE_DEFFILE)"!=""
-
-.IF "$(SHL7TARGET8)" != "$(SHL7TARGET)"
-    $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL7TARGET8).dll
-.ENDIF
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(SHL7TARGETN)"!=""
 
 # unroll begin
 
 .IF "$(SHL8TARGETN)"!=""
 
-.IF "$(OS)"=="AIX"
-SHL8STDLIBS=
-.ENDIF
-
 .IF "$(SHLLINKARCONLY)" != ""
 SHL8STDLIBS=
 STDSHL=
@@ -3863,20 +3593,23 @@ $(MISC)/$(SHL8VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL8VERSIO
 .ENDIF
 
 .IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)" == "WNT"
 .IF "$(SHL8IMPLIB)" == ""
 SHL8IMPLIB=i$(TARGET)_t8
 .ENDIF			# "$(SHL8IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
 USE_8IMPLIB=-implib:$(LB)/$(SHL8IMPLIB).lib
-.ENDIF			# "$(COM)" != "GCC"
 SHL8IMPLIBN=$(LB)/$(SHL8IMPLIB).lib
+.ELSE
+SHL8IMPLIBN=$(LB)/lib$(SHL8IMPLIB).dll.a
+USE_8IMPLIB=-Wl,--out-implib=$(SHL8IMPLIBN)
+.ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL8IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
 USE_8IMPLIB_DEPS=$(LB)/$(SHL8IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.ENDIF			# "$(GUI)" == "WNT"
 USE_SHL8DEF=$(SHL8DEF)
 .ELSE			# "$(GUI)" != "UNX"
 USE_SHL8DEF=
@@ -3901,7 +3634,9 @@ $(USE_SHL8VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL8VERSIONMAP)"!=""
 
+.IF "$(OS)" != "AIX"
 SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP)
+.ENDIF
 
 $(USE_SHL8VERSIONMAP): \
                     $(SHL8OBJS)\
@@ -3938,7 +3673,9 @@ $(USE_SHL8VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL8VERSIONMAP)"!=""
 USE_SHL8VERSIONMAP=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET)$(SHL8VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
 SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP)
+.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL8VERSIONMAP): $(SHL8OBJS) $(SHL8LIBS)
@@ -3986,7 +3723,7 @@ $(USE_SHL8VERSIONMAP) .ERRREMOVE: $(SHL8VERSIONMAP)
 .ENDIF			# "$(GUI)" != "UNX"
 
 .IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
 .IF "$(GUI)"=="UNX"
 SHL8SONAME=\"$(SONAME_SWITCH)$(SHL8TARGETN:f)\"
 .ENDIF			# "$(GUI)"!="UNX"
@@ -4009,7 +3746,7 @@ SHL8LINKRESO*=$(MISC)/$(SHL8TARGET)_res.o
 #.IF "$(SHL8TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL8LIBS)"!=""
 $(MISC)/$(SHL8TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -4022,7 +3759,7 @@ $(SHL8TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
 .IF "$(SHL8USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL8LIBS)"!=""
 SHL8LINKLIST=$(MISC)/$(SHL8TARGET)_link.lst
@@ -4039,20 +3776,6 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
-.IF "$(GUI)" == "OS2"
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL8TARGET8=$(shell @fix_shl $(SHL8TARGET))
-.ENDIF
-
-.IF "$(GUI)" == "OS2"
-_SHL8IMP_ORD = $(SHL8STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL8STDLIBS:^"$(LB)/") 
-SHL8IMP_ORD = $(foreach,i,$(_SHL8IMP_ORD) $(shell @-ls $i))
-.ELSE
-SHL8IMP_ORD = 
-.ENDIF
-
-
 $(SHL8TARGETN) : \
                     $(SHL8OBJS)\
                     $(SHL8LIBS)\
@@ -4061,7 +3784,6 @@ $(SHL8TARGETN) : \
                     $(USE_SHL8VERSIONMAP)\
                     $(SHL8RES)\
                     $(SHL8DEPN) \
-                    $(SHL8IMP_ORD) \
                     $(SHL8LINKLIST)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
@@ -4083,39 +3805,69 @@ $(SHL8TARGETN) : \
     @echo $(EMQ)#define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
     @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL8DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL8DEFAULTRES:b).rc
+.IF "$(RCFLAGSOUTRES)"!=""
+# rc, takes separate flag naming output file, source .rc file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL8DEFAULTRES) $(MISC)/$(SHL8DEFAULTRES:b).rc
+.ELSE
+# windres, just takes output file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL8DEFAULTRES:b).rc $(SHL8DEFAULTRES)
+.ENDIF
 .ENDIF			# "$(SHL8DEFAULTRES)"!=""
 .IF "$(SHL8ALLRES)"!=""
     $(COMMAND_ECHO)$(TYPE) $(SHL8ALLRES) > $(SHL8LINKRES)
 .IF "$(COM)"=="GCC"
-    windres $(SHL8LINKRES) $(SHL8LINKRESO)
+    $(WINDRES) $(SHL8LINKRES) $(SHL8LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL8ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --dllname $(SHL8TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_8.cmd
+# GNU ld since 2.17 supports @cmdfile syntax
+.IF "$(USE_DEFFILE)"!=""
+    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL8LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(SHL8DEF) \
+        $(USE_8IMPLIB) \
+        $(STDOBJ) \
+        $(SHL8VERSIONOBJ) $(SHL8OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL8LIBS))) \
+        -Wl,--exclude-libs,ALL,--start-group $(SHL8STDLIBS) -Wl,--end-group \
+        $(SHL8STDSHL) $(STDSHL8) \
+        $(SHL8LINKRESO) \
+    ))
+.ELSE
     @noop $(assign ALL8OBJLIST:=$(STDOBJ) $(SHL8OBJS) $(SHL8LINKRESO) $(shell $(TYPE) /dev/null $(SHL8LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB8NAME)"!=""	# do not have to include objs
     @noop $(assign DEF8OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF8OBJLIST) $(assign ALL8OBJLIST:=$(ALL8OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB8NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_8.cmd
-.IF "$(SHL8DEF)"!=""
-    @echo	--input-def $(SHL8DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_8.cmd
-.ELSE
-    @echo	$(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_8.cmd
-.ENDIF
-    @echo	$(ALL8OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_8.cmd
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
-        $(STDOBJ) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) $(SHL8OBJS) $(SHL8LINKRESO) \
-        `$(TYPE) /dev/null $(SHL8LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
+        --dllname $(SHL8TARGET)$(DLLPOST) \
+        --kill-at \
+        --output-exp $(MISC)/$(@:b)_exp.o \
+        $(SHL8VERSIONOBJ) \
+        @(ALL8OBJLIST)
+    )
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL8LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(MISC)/$(@:b)_exp.o \
+        $(USE_8IMPLIB) \
+        $(STDOBJ) \
+        $(SHL8VERSIONOBJ) $(SHL8OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL8LIBS))) \
         -Wl,--exclude-libs,ALL,--start-group $(SHL8STDLIBS) -Wl,--end-group \
-        $(SHL8STDSHL) $(STDSHL8) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_8.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_8.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
+        $(SHL8STDSHL) $(STDSHL8) \
+        $(SHL8LINKRESO) \
+    ))
+.ENDIF
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL8USE_EXPORTS)"!="name"
@@ -4230,7 +3982,7 @@ $(SHL8TARGETN) : \
     @echo $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
     $(SHL8VERSIONOBJ) \
     `cat /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
     $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_8.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_8.cmd` \
@@ -4250,6 +4002,9 @@ $(SHL8TARGETN) : \
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN)
 .ENDIF				# "$(SHL8NOCHECK)"!=""
 .ENDIF
+.ELIF "$(OS)"=="IOS"
+    $(COMMAND_ECHO)$(AR) $(LIB8FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL8OBJS)) $(shell cat /dev/null $(LIB8TARGET) $(SHL8LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
+    $(COMMAND_ECHO)$(RANLIB) $@
 .ELSE			# "$(OS)"=="MACOSX"
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd
     @echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
@@ -4272,7 +4027,7 @@ $(SHL8TARGETN) : \
 .ENDIF				# "$(SHL8NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!=""
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
     $(COMMAND_ECHO)$(RM) $(LB)/$(SHL8TARGETN:b)
     $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL8TARGETN:f) $(SHL8TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -4281,75 +4036,12 @@ $(SHL8TARGETN) : \
 .ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
-.IF "$(GUI)" == "OS2"
-
-.IF "$(SHL8DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)/$(SHL8DEFAULTRES:b).rc >& $(NULLDEV)
-.IF "$(SHL8ICON)" != ""
-    @-+echo 1 ICON $(SHL8ICON) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL8ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL8ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL8DEFAULTRES:b).rc
-.ENDIF			# "$(SHL8ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL8DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-# YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL8DEFAULTRES:b).rc
-.ENDIF			# "$(SHL8DEFAULTRES)"!=""
-
-.IF "$(SHL8ALLRES)"!=""
-    $(COMMAND_ECHO)+$(TYPE) $(SHL8ALLRES) > $(SHL8LINKRES)
-.ENDIF			# "$(SHL8ALLRES)"!=""
-
-.IF "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL8LINKER) $(SHL8LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
-        $(SHL8DEF) \
-        $(STDOBJ) \
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL8OBJS) $(SHL8VERSIONOBJ) \
-        $(SHL8LIBS) \
-        $(SHL8STDLIBS:^"-l") \
-        $(SHL8LINKRES) \
-        $(SHL8STDSHL:^"-l") $(STDSHL8:^"-l") 
-
-.ELSE			# "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL8LINKER) -v 	$(SHL8LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL8BASEX)		\
-        $(SHL8STACK) -o $(SHL8TARGETN)	\
-        $(SHL8DEF) \
-        $(STDOBJ)							\
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL8OBJS) $(SHL8VERSIONOBJ) \
-        $(SHL8LIBS) \
-        $(SHL8STDLIBS:^"-l") \
-        $(SHL8LINKRES) \
-        $(SHL8STDSHL:^"-l") $(STDSHL8:^"-l")                           \
-    @$(LS) $@ >& $(NULLDEV)
-
-.ENDIF			# "$(USE_DEFFILE)"!=""
-
-.IF "$(SHL8TARGET8)" != "$(SHL8TARGET)"
-    $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL8TARGET8).dll
-.ENDIF
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(SHL8TARGETN)"!=""
 
 # unroll begin
 
 .IF "$(SHL9TARGETN)"!=""
 
-.IF "$(OS)"=="AIX"
-SHL9STDLIBS=
-.ENDIF
-
 .IF "$(SHLLINKARCONLY)" != ""
 SHL9STDLIBS=
 STDSHL=
@@ -4406,20 +4098,23 @@ $(MISC)/$(SHL9VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL9VERSIO
 .ENDIF
 
 .IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)" == "WNT"
 .IF "$(SHL9IMPLIB)" == ""
 SHL9IMPLIB=i$(TARGET)_t9
 .ENDIF			# "$(SHL9IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
 USE_9IMPLIB=-implib:$(LB)/$(SHL9IMPLIB).lib
-.ENDIF			# "$(COM)" != "GCC"
 SHL9IMPLIBN=$(LB)/$(SHL9IMPLIB).lib
+.ELSE
+SHL9IMPLIBN=$(LB)/lib$(SHL9IMPLIB).dll.a
+USE_9IMPLIB=-Wl,--out-implib=$(SHL9IMPLIBN)
+.ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL9IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
 USE_9IMPLIB_DEPS=$(LB)/$(SHL9IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.ENDIF			# "$(GUI)" == "WNT"
 USE_SHL9DEF=$(SHL9DEF)
 .ELSE			# "$(GUI)" != "UNX"
 USE_SHL9DEF=
@@ -4444,7 +4139,9 @@ $(USE_SHL9VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL9VERSIONMAP)"!=""
 
+.IF "$(OS)" != "AIX"
 SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP)
+.ENDIF
 
 $(USE_SHL9VERSIONMAP): \
                     $(SHL9OBJS)\
@@ -4481,7 +4178,9 @@ $(USE_SHL9VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL9VERSIONMAP)"!=""
 USE_SHL9VERSIONMAP=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET)$(SHL9VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
 SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP)
+.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL9VERSIONMAP): $(SHL9OBJS) $(SHL9LIBS)
@@ -4529,7 +4228,7 @@ $(USE_SHL9VERSIONMAP) .ERRREMOVE: $(SHL9VERSIONMAP)
 .ENDIF			# "$(GUI)" != "UNX"
 
 .IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
 .IF "$(GUI)"=="UNX"
 SHL9SONAME=\"$(SONAME_SWITCH)$(SHL9TARGETN:f)\"
 .ENDIF			# "$(GUI)"!="UNX"
@@ -4552,7 +4251,7 @@ SHL9LINKRESO*=$(MISC)/$(SHL9TARGET)_res.o
 #.IF "$(SHL9TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL9LIBS)"!=""
 $(MISC)/$(SHL9TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -4565,7 +4264,7 @@ $(SHL9TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
 .IF "$(SHL9USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL9LIBS)"!=""
 SHL9LINKLIST=$(MISC)/$(SHL9TARGET)_link.lst
@@ -4582,20 +4281,6 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
-.IF "$(GUI)" == "OS2"
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL9TARGET8=$(shell @fix_shl $(SHL9TARGET))
-.ENDIF
-
-.IF "$(GUI)" == "OS2"
-_SHL9IMP_ORD = $(SHL9STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL9STDLIBS:^"$(LB)/") 
-SHL9IMP_ORD = $(foreach,i,$(_SHL9IMP_ORD) $(shell @-ls $i))
-.ELSE
-SHL9IMP_ORD = 
-.ENDIF
-
-
 $(SHL9TARGETN) : \
                     $(SHL9OBJS)\
                     $(SHL9LIBS)\
@@ -4604,7 +4289,6 @@ $(SHL9TARGETN) : \
                     $(USE_SHL9VERSIONMAP)\
                     $(SHL9RES)\
                     $(SHL9DEPN) \
-                    $(SHL9IMP_ORD) \
                     $(SHL9LINKLIST)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
@@ -4626,39 +4310,69 @@ $(SHL9TARGETN) : \
     @echo $(EMQ)#define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
     @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL9DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL9DEFAULTRES:b).rc
+.IF "$(RCFLAGSOUTRES)"!=""
+# rc, takes separate flag naming output file, source .rc file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL9DEFAULTRES) $(MISC)/$(SHL9DEFAULTRES:b).rc
+.ELSE
+# windres, just takes output file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL9DEFAULTRES:b).rc $(SHL9DEFAULTRES)
+.ENDIF
 .ENDIF			# "$(SHL9DEFAULTRES)"!=""
 .IF "$(SHL9ALLRES)"!=""
     $(COMMAND_ECHO)$(TYPE) $(SHL9ALLRES) > $(SHL9LINKRES)
 .IF "$(COM)"=="GCC"
-    windres $(SHL9LINKRES) $(SHL9LINKRESO)
+    $(WINDRES) $(SHL9LINKRES) $(SHL9LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL9ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --dllname $(SHL9TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_9.cmd
+# GNU ld since 2.17 supports @cmdfile syntax
+.IF "$(USE_DEFFILE)"!=""
+    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL9LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(SHL9DEF) \
+        $(USE_9IMPLIB) \
+        $(STDOBJ) \
+        $(SHL9VERSIONOBJ) $(SHL9OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL9LIBS))) \
+        -Wl,--exclude-libs,ALL,--start-group $(SHL9STDLIBS) -Wl,--end-group \
+        $(SHL9STDSHL) $(STDSHL9) \
+        $(SHL9LINKRESO) \
+    ))
+.ELSE
     @noop $(assign ALL9OBJLIST:=$(STDOBJ) $(SHL9OBJS) $(SHL9LINKRESO) $(shell $(TYPE) /dev/null $(SHL9LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB9NAME)"!=""	# do not have to include objs
     @noop $(assign DEF9OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF9OBJLIST) $(assign ALL9OBJLIST:=$(ALL9OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB9NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_9.cmd
-.IF "$(SHL9DEF)"!=""
-    @echo	--input-def $(SHL9DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_9.cmd
-.ELSE
-    @echo	$(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_9.cmd
-.ENDIF
-    @echo	$(ALL9OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_9.cmd
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
-        $(STDOBJ) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) $(SHL9OBJS) $(SHL9LINKRESO) \
-        `$(TYPE) /dev/null $(SHL9LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
+        --dllname $(SHL9TARGET)$(DLLPOST) \
+        --kill-at \
+        --output-exp $(MISC)/$(@:b)_exp.o \
+        $(SHL9VERSIONOBJ) \
+        @(ALL9OBJLIST)
+    )
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL9LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(MISC)/$(@:b)_exp.o \
+        $(USE_9IMPLIB) \
+        $(STDOBJ) \
+        $(SHL9VERSIONOBJ) $(SHL9OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL9LIBS))) \
         -Wl,--exclude-libs,ALL,--start-group $(SHL9STDLIBS) -Wl,--end-group \
-        $(SHL9STDSHL) $(STDSHL9) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_9.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_9.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
+        $(SHL9STDSHL) $(STDSHL9) \
+        $(SHL9LINKRESO) \
+    ))
+.ENDIF
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL9USE_EXPORTS)"!="name"
@@ -4773,7 +4487,7 @@ $(SHL9TARGETN) : \
     @echo $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
     $(SHL9VERSIONOBJ) \
     `cat /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
     $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_9.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_9.cmd` \
@@ -4793,6 +4507,9 @@ $(SHL9TARGETN) : \
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN)
 .ENDIF				# "$(SHL9NOCHECK)"!=""
 .ENDIF
+.ELIF "$(OS)"=="IOS"
+    $(COMMAND_ECHO)$(AR) $(LIB9FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL9OBJS)) $(shell cat /dev/null $(LIB9TARGET) $(SHL9LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
+    $(COMMAND_ECHO)$(RANLIB) $@
 .ELSE			# "$(OS)"=="MACOSX"
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd
     @echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
@@ -4815,7 +4532,7 @@ $(SHL9TARGETN) : \
 .ENDIF				# "$(SHL9NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!=""
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
     $(COMMAND_ECHO)$(RM) $(LB)/$(SHL9TARGETN:b)
     $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL9TARGETN:f) $(SHL9TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -4824,75 +4541,12 @@ $(SHL9TARGETN) : \
 .ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
-.IF "$(GUI)" == "OS2"
-
-.IF "$(SHL9DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)/$(SHL9DEFAULTRES:b).rc >& $(NULLDEV)
-.IF "$(SHL9ICON)" != ""
-    @-+echo 1 ICON $(SHL9ICON) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL9ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL9ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL9DEFAULTRES:b).rc
-.ENDIF			# "$(SHL9ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL9DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-# YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL9DEFAULTRES:b).rc
-.ENDIF			# "$(SHL9DEFAULTRES)"!=""
-
-.IF "$(SHL9ALLRES)"!=""
-    $(COMMAND_ECHO)+$(TYPE) $(SHL9ALLRES) > $(SHL9LINKRES)
-.ENDIF			# "$(SHL9ALLRES)"!=""
-
-.IF "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL9LINKER) $(SHL9LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
-        $(SHL9DEF) \
-        $(STDOBJ) \
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL9OBJS) $(SHL9VERSIONOBJ) \
-        $(SHL9LIBS) \
-        $(SHL9STDLIBS:^"-l") \
-        $(SHL9LINKRES) \
-        $(SHL9STDSHL:^"-l") $(STDSHL9:^"-l") 
-
-.ELSE			# "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL9LINKER) -v 	$(SHL9LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL9BASEX)		\
-        $(SHL9STACK) -o $(SHL9TARGETN)	\
-        $(SHL9DEF) \
-        $(STDOBJ)							\
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL9OBJS) $(SHL9VERSIONOBJ) \
-        $(SHL9LIBS) \
-        $(SHL9STDLIBS:^"-l") \
-        $(SHL9LINKRES) \
-        $(SHL9STDSHL:^"-l") $(STDSHL9:^"-l")                           \
-    @$(LS) $@ >& $(NULLDEV)
-
-.ENDIF			# "$(USE_DEFFILE)"!=""
-
-.IF "$(SHL9TARGET8)" != "$(SHL9TARGET)"
-    $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL9TARGET8).dll
-.ENDIF
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(SHL9TARGETN)"!=""
 
 # unroll begin
 
 .IF "$(SHL10TARGETN)"!=""
 
-.IF "$(OS)"=="AIX"
-SHL10STDLIBS=
-.ENDIF
-
 .IF "$(SHLLINKARCONLY)" != ""
 SHL10STDLIBS=
 STDSHL=
@@ -4949,20 +4603,23 @@ $(MISC)/$(SHL10VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL10VERS
 .ENDIF
 
 .IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)" == "WNT"
 .IF "$(SHL10IMPLIB)" == ""
 SHL10IMPLIB=i$(TARGET)_t10
 .ENDIF			# "$(SHL10IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
 USE_10IMPLIB=-implib:$(LB)/$(SHL10IMPLIB).lib
-.ENDIF			# "$(COM)" != "GCC"
 SHL10IMPLIBN=$(LB)/$(SHL10IMPLIB).lib
+.ELSE
+SHL10IMPLIBN=$(LB)/lib$(SHL10IMPLIB).dll.a
+USE_10IMPLIB=-Wl,--out-implib=$(SHL10IMPLIBN)
+.ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL10IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
 USE_10IMPLIB_DEPS=$(LB)/$(SHL10IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.ENDIF			# "$(GUI)" == "WNT"
 USE_SHL10DEF=$(SHL10DEF)
 .ELSE			# "$(GUI)" != "UNX"
 USE_SHL10DEF=
@@ -4987,7 +4644,9 @@ $(USE_SHL10VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL10VERSIONMAP)"!=""
 
+.IF "$(OS)" != "AIX"
 SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP)
+.ENDIF
 
 $(USE_SHL10VERSIONMAP): \
                     $(SHL10OBJS)\
@@ -5024,7 +4683,9 @@ $(USE_SHL10VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL10VERSIONMAP)"!=""
 USE_SHL10VERSIONMAP=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET)$(SHL10VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
 SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP)
+.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL10VERSIONMAP): $(SHL10OBJS) $(SHL10LIBS)
@@ -5072,7 +4733,7 @@ $(USE_SHL10VERSIONMAP) .ERRREMOVE: $(SHL10VERSIONMAP)
 .ENDIF			# "$(GUI)" != "UNX"
 
 .IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
 .IF "$(GUI)"=="UNX"
 SHL10SONAME=\"$(SONAME_SWITCH)$(SHL10TARGETN:f)\"
 .ENDIF			# "$(GUI)"!="UNX"
@@ -5095,7 +4756,7 @@ SHL10LINKRESO*=$(MISC)/$(SHL10TARGET)_res.o
 #.IF "$(SHL10TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL10LIBS)"!=""
 $(MISC)/$(SHL10TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -5108,7 +4769,7 @@ $(SHL10TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
 .IF "$(SHL10USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL10LIBS)"!=""
 SHL10LINKLIST=$(MISC)/$(SHL10TARGET)_link.lst
@@ -5125,20 +4786,6 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
-.IF "$(GUI)" == "OS2"
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL10TARGET8=$(shell @fix_shl $(SHL10TARGET))
-.ENDIF
-
-.IF "$(GUI)" == "OS2"
-_SHL10IMP_ORD = $(SHL10STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL10STDLIBS:^"$(LB)/") 
-SHL10IMP_ORD = $(foreach,i,$(_SHL10IMP_ORD) $(shell @-ls $i))
-.ELSE
-SHL10IMP_ORD = 
-.ENDIF
-
-
 $(SHL10TARGETN) : \
                     $(SHL10OBJS)\
                     $(SHL10LIBS)\
@@ -5147,7 +4794,6 @@ $(SHL10TARGETN) : \
                     $(USE_SHL10VERSIONMAP)\
                     $(SHL10RES)\
                     $(SHL10DEPN) \
-                    $(SHL10IMP_ORD) \
                     $(SHL10LINKLIST)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
@@ -5169,39 +4815,69 @@ $(SHL10TARGETN) : \
     @echo $(EMQ)#define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
     @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL10DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL10DEFAULTRES:b).rc
+.IF "$(RCFLAGSOUTRES)"!=""
+# rc, takes separate flag naming output file, source .rc file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL10DEFAULTRES) $(MISC)/$(SHL10DEFAULTRES:b).rc
+.ELSE
+# windres, just takes output file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL10DEFAULTRES:b).rc $(SHL10DEFAULTRES)
+.ENDIF
 .ENDIF			# "$(SHL10DEFAULTRES)"!=""
 .IF "$(SHL10ALLRES)"!=""
     $(COMMAND_ECHO)$(TYPE) $(SHL10ALLRES) > $(SHL10LINKRES)
 .IF "$(COM)"=="GCC"
-    windres $(SHL10LINKRES) $(SHL10LINKRESO)
+    $(WINDRES) $(SHL10LINKRES) $(SHL10LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL10ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --dllname $(SHL10TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_10.cmd
+# GNU ld since 2.17 supports @cmdfile syntax
+.IF "$(USE_DEFFILE)"!=""
+    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL10LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(SHL10DEF) \
+        $(USE_10IMPLIB) \
+        $(STDOBJ) \
+        $(SHL10VERSIONOBJ) $(SHL10OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL10LIBS))) \
+        -Wl,--exclude-libs,ALL,--start-group $(SHL10STDLIBS) -Wl,--end-group \
+        $(SHL10STDSHL) $(STDSHL10) \
+        $(SHL10LINKRESO) \
+    ))
+.ELSE
     @noop $(assign ALL10OBJLIST:=$(STDOBJ) $(SHL10OBJS) $(SHL10LINKRESO) $(shell $(TYPE) /dev/null $(SHL10LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB10NAME)"!=""	# do not have to include objs
     @noop $(assign DEF10OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF10OBJLIST) $(assign ALL10OBJLIST:=$(ALL10OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB10NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_10.cmd
-.IF "$(SHL10DEF)"!=""
-    @echo	--input-def $(SHL10DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_10.cmd
-.ELSE
-    @echo	$(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_10.cmd
-.ENDIF
-    @echo	$(ALL10OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_10.cmd
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
-        $(STDOBJ) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) $(SHL10OBJS) $(SHL10LINKRESO) \
-        `$(TYPE) /dev/null $(SHL10LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
+        --dllname $(SHL10TARGET)$(DLLPOST) \
+        --kill-at \
+        --output-exp $(MISC)/$(@:b)_exp.o \
+        $(SHL10VERSIONOBJ) \
+        @(ALL10OBJLIST)
+    )
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL10LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(MISC)/$(@:b)_exp.o \
+        $(USE_10IMPLIB) \
+        $(STDOBJ) \
+        $(SHL10VERSIONOBJ) $(SHL10OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL10LIBS))) \
         -Wl,--exclude-libs,ALL,--start-group $(SHL10STDLIBS) -Wl,--end-group \
-        $(SHL10STDSHL) $(STDSHL10) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_10.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_10.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
+        $(SHL10STDSHL) $(STDSHL10) \
+        $(SHL10LINKRESO) \
+    ))
+.ENDIF
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL10USE_EXPORTS)"!="name"
@@ -5316,7 +4992,7 @@ $(SHL10TARGETN) : \
     @echo $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
     $(SHL10VERSIONOBJ) \
     `cat /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
     $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_10.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_10.cmd` \
@@ -5336,6 +5012,9 @@ $(SHL10TARGETN) : \
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN)
 .ENDIF				# "$(SHL10NOCHECK)"!=""
 .ENDIF
+.ELIF "$(OS)"=="IOS"
+    $(COMMAND_ECHO)$(AR) $(LIB10FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL10OBJS)) $(shell cat /dev/null $(LIB10TARGET) $(SHL10LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
+    $(COMMAND_ECHO)$(RANLIB) $@
 .ELSE			# "$(OS)"=="MACOSX"
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd
     @echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
@@ -5358,7 +5037,7 @@ $(SHL10TARGETN) : \
 .ENDIF				# "$(SHL10NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!=""
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
     $(COMMAND_ECHO)$(RM) $(LB)/$(SHL10TARGETN:b)
     $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL10TARGETN:f) $(SHL10TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -5367,65 +5046,6 @@ $(SHL10TARGETN) : \
 .ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
-.IF "$(GUI)" == "OS2"
-
-.IF "$(SHL10DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)/$(SHL10DEFAULTRES:b).rc >& $(NULLDEV)
-.IF "$(SHL10ICON)" != ""
-    @-+echo 1 ICON $(SHL10ICON) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL10ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL10ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL10DEFAULTRES:b).rc
-.ENDIF			# "$(SHL10ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL10DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-# YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL10DEFAULTRES:b).rc
-.ENDIF			# "$(SHL10DEFAULTRES)"!=""
-
-.IF "$(SHL10ALLRES)"!=""
-    $(COMMAND_ECHO)+$(TYPE) $(SHL10ALLRES) > $(SHL10LINKRES)
-.ENDIF			# "$(SHL10ALLRES)"!=""
-
-.IF "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL10LINKER) $(SHL10LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
-        $(SHL10DEF) \
-        $(STDOBJ) \
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL10OBJS) $(SHL10VERSIONOBJ) \
-        $(SHL10LIBS) \
-        $(SHL10STDLIBS:^"-l") \
-        $(SHL10LINKRES) \
-        $(SHL10STDSHL:^"-l") $(STDSHL10:^"-l") 
-
-.ELSE			# "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL10LINKER) -v 	$(SHL10LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL10BASEX)		\
-        $(SHL10STACK) -o $(SHL10TARGETN)	\
-        $(SHL10DEF) \
-        $(STDOBJ)							\
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL10OBJS) $(SHL10VERSIONOBJ) \
-        $(SHL10LIBS) \
-        $(SHL10STDLIBS:^"-l") \
-        $(SHL10LINKRES) \
-        $(SHL10STDSHL:^"-l") $(STDSHL10:^"-l")                           \
-    @$(LS) $@ >& $(NULLDEV)
-
-.ENDIF			# "$(USE_DEFFILE)"!=""
-
-.IF "$(SHL10TARGET8)" != "$(SHL10TARGET)"
-    $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL10TARGET8).dll
-.ENDIF
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(SHL10TARGETN)"!=""
 
 # unroll begin
@@ -5441,6 +5061,7 @@ USELIB1DEPN+=$(SHL1LIBS)
 USE_SHL1TARGET=$(SHL1TARGETN)
 .ENDIF
 
+.IF "$(GUI)$(COM)" != "WNTGCC"
 .IF "$(GUI)" != "UNX"
 $(SHL1IMPLIBN):	\
                     $(SHL1DEF) \
@@ -5453,11 +5074,6 @@ $(SHL1IMPLIBN):	\
 .ENDIF
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
-.IF "$(COM)"=="GCC"
-    @echo no ImportLibs on mingw
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ELSE			# "$(COM)=="GCC"
 # bei use_deffile implib von linker erstellt
 .IF "$(USE_DEFFILE)"==""
     $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL1IMPLIBN) \
@@ -5466,14 +5082,6 @@ $(SHL1IMPLIBN):	\
     @echo build of $(SHL1TARGETN) creates $@
     @$(TOUCH) $@
 .ENDIF			# "$(USE_DEFFILE)==""
-.ENDIF			# "$(COM)"=="GCC"
-
-.ELIF "$(GUI)" == "OS2"
-
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-    $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL1VERSIONOBJ)
-    +@echo build of $(SHL1TARGETN) creates $@
 
 .ELSE
     @echo no ImportLibs on Mac and *ix
@@ -5481,6 +5089,7 @@ $(SHL1IMPLIBN):	\
     @$(TOUCH) $@
 .ENDIF
 .ENDIF
+.ENDIF
 
 # unroll begin
 
@@ -5495,6 +5104,7 @@ USELIB2DEPN+=$(SHL2LIBS)
 USE_SHL2TARGET=$(SHL2TARGETN)
 .ENDIF
 
+.IF "$(GUI)$(COM)" != "WNTGCC"
 .IF "$(GUI)" != "UNX"
 $(SHL2IMPLIBN):	\
                     $(SHL2DEF) \
@@ -5507,11 +5117,6 @@ $(SHL2IMPLIBN):	\
 .ENDIF
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
-.IF "$(COM)"=="GCC"
-    @echo no ImportLibs on mingw
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ELSE			# "$(COM)=="GCC"
 # bei use_deffile implib von linker erstellt
 .IF "$(USE_DEFFILE)"==""
     $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL2IMPLIBN) \
@@ -5520,14 +5125,6 @@ $(SHL2IMPLIBN):	\
     @echo build of $(SHL2TARGETN) creates $@
     @$(TOUCH) $@
 .ENDIF			# "$(USE_DEFFILE)==""
-.ENDIF			# "$(COM)"=="GCC"
-
-.ELIF "$(GUI)" == "OS2"
-
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-    $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL2VERSIONOBJ)
-    +@echo build of $(SHL2TARGETN) creates $@
 
 .ELSE
     @echo no ImportLibs on Mac and *ix
@@ -5535,6 +5132,7 @@ $(SHL2IMPLIBN):	\
     @$(TOUCH) $@
 .ENDIF
 .ENDIF
+.ENDIF
 
 # unroll begin
 
@@ -5549,6 +5147,7 @@ USELIB3DEPN+=$(SHL3LIBS)
 USE_SHL3TARGET=$(SHL3TARGETN)
 .ENDIF
 
+.IF "$(GUI)$(COM)" != "WNTGCC"
 .IF "$(GUI)" != "UNX"
 $(SHL3IMPLIBN):	\
                     $(SHL3DEF) \
@@ -5561,11 +5160,6 @@ $(SHL3IMPLIBN):	\
 .ENDIF
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
-.IF "$(COM)"=="GCC"
-    @echo no ImportLibs on mingw
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ELSE			# "$(COM)=="GCC"
 # bei use_deffile implib von linker erstellt
 .IF "$(USE_DEFFILE)"==""
     $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL3IMPLIBN) \
@@ -5574,14 +5168,6 @@ $(SHL3IMPLIBN):	\
     @echo build of $(SHL3TARGETN) creates $@
     @$(TOUCH) $@
 .ENDIF			# "$(USE_DEFFILE)==""
-.ENDIF			# "$(COM)"=="GCC"
-
-.ELIF "$(GUI)" == "OS2"
-
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-    $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL3VERSIONOBJ)
-    +@echo build of $(SHL3TARGETN) creates $@
 
 .ELSE
     @echo no ImportLibs on Mac and *ix
@@ -5589,6 +5175,7 @@ $(SHL3IMPLIBN):	\
     @$(TOUCH) $@
 .ENDIF
 .ENDIF
+.ENDIF
 
 # unroll begin
 
@@ -5603,6 +5190,7 @@ USELIB4DEPN+=$(SHL4LIBS)
 USE_SHL4TARGET=$(SHL4TARGETN)
 .ENDIF
 
+.IF "$(GUI)$(COM)" != "WNTGCC"
 .IF "$(GUI)" != "UNX"
 $(SHL4IMPLIBN):	\
                     $(SHL4DEF) \
@@ -5615,11 +5203,6 @@ $(SHL4IMPLIBN):	\
 .ENDIF
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
-.IF "$(COM)"=="GCC"
-    @echo no ImportLibs on mingw
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ELSE			# "$(COM)=="GCC"
 # bei use_deffile implib von linker erstellt
 .IF "$(USE_DEFFILE)"==""
     $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL4IMPLIBN) \
@@ -5628,14 +5211,6 @@ $(SHL4IMPLIBN):	\
     @echo build of $(SHL4TARGETN) creates $@
     @$(TOUCH) $@
 .ENDIF			# "$(USE_DEFFILE)==""
-.ENDIF			# "$(COM)"=="GCC"
-
-.ELIF "$(GUI)" == "OS2"
-
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-    $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL4VERSIONOBJ)
-    +@echo build of $(SHL4TARGETN) creates $@
 
 .ELSE
     @echo no ImportLibs on Mac and *ix
@@ -5643,6 +5218,7 @@ $(SHL4IMPLIBN):	\
     @$(TOUCH) $@
 .ENDIF
 .ENDIF
+.ENDIF
 
 # unroll begin
 
@@ -5657,6 +5233,7 @@ USELIB5DEPN+=$(SHL5LIBS)
 USE_SHL5TARGET=$(SHL5TARGETN)
 .ENDIF
 
+.IF "$(GUI)$(COM)" != "WNTGCC"
 .IF "$(GUI)" != "UNX"
 $(SHL5IMPLIBN):	\
                     $(SHL5DEF) \
@@ -5669,11 +5246,6 @@ $(SHL5IMPLIBN):	\
 .ENDIF
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
-.IF "$(COM)"=="GCC"
-    @echo no ImportLibs on mingw
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ELSE			# "$(COM)=="GCC"
 # bei use_deffile implib von linker erstellt
 .IF "$(USE_DEFFILE)"==""
     $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL5IMPLIBN) \
@@ -5682,14 +5254,6 @@ $(SHL5IMPLIBN):	\
     @echo build of $(SHL5TARGETN) creates $@
     @$(TOUCH) $@
 .ENDIF			# "$(USE_DEFFILE)==""
-.ENDIF			# "$(COM)"=="GCC"
-
-.ELIF "$(GUI)" == "OS2"
-
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-    $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL5VERSIONOBJ)
-    +@echo build of $(SHL5TARGETN) creates $@
 
 .ELSE
     @echo no ImportLibs on Mac and *ix
@@ -5697,6 +5261,7 @@ $(SHL5IMPLIBN):	\
     @$(TOUCH) $@
 .ENDIF
 .ENDIF
+.ENDIF
 
 # unroll begin
 
@@ -5711,6 +5276,7 @@ USELIB6DEPN+=$(SHL6LIBS)
 USE_SHL6TARGET=$(SHL6TARGETN)
 .ENDIF
 
+.IF "$(GUI)$(COM)" != "WNTGCC"
 .IF "$(GUI)" != "UNX"
 $(SHL6IMPLIBN):	\
                     $(SHL6DEF) \
@@ -5723,11 +5289,6 @@ $(SHL6IMPLIBN):	\
 .ENDIF
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
-.IF "$(COM)"=="GCC"
-    @echo no ImportLibs on mingw
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ELSE			# "$(COM)=="GCC"
 # bei use_deffile implib von linker erstellt
 .IF "$(USE_DEFFILE)"==""
     $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL6IMPLIBN) \
@@ -5736,14 +5297,6 @@ $(SHL6IMPLIBN):	\
     @echo build of $(SHL6TARGETN) creates $@
     @$(TOUCH) $@
 .ENDIF			# "$(USE_DEFFILE)==""
-.ENDIF			# "$(COM)"=="GCC"
-
-.ELIF "$(GUI)" == "OS2"
-
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-    $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL6VERSIONOBJ)
-    +@echo build of $(SHL6TARGETN) creates $@
 
 .ELSE
     @echo no ImportLibs on Mac and *ix
@@ -5751,6 +5304,7 @@ $(SHL6IMPLIBN):	\
     @$(TOUCH) $@
 .ENDIF
 .ENDIF
+.ENDIF
 
 # unroll begin
 
@@ -5765,6 +5319,7 @@ USELIB7DEPN+=$(SHL7LIBS)
 USE_SHL7TARGET=$(SHL7TARGETN)
 .ENDIF
 
+.IF "$(GUI)$(COM)" != "WNTGCC"
 .IF "$(GUI)" != "UNX"
 $(SHL7IMPLIBN):	\
                     $(SHL7DEF) \
@@ -5777,11 +5332,6 @@ $(SHL7IMPLIBN):	\
 .ENDIF
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
-.IF "$(COM)"=="GCC"
-    @echo no ImportLibs on mingw
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ELSE			# "$(COM)=="GCC"
 # bei use_deffile implib von linker erstellt
 .IF "$(USE_DEFFILE)"==""
     $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL7IMPLIBN) \
@@ -5790,14 +5340,6 @@ $(SHL7IMPLIBN):	\
     @echo build of $(SHL7TARGETN) creates $@
     @$(TOUCH) $@
 .ENDIF			# "$(USE_DEFFILE)==""
-.ENDIF			# "$(COM)"=="GCC"
-
-.ELIF "$(GUI)" == "OS2"
-
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-    $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL7VERSIONOBJ)
-    +@echo build of $(SHL7TARGETN) creates $@
 
 .ELSE
     @echo no ImportLibs on Mac and *ix
@@ -5805,6 +5347,7 @@ $(SHL7IMPLIBN):	\
     @$(TOUCH) $@
 .ENDIF
 .ENDIF
+.ENDIF
 
 # unroll begin
 
@@ -5819,6 +5362,7 @@ USELIB8DEPN+=$(SHL8LIBS)
 USE_SHL8TARGET=$(SHL8TARGETN)
 .ENDIF
 
+.IF "$(GUI)$(COM)" != "WNTGCC"
 .IF "$(GUI)" != "UNX"
 $(SHL8IMPLIBN):	\
                     $(SHL8DEF) \
@@ -5831,11 +5375,6 @@ $(SHL8IMPLIBN):	\
 .ENDIF
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
-.IF "$(COM)"=="GCC"
-    @echo no ImportLibs on mingw
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ELSE			# "$(COM)=="GCC"
 # bei use_deffile implib von linker erstellt
 .IF "$(USE_DEFFILE)"==""
     $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL8IMPLIBN) \
@@ -5844,14 +5383,6 @@ $(SHL8IMPLIBN):	\
     @echo build of $(SHL8TARGETN) creates $@
     @$(TOUCH) $@
 .ENDIF			# "$(USE_DEFFILE)==""
-.ENDIF			# "$(COM)"=="GCC"
-
-.ELIF "$(GUI)" == "OS2"
-
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-    $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL8VERSIONOBJ)
-    +@echo build of $(SHL8TARGETN) creates $@
 
 .ELSE
     @echo no ImportLibs on Mac and *ix
@@ -5859,6 +5390,7 @@ $(SHL8IMPLIBN):	\
     @$(TOUCH) $@
 .ENDIF
 .ENDIF
+.ENDIF
 
 # unroll begin
 
@@ -5873,6 +5405,7 @@ USELIB9DEPN+=$(SHL9LIBS)
 USE_SHL9TARGET=$(SHL9TARGETN)
 .ENDIF
 
+.IF "$(GUI)$(COM)" != "WNTGCC"
 .IF "$(GUI)" != "UNX"
 $(SHL9IMPLIBN):	\
                     $(SHL9DEF) \
@@ -5885,11 +5418,6 @@ $(SHL9IMPLIBN):	\
 .ENDIF
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
-.IF "$(COM)"=="GCC"
-    @echo no ImportLibs on mingw
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ELSE			# "$(COM)=="GCC"
 # bei use_deffile implib von linker erstellt
 .IF "$(USE_DEFFILE)"==""
     $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL9IMPLIBN) \
@@ -5898,14 +5426,6 @@ $(SHL9IMPLIBN):	\
     @echo build of $(SHL9TARGETN) creates $@
     @$(TOUCH) $@
 .ENDIF			# "$(USE_DEFFILE)==""
-.ENDIF			# "$(COM)"=="GCC"
-
-.ELIF "$(GUI)" == "OS2"
-
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-    $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL9VERSIONOBJ)
-    +@echo build of $(SHL9TARGETN) creates $@
 
 .ELSE
     @echo no ImportLibs on Mac and *ix
@@ -5913,6 +5433,7 @@ $(SHL9IMPLIBN):	\
     @$(TOUCH) $@
 .ENDIF
 .ENDIF
+.ENDIF
 
 # unroll begin
 
@@ -5927,6 +5448,7 @@ USELIB10DEPN+=$(SHL10LIBS)
 USE_SHL10TARGET=$(SHL10TARGETN)
 .ENDIF
 
+.IF "$(GUI)$(COM)" != "WNTGCC"
 .IF "$(GUI)" != "UNX"
 $(SHL10IMPLIBN):	\
                     $(SHL10DEF) \
@@ -5939,11 +5461,6 @@ $(SHL10IMPLIBN):	\
 .ENDIF
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
-.IF "$(COM)"=="GCC"
-    @echo no ImportLibs on mingw
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ELSE			# "$(COM)=="GCC"
 # bei use_deffile implib von linker erstellt
 .IF "$(USE_DEFFILE)"==""
     $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL10IMPLIBN) \
@@ -5952,14 +5469,6 @@ $(SHL10IMPLIBN):	\
     @echo build of $(SHL10TARGETN) creates $@
     @$(TOUCH) $@
 .ENDIF			# "$(USE_DEFFILE)==""
-.ENDIF			# "$(COM)"=="GCC"
-
-.ELIF "$(GUI)" == "OS2"
-
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-    $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL10VERSIONOBJ)
-    +@echo build of $(SHL10TARGETN) creates $@
 
 .ELSE
     @echo no ImportLibs on Mac and *ix
@@ -5967,4 +5476,5 @@ $(SHL10IMPLIBN):	\
     @$(TOUCH) $@
 .ENDIF
 .ENDIF
+.ENDIF
 
diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk
index 608819da6596..c60480bc5288 100644
--- a/solenv/inc/_tg_zip.mk
+++ b/solenv/inc/_tg_zip.mk
@@ -4,8 +4,6 @@
 command_seperator=&&
 #command_seperator=^
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELIF "$(GUI)"=="OS2"
-command_seperator=&&
 .ELSE
 command_seperator=;
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
@@ -14,6 +12,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 
 .IF "$(ZIP1TARGET)"!=""
 
+.IF "$(ZIP1STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
 ZIP1EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP1LIST:s/LANGDIR//)" == "$(ZIP1LIST)"
@@ -117,6 +120,11 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
     $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
         $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
         $(FI)
+.IF "$(ZIP1STRIPLANGUAGETAGS)" != ""
+    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+        $(SOLARENV)/bin/striplanguagetags.sh $@ \
+        $(FI)
+.ENDIF
 .ENDIF			# "$(ZIP1DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
@@ -127,8 +135,6 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
 command_seperator=&&
 #command_seperator=^
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELIF "$(GUI)"=="OS2"
-command_seperator=&&
 .ELSE
 command_seperator=;
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
@@ -137,6 +143,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 
 .IF "$(ZIP2TARGET)"!=""
 
+.IF "$(ZIP2STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
 ZIP2EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP2LIST:s/LANGDIR//)" == "$(ZIP2LIST)"
@@ -240,6 +251,11 @@ $(ZIP2TARGETN) : delzip $(ZIP2DEPS)
     $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
         $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
         $(FI)
+.IF "$(ZIP2STRIPLANGUAGETAGS)" != ""
+    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+        $(SOLARENV)/bin/striplanguagetags.sh $@ \
+        $(FI)
+.ENDIF
 .ENDIF			# "$(ZIP2DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
@@ -250,8 +266,6 @@ $(ZIP2TARGETN) : delzip $(ZIP2DEPS)
 command_seperator=&&
 #command_seperator=^
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELIF "$(GUI)"=="OS2"
-command_seperator=&&
 .ELSE
 command_seperator=;
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
@@ -260,6 +274,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 
 .IF "$(ZIP3TARGET)"!=""
 
+.IF "$(ZIP3STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
 ZIP3EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP3LIST:s/LANGDIR//)" == "$(ZIP3LIST)"
@@ -363,6 +382,11 @@ $(ZIP3TARGETN) : delzip $(ZIP3DEPS)
     $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
         $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
         $(FI)
+.IF "$(ZIP3STRIPLANGUAGETAGS)" != ""
+    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+        $(SOLARENV)/bin/striplanguagetags.sh $@ \
+        $(FI)
+.ENDIF
 .ENDIF			# "$(ZIP3DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
@@ -373,8 +397,6 @@ $(ZIP3TARGETN) : delzip $(ZIP3DEPS)
 command_seperator=&&
 #command_seperator=^
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELIF "$(GUI)"=="OS2"
-command_seperator=&&
 .ELSE
 command_seperator=;
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
@@ -383,6 +405,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 
 .IF "$(ZIP4TARGET)"!=""
 
+.IF "$(ZIP4STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
 ZIP4EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP4LIST:s/LANGDIR//)" == "$(ZIP4LIST)"
@@ -486,6 +513,11 @@ $(ZIP4TARGETN) : delzip $(ZIP4DEPS)
     $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
         $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
         $(FI)
+.IF "$(ZIP4STRIPLANGUAGETAGS)" != ""
+    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+        $(SOLARENV)/bin/striplanguagetags.sh $@ \
+        $(FI)
+.ENDIF
 .ENDIF			# "$(ZIP4DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
@@ -496,8 +528,6 @@ $(ZIP4TARGETN) : delzip $(ZIP4DEPS)
 command_seperator=&&
 #command_seperator=^
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELIF "$(GUI)"=="OS2"
-command_seperator=&&
 .ELSE
 command_seperator=;
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
@@ -506,6 +536,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 
 .IF "$(ZIP5TARGET)"!=""
 
+.IF "$(ZIP5STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
 ZIP5EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP5LIST:s/LANGDIR//)" == "$(ZIP5LIST)"
@@ -609,6 +644,11 @@ $(ZIP5TARGETN) : delzip $(ZIP5DEPS)
     $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
         $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
         $(FI)
+.IF "$(ZIP5STRIPLANGUAGETAGS)" != ""
+    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+        $(SOLARENV)/bin/striplanguagetags.sh $@ \
+        $(FI)
+.ENDIF
 .ENDIF			# "$(ZIP5DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
@@ -619,8 +659,6 @@ $(ZIP5TARGETN) : delzip $(ZIP5DEPS)
 command_seperator=&&
 #command_seperator=^
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELIF "$(GUI)"=="OS2"
-command_seperator=&&
 .ELSE
 command_seperator=;
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
@@ -629,6 +667,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 
 .IF "$(ZIP6TARGET)"!=""
 
+.IF "$(ZIP6STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
 ZIP6EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP6LIST:s/LANGDIR//)" == "$(ZIP6LIST)"
@@ -732,6 +775,11 @@ $(ZIP6TARGETN) : delzip $(ZIP6DEPS)
     $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
         $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
         $(FI)
+.IF "$(ZIP6STRIPLANGUAGETAGS)" != ""
+    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+        $(SOLARENV)/bin/striplanguagetags.sh $@ \
+        $(FI)
+.ENDIF
 .ENDIF			# "$(ZIP6DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
@@ -742,8 +790,6 @@ $(ZIP6TARGETN) : delzip $(ZIP6DEPS)
 command_seperator=&&
 #command_seperator=^
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELIF "$(GUI)"=="OS2"
-command_seperator=&&
 .ELSE
 command_seperator=;
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
@@ -752,6 +798,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 
 .IF "$(ZIP7TARGET)"!=""
 
+.IF "$(ZIP7STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
 ZIP7EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP7LIST:s/LANGDIR//)" == "$(ZIP7LIST)"
@@ -855,6 +906,11 @@ $(ZIP7TARGETN) : delzip $(ZIP7DEPS)
     $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
         $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
         $(FI)
+.IF "$(ZIP7STRIPLANGUAGETAGS)" != ""
+    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+        $(SOLARENV)/bin/striplanguagetags.sh $@ \
+        $(FI)
+.ENDIF
 .ENDIF			# "$(ZIP7DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
@@ -865,8 +921,6 @@ $(ZIP7TARGETN) : delzip $(ZIP7DEPS)
 command_seperator=&&
 #command_seperator=^
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELIF "$(GUI)"=="OS2"
-command_seperator=&&
 .ELSE
 command_seperator=;
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
@@ -875,6 +929,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 
 .IF "$(ZIP8TARGET)"!=""
 
+.IF "$(ZIP8STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
 ZIP8EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP8LIST:s/LANGDIR//)" == "$(ZIP8LIST)"
@@ -978,6 +1037,11 @@ $(ZIP8TARGETN) : delzip $(ZIP8DEPS)
     $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
         $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
         $(FI)
+.IF "$(ZIP8STRIPLANGUAGETAGS)" != ""
+    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+        $(SOLARENV)/bin/striplanguagetags.sh $@ \
+        $(FI)
+.ENDIF
 .ENDIF			# "$(ZIP8DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
@@ -988,8 +1052,6 @@ $(ZIP8TARGETN) : delzip $(ZIP8DEPS)
 command_seperator=&&
 #command_seperator=^
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELIF "$(GUI)"=="OS2"
-command_seperator=&&
 .ELSE
 command_seperator=;
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
@@ -998,6 +1060,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 
 .IF "$(ZIP9TARGET)"!=""
 
+.IF "$(ZIP9STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
 ZIP9EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP9LIST:s/LANGDIR//)" == "$(ZIP9LIST)"
@@ -1101,6 +1168,11 @@ $(ZIP9TARGETN) : delzip $(ZIP9DEPS)
     $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
         $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
         $(FI)
+.IF "$(ZIP9STRIPLANGUAGETAGS)" != ""
+    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+        $(SOLARENV)/bin/striplanguagetags.sh $@ \
+        $(FI)
+.ENDIF
 .ENDIF			# "$(ZIP9DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
@@ -1111,8 +1183,6 @@ $(ZIP9TARGETN) : delzip $(ZIP9DEPS)
 command_seperator=&&
 #command_seperator=^
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELIF "$(GUI)"=="OS2"
-command_seperator=&&
 .ELSE
 command_seperator=;
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
@@ -1121,6 +1191,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 
 .IF "$(ZIP10TARGET)"!=""
 
+.IF "$(ZIP10STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
 ZIP10EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP10LIST:s/LANGDIR//)" == "$(ZIP10LIST)"
@@ -1224,6 +1299,11 @@ $(ZIP10TARGETN) : delzip $(ZIP10DEPS)
     $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
         $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
         $(FI)
+.IF "$(ZIP10STRIPLANGUAGETAGS)" != ""
+    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+        $(SOLARENV)/bin/striplanguagetags.sh $@ \
+        $(FI)
+.ENDIF
 .ENDIF			# "$(ZIP10DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk
index 2d182a66a437..dd86f7e4a825 100644
--- a/solenv/inc/ant.mk
+++ b/solenv/inc/ant.mk
@@ -53,7 +53,7 @@ CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(JAVA
 
 # --- TARGETS -----------------------------------------------------
 
-$(CLASSDIR)/solar.properties : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg $(SOLARENV)/inc/ant.properties
+$(CLASSDIR)/solar.properties : $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg $(SOLARENV)/inc/ant.properties
     @echo "Making:   " $@
     @echo solar.build=$(BUILD) > $@
     @echo solar.rscversion=$(USQ)$(RSCVERSION)$(USQ) >> $@
@@ -65,13 +65,13 @@ $(CLASSDIR)/solar.properties : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minor
     @cat $(DMAKEROOT)/../ant.properties >> $@
 
 ANTBUILD .PHONY:
-    $(ANT) $(ANT_FLAGS)
+    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS)
 
 clean  .PHONY:
-    $(ANT) $(ANT_FLAGS) $@
+    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
 
 prepare .PHONY:
-    $(ANT) $(ANT_FLAGS) $@
+    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
 
 main: .PHONY:
     $(ANT) $(ANT_FLAGS) $@
@@ -80,21 +80,19 @@ info: .PHONY
     $(ANT) $(ANT_FLAGS) $@
 
 jar .PHONY:
-    $(ANT) $(ANT_FLAGS) $@
+    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
 
 compile .PHONY:
-    $(ANT) $(ANT_FLAGS) $@
+    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
 
 depend .PHONY:
-    $(ANT) $(ANT_FLAGS) $@
+    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
 
 javadoc .PHONY:
-    $(ANT) $(ANT_FLAGS) $@
+    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
 
 config .PHONY:
-    $(ANT) $(ANT_FLAGS) $@
+    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
 
 test .PHONY:
-    $(ANT) $(ANT_FLAGS) $@
-
-
+    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk
index 5a28b242967d..fda4a82896ab 100644
--- a/solenv/inc/antsettings.mk
+++ b/solenv/inc/antsettings.mk
@@ -40,6 +40,18 @@ PATH!:=$(ANT_HOME)/bin:$(PATH)
 ANT*:=$(ANT_HOME)/bin/ant
 ANT_BUILDFILE*=build.xml
 
+.IF "$(ANT_COMPILER_FLAGS)"==""
+.IF "$(JAVACISGCJ)" == "yes"
+ANT_COMPILER_FLAGS=-Dbuild.compiler=gcj
+.ENDIF
+.ENDIF
+
+.IF "$(ANT_JAVA_VER_FLAGS)"==""
+.IF "$(JDK)" != "gcj" && $(JAVACISKAFFE) != "yes"
+ANT_JAVA_VER_FLAGS=-Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER)
+.ENDIF
+.ENDIF
+
 .IF "$(ANT_DEBUG)"==""
 .IF "$(debug)"==""
 ANT_DEBUG=off
@@ -56,26 +68,24 @@ ANT_OPT=on
 .ENDIF
 .ENDIF
 
+.IF "$(VERBOSE)" == "TRUE"
+    ANT_VERBOSE=-v
+.ELSE
+    ANT_VERBOSE=-q
+.ENDIF
+
 .IF "$(JDK)"=="gcj"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
 .ENDIF
 
-.IF "$(JAVACISGCJ)" == "yes"
-ANT_FLAGS!:=-Dbuild.compiler=gcj -Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) \
- -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) \
- -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) \
- -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
+ANT_FLAGS!:=$(ANT_COMPILER_FLAGS) -Dprj=$(PRJ) -Dprjname=$(PRJNAME) $(ANT_JAVA_VER_FLAGS) \
+ -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on \
+ -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) \
+ -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
  -Dcommon.doc=$(SOLARCOMMONDOCDIR) -Dsolar.sourceversion=$(SOURCEVERSION) \
- -Dsolar.lastminor=$(LAST_MINOR) -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
-.ELSE
-ANT_FLAGS!:=-Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) \
- -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" \
- -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) \
- -Dcommon.jar=$(SOLARCOMMONBINDIR) -Dcommon.doc=$(SOLARCOMMONDOCDIR) \
- -Dsolar.sourceversion=$(SOURCEVERSION) -Dsolar.lastminor=$(LAST_MINOR) \
- -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
-.ENDIF
+ -Dsolar.lastminor=$(LAST_MINOR) -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) \
+ -emacs $(ANT_VERBOSE)
 .ELSE # No java
 ANT=
 ANT_FLAGS=
diff --git a/solenv/inc/doxygen.cfg b/solenv/inc/doxygen.cfg
new file mode 100644
index 000000000000..7aa1548c0d22
--- /dev/null
+++ b/solenv/inc/doxygen.cfg
@@ -0,0 +1,1314 @@
+# Doxyfile 1.5.3
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file that
+# follow. The default is UTF-8 which is also the encoding used for all text before
+# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into
+# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of
+# possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = "$(DOXYGEN_PROJECTNAME) ($(DOXYGEN_VERSION)) "
+
+# 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         = 1
+
+# 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       = $(DOXYGEN_OUTPUT)
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# 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:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian,
+# Italian, Japanese, Japanese-en (Japanese with English messages), Korean,
+# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian,
+# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# 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).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+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 ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
+# 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
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = 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
+
+# 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
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# 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.
+
+ALIASES                = "tpl=\par Template parameter: \n" "since=\par Available since: \n" "derive=\par Derive: \n" "attention=\par Attention: \n"
+# precond throws see path todo(own section, can enable!)
+
+# 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.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for Java.
+# For instance, namespaces will be presented as packages, qualified scopes
+# will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to
+# include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# 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
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC         = YES
+
+# 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  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be extracted
+# and appear in the documentation as a namespace called 'anonymous_namespace{file}',
+# where file will be replaced with the base name of the file that contains the anonymous
+# namespace. By default anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# 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 HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# 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
+
+# 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
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST       = NO
+
+# 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
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = NO
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from the
+# version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# 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                  = 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
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = NO
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# 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. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            =
+
+# 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
+# to stderr.
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT                  = $(DOXYGEN_INPUT)
+
+# This tag can be used to specify the character encoding of the source files that
+# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default
+# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding.
+# See http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# 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
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
+
+FILE_PATTERNS          =
+
+# 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.
+# If left blank NO is used.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the output.
+# The symbol name can be a fully qualified name, a word, or if the wildcard * is used,
+# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.  Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.  The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# is applied to all files.
+
+FILTER_PATTERNS        =
+
+# 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 (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH
+# then you must also enable this option. If you don't then doxygen will produce
+# a warning and turn it on anyway
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default)
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES (the default)
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.  Otherwise they will link to the documentstion.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+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            =
+
+# 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
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header.
+
+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            =
+
+# 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. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+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
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = 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 directory.
+
+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).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+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   = 1
+
+# 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
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
+# probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# 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           =
+
+# 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.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF 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 `rtf' will be used as the default path.
+
+RTF_OUTPUT             =
+
+# 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
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# 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             =
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          =
+
+# 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
+# documented in the real man page(s). These additional files
+# 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              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# 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                =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.  This is useful
+# if you want to understand what is going on.  On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# 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
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH           = $(DOXYGEN_INCLUDE_PATH)
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED             = LINUX \
+                         UNX \
+                         VCL \
+                         GCC \
+                         C341 \
+                         X86_64 \
+                         _DEBUG_RUNTIME \
+                         VER=C341 \
+                         NPTL \
+                         GLIBC=2 \
+                         NEW_SOLAR \
+                         _USE_NAMESPACE=1 \
+                         UNIX \
+                         SUPD=300 \
+                         DEBUG \
+                         DBG_UTIL \
+                         OSL_DEBUG_LEVEL=2 \
+                         CUI \
+                         SOLAR_JAVA \
+                         EXCEPTIONS_ON
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+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, 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
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+#   TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#   TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               = $(DOXYGEN_REF_TAGFILES)
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = $(DOXYGEN_OUR_TAGFILE)
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+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              =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option is superseded by the HAVE_DOT option below. This is only a
+# fallback. It is recommended to install and use dot, since it yields more
+# powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to
+# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to
+# specify the directory where the mscgen tool resides. If left empty the tool is assumed to
+# be found in the default search path.
+
+MSCGEN_PATH            =
+
+# 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               = 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
+# indirect inheritance relations. Setting this tag to YES will force the
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK               = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = YES
+
+# 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
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will
+# generate a call dependency graph for every global function or class method.
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will
+# generate a caller dependency graph for every global function or class method.
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
+# 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    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = 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
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS           =
+
+# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the number
+# of direct children of the root node in a graph is already larger than
+# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, which results in a white background.
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
+# 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
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP            = NO
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = NO
diff --git a/solenv/inc/extension_helplink.mk b/solenv/inc/extension_helplink.mk
index e375696bda18..c9fa15e6770b 100644
--- a/solenv/inc/extension_helplink.mk
+++ b/solenv/inc/extension_helplink.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -32,10 +32,10 @@ my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANA
 .ELSE
 my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.3.jar
 .ENDIF
- 
+
 .IF "$(SYSTEM_DB)" != "YES"
 JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
-.ENDIF 
+.ENDIF
 
 #aux_alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j  $i $(NULL))))
 aux_alllangiso*:=$(alllangiso)
@@ -77,4 +77,3 @@ $(HELPLINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/$$(@:b:s/_/./
     -$(RM) $(XHPLINKSRC)/$(@:b)/content/*.*
     -$(RM) $(XHPLINKSRC)/$(@:b)/caption/*.*
 .ENDIF
-
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index 7b8c99b37fe8..5204af7dd29a 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -85,7 +85,7 @@ $(EXTENSIONDIR) :
 
 $(PACK_RUNTIME_FLAG) : $(EXTENSIONDIR)
     @@-$(MKDIRHIER) $(@:d)
-.IF "$(OS)$(CPU)"=="WNTI"
+.IF "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
 .IF "$(COM)"=="GCC"
    $(GNUCOPY) $(SOLARBINDIR)/mingwm10.dll $(EXTENSIONDIR)
    .IF "$(MINGW_GCCDLL)"!=""
@@ -131,7 +131,7 @@ $(PACK_RUNTIME_FLAG) : $(EXTENSIONDIR)
 .ENDIF			# "$(CCNUMVER)" <= "001399999999"
 .ENDIF          # "$(PACKMS)"!=""
 .ENDIF	#"$(COM)"=="GCC" 
-.ENDIF 			# "$(OS)$(CPU)"=="WNTI"
+.ENDIF 			# "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
     @$(TOUCH) $@
 .ENDIF			# "$(PACK_RUNTIME)"!=""
 
@@ -146,25 +146,22 @@ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
     @@-$(MKDIRHIER) $(@:d)
     @echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)/$(TARGET)_lang_track.mk
 
-    $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.1.$(EXTNAME)
+    $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/transform_description.pl $(DESCRIPTION_SRC) $@.1.$(EXTNAME)
 
-    $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/transform_description.pl $@.1.$(EXTNAME) $@.2.$(EXTNAME)
+    $(COMMAND_ECHO)$(TYPE) $@.1.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $@.2.$(EXTNAME)
     @@-$(RM) $@.1.$(EXTNAME)
 
-    $(COMMAND_ECHO)$(TYPE) $@.2.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $@.3.$(EXTNAME)
+    $(COMMAND_ECHO)$(TYPE) $@.2.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
     @@-$(RM) $@.2.$(EXTNAME)
 
-    $(COMMAND_ECHO)$(TYPE) $@.3.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
-    @@-$(RM) $@.3.$(EXTNAME)
-
 .ENDIF			# "$(DESCRIPTION)"!=""
 # default OOo license text!!!
 # may not fit...
 .IF "$(CUSTOM_LICENSE)"==""
 .IF "$(GUI)" == "WNT"
-PACKLICDEPS=$(SOLARBINDIR)/osl/license$$(@:b:s/_/./:e:s/./_/)$$(@:e)
+PACKLICDEPS=$(SOLARBINDIR)/osl/license.txt
 .ELSE			# "$(GUI)" == "WNT"
-PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
+PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE
 .ENDIF			# "$(GUI)" == "WNT"
 .ELSE			# "$(CUSTOM_LICENSE)" == ""
 PACKLICDEPS=$(CUSTOM_LICENSE)
diff --git a/solenv/inc/extension_pre.mk b/solenv/inc/extension_pre.mk
index abef2e7f8b73..7fd8f5d86c85 100644
--- a/solenv/inc/extension_pre.mk
+++ b/solenv/inc/extension_pre.mk
@@ -39,11 +39,11 @@ COMPONENT_MANIFEST*:=$(EXTENSIONDIR)/META-INF/manifest.xml
 MANIFEST_SRC*:=manifest.xml
 
 .IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
-PACKLICS*:=$(foreach,i,$(alllangiso) $(EXTENSIONDIR)/registration/license_$i.txt)
-COMPONENT_LIC_TEMPL*:=registration/license_xxx.txt
+PACKLICS*:=$(EXTENSIONDIR)/registration/license.txt
+COMPONENT_LIC_TEMPL*:=registration/license.txt
 .ELSE
-PACKLICS*:=$(foreach,i,$(alllangiso) $(EXTENSIONDIR)/registration/LICENSE_$i)
-COMPONENT_LIC_TEMPL*:=registration/LICENSE_xxx
+PACKLICS*:=$(EXTENSIONDIR)/registration/LICENSE
+COMPONENT_LIC_TEMPL*:=registration/LICENSE
 .ENDIF
 
 #TODO:  check ZIP9TARGET for previous use!
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index 8553a739d5d1..bc4baa85bb12 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -51,28 +51,28 @@ my_file = file://
 .IF "$(UPDATER)" == "YES" && "$(SHIPDRIVE)" != "" && \
     "$(CWS_WORK_STAMP)" == "" && "$(SOLARENV:s/$(SOL_TMP)//" == "$(SOLARENV)"
 my_instsets = $(shell ls -dt \
-    $(SHIPDRIVE)/$(INPATH)/OpenOffice/archive/$(WORK_STAMP)_$(LAST_MINOR)_native_packed-*_$(defaultlangiso).$(BUILD))
+    $(SHIPDRIVE)/$(INPATH)/LibreOffice/archive/$(WORK_STAMP)_$(LAST_MINOR)_native_packed-*_$(defaultlangiso).$(BUILD))
 installationtest_instset = $(my_instsets:1)
 .ELSE
 installationtest_instset = \
-    $(SOLARSRC)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(defaultlangiso)
+    $(SOLARSRC)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/$(defaultlangiso)
 .END
 
 .IF "$(OS)" == "WNT"
 installationtest_instpath = `cat $(MISC)/$(TARGET)/installation.flag`
 .ELSE
-installationtest_instpath = $(SOLARVERSION)/$(INPATH)/installation$(UPDMINOREXT)
+installationtest_instpath = $(SOLARVERSION)/$(INPATH)/installation
 .END
 
 .IF "$(OS)" == "MACOSX"
 my_sofficepath = \
-    $(installationtest_instpath)/opt/OpenOffice.org.app/Contents/MacOS/soffice
+    $(installationtest_instpath)/opt/LibreOffice.app/Contents/MacOS/soffice
 .ELIF "$(OS)" == "WNT"
 my_sofficepath = \
-    $(installationtest_instpath)'/opt/OpenOffice.org 3/program/soffice.exe'
+    $(installationtest_instpath)'/opt/LibreOffice 3/program/soffice.exe'
 .ELSE
 my_sofficepath = \
-    $(installationtest_instpath)/opt/openoffice.org3/program/soffice
+    $(installationtest_instpath)/opt/program/soffice
 .END
 
 .IF "$(OOO_TEST_SOFFICE)" == ""
@@ -97,10 +97,10 @@ my_javaenv = \
 .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
 OOO_EXTRACT_TO:=$(shell cygpath -m `mktemp -dt ooosmoke.XXXXXX`)
 $(MISC)/$(TARGET)/installation.flag : $(shell \
-        ls $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).zip)
+        ls $(installationtest_instset)/LibO_*_install-arc_$(defaultlangiso).zip)
     $(COMMAND_ECHO)$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)unzip -q $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).zip -d "$(OOO_EXTRACT_TO)"
-    $(COMMAND_ECHO)mv "$(OOO_EXTRACT_TO)"/OOo_*_install-arc_$(defaultlangiso) "$(OOO_EXTRACT_TO)"/opt
+    $(COMMAND_ECHO)unzip -q $(installationtest_instset)/LibO_*_install-arc_$(defaultlangiso).zip -d "$(OOO_EXTRACT_TO)"
+    $(COMMAND_ECHO)mv "$(OOO_EXTRACT_TO)"/LibO_*_install-arc_$(defaultlangiso) "$(OOO_EXTRACT_TO)"/opt
     $(COMMAND_ECHO)echo "$(OOO_EXTRACT_TO)" > $@
 .END
 
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index bbf940e77406..0e58717c6a2e 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -25,21 +25,18 @@
 #
 #*************************************************************************
 
+# Complete list of all supported localizations (ISO codes)
 completelangiso=af \
 ar \
 as \
-as-IN \
 ast \
-be-BY \
+be \
 bo \
 bg \
 br \
 brx \
 bn \
-bn-BD \
-bn-IN \
 bs \
-by \
 ca \
 ca-XV \
 cs \
@@ -59,26 +56,18 @@ eu \
 fa \
 fi \
 fr \
-fur \
 ga \
-gd \
 gl \
 gu \
-gu-IN \
 he \
 hi \
-hi-IN \
 hr \
-ht \
 hu \
+id \
 is \
 it \
 ja \
-jbo \
-kid \
-ky \
 ka \
-kab \
 kk \
 km \
 kn \
@@ -93,11 +82,8 @@ mai \
 mk \
 mn \
 mni \
-ms \
 ml \
-ml-IN \
 mr \
-mr-IN \
 my \
 ne \
 nb \
@@ -105,48 +91,31 @@ nl \
 nn \
 nr \
 nso \
-ny \
 om \
-oms \
 oc \
 or \
-or-IN \
-pap \
-pa \
 pa-IN \
 pl \
-ps \
 pt \
 pt-BR \
-gug \
-pyg \
 ro \
 ru \
 rw \
 sat \
-sa \
 sa-IN \
 si \
-sc \
 sd \
 sq \
 sk \
 sl \
 sh \
-so \
 sr \
 ss \
 st \
 sv \
-sw \
 sw-TZ \
 te \
-te-IN \
-ti \
-ti-ER \
 ta \
-ta-IN \
-tlh \
 th \
 tn \
 tr \
@@ -154,8 +123,6 @@ tk \
 ts \
 tg \
 ug \
-ur \
-ur-IN \
 uk \
 uz \
 ve \
diff --git a/solenv/inc/layout.mk b/solenv/inc/layout.mk
index 0fb4c39454c9..7b808f0b35aa 100644
--- a/solenv/inc/layout.mk
+++ b/solenv/inc/layout.mk
@@ -1,4 +1,4 @@
-TRALAY=$(AUGMENT_LIBRARY_PATH) tralay
+TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/tralay
 XML_DEST=$(DLLDEST)
 XML_LANGS=$(alllangiso)
 
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 6533a619591f..0d1a7b00e334 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -26,7 +26,16 @@
 #*************************************************************************
 LIBSMKREV!:="$$Revision: 1.134.2.3 $$"
 
-.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
+.INCLUDE .IGNORE : icuversion.mk
+.INCLUDE .IGNORE : i18npool/version.mk
+.INCLUDE .IGNORE : comphelper/version.mk
+.INCLUDE .IGNORE : ucbhelper/version.mk
+.INCLUDE .IGNORE : connectivity/version.mk
+
+.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
+
+# No ODMA on UNX
+ODMA_LIB_LIB=
 
 #
 #externe libs in plattform.mk
@@ -37,28 +46,22 @@ AWTLIB*=$(JAVA_HOME)/lib/jawt.lib
 AWTLIB*=-ljawt
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 AVMEDIALIB=-lavmedia$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC"
-.INCLUDE .IGNORE : icuversion.mk
+.IF "$(GUI)$(COM)"=="WNTGCC" && "$(SYSTEM_ICU)"!="YES"
 ICUINLIB=-licuin$(ICU_MAJOR)$(ICU_MINOR)
 ICULELIB=-licule$(ICU_MAJOR)$(ICU_MINOR)
 ICUUCLIB=-licuuc$(ICU_MAJOR)$(ICU_MINOR)
 ICUDATALIB=-licudt$(ICU_MAJOR)$(ICU_MINOR)
-.ELSE			# "$(GUI)$(COM)"=="WNTGCC"
+.ELSE			# "$(GUI)$(COM)"=="WNTGCC" && "$(SYSTEM_ICU)"!="YES"
 ICUINLIB=-licui18n
 ICULELIB=-licule
 ICUUCLIB=-licuuc
 ICUDATALIB=-licudata
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
+.ENDIF			# "$(GUI)$(COM)"=="WNTGCC" && "$(SYSTEM_ICU)"!="YES"
 I18NUTILLIB=-li18nutil$(COMID)
-.INCLUDE .IGNORE : i18npool/version.mk
 I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID)
 I18NPAPERLIB=-li18npaper$(DLLPOSTFIX)
 I18NREGEXPLIB=-li18nregexp$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC"
-SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID)
-.ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 SALHELPERLIB=-luno_salhelper$(COMID)
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 XMLSCRIPTLIB =-lxcr$(DLLPOSTFIX)
 COMPHELPERLIB=-lcomphelp$(COMID)
 CONNECTIVITYLIB=-lconnectivity
@@ -73,7 +76,6 @@ CPPUHELPERLIB=-lcppuhelper$(UDK_MAJOR)$(COMID)
 CPPULIB=-luno_cppu
 CPPUHELPERLIB=-luno_cppuhelper$(COMID)
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.INCLUDE .IGNORE : ucbhelper/version.mk
 UCBHELPERLIB=-lucbhelper4$(COMID)
 .IF "$(SYSTEM_OPENSSL)" == "YES"
 OPENSSLLIB=$(OPENSSL_LIBS)
@@ -91,18 +93,15 @@ REGLIB=-lreg$(UDK_MAJOR)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 REGLIB=-lreg
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.INCLUDE .IGNORE : vos/version.mk
-VOSLIB=-lvos$(VOS_MAJOR)$(COMID)
 XMLOFFLIB=-lxo$(DLLPOSTFIX)
 XMLOFFLLIB=-lxol
 .IF "$(GUI)$(COM)"=="WNTGCC"
 STORELIB=-lstore$(UDK_MAJOR)
-SALLIB=-lsal$(UDK_MAJOR)
+SALLIB=-luno_sal$(UDK_MAJOR)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 STORELIB=-lstore
 SALLIB=-luno_sal
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.INCLUDE .IGNORE : connectivity/version.mk
 ODBCLIB=-lodbc$(DLLPOSTFIX)
 ODBCBASELIB=-lodbcbase$(DLLPOSTFIX)
 DBFILELIB=-lfile$(DLLPOSTFIX)
@@ -113,7 +112,6 @@ RMCXTLIB=-lrmcxt
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 BTSTRPLIB=-lbtstrp
 BTSTRPDTLIB=-lbootstrpdt$(DLLPOSTFIX)
-SOLDEPLIB=-lsoldep$(DLLPOSTFIX)
 TRANSEXLIB=-ltransex
 OTXLIB=-lotx_ind
 OSXLIB=-losx
@@ -201,18 +199,7 @@ ZLIB3RDLIB=-lz
 ZLIB3RDLIB=-lzlib
 .ENDIF
 .IF "$(SYSTEM_JPEG)"=="YES"
-.IF "$(SOLAR_JAVA)" != "" && "$(JDK)" != "gcj" && "$(OS)" != "MACOSX"
-#i34482# Blackdown/Sun jdk is in the libsearch patch and has a libjpeg :-(
-.IF "$(OS)" == "FREEBSD"
-JPEG3RDLIB=/usr/local/lib/libjpeg.so
-.ELIF "$(CPUNAME)" == "X86_64" || "$(CPUNAME)" == "S390X" || "$(CPUNAME)" == "POWERPC64"
-JPEG3RDLIB=/usr/lib64/libjpeg.so
-.ELSE
-JPEG3RDLIB=/usr/lib/libjpeg.so
-.ENDIF
-.ELSE
 JPEG3RDLIB=-ljpeg
-.ENDIF
 .ELSE
 JPEG3RDLIB=-ljpeglib
 .ENDIF
@@ -226,14 +213,13 @@ NEON3RDLIB=$(SOLARLIBDIR)/libneon.dylib
 NEON3RDLIB=-lneon
 .ENDIF
 .IF "$(SYSTEM_DB)" == "YES"
-BERKELEYLIB=-ldb
+BERKELEYLIB=-l$(DB_LIB)
 .ELSE
 BERKELEYLIB=-ldb-4.7
 .ENDIF
 CURLLIB=-lcurl
 SFX2LIB=-lsfx$(DLLPOSTFIX)
 SFXLIB=-lsfx$(DLLPOSTFIX)
-EGGTRAYLIB=-leggtray$(DLLPOSTFIX)
 SFXDEBUGLIB=
 FWELIB=-lfwe$(DLLPOSTFIX)
 FWILIB=-lfwi$(DLLPOSTFIX)
@@ -251,6 +237,7 @@ SCHLIB=-lysch
 SMLIB=-lysm
 OFALIB=-lofa$(DLLPOSTFIX)
 PRXLIB=-llprx2$(DLLPOSTFIX)
+PACKAGE2LIB=-lpackage2
 PAPILIB=-lpap$(DLLPOSTFIX)
 SCLIB=-lsclib
 SDLIB=-lsdlib
@@ -319,7 +306,7 @@ BFSVTOOLLIB=-lbf_svt$(DLLPOSTFIX)
 # Libraries
 USED_OSL_LIBS =
 USED_VOS_LIBS =		$(OSLLIB)
-USED_UNO_LIBS =		$(VOSLIB) $(OSLLIB)
+USED_UNO_LIBS =		 $(OSLLIB)
 USED_TOOLS_LIBS =
 USED_SOT_LIBS = 	$(TOOLSLIB)
 USED_VCL_LIBS =		$(SOTLIB) $(TOOLSLIB) $(USED_UNO_LIBS)
@@ -354,18 +341,15 @@ UNOPKGAPPLIB=-lunopkgapp
 TESTLIB=-ltest
 XMLREADERLIB=-lxmlreader
 
-.ELSE				# ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
+.ELSE				# ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
 
+ODMA_LIB_LIB=odma_lib.lib
 AWTLIB*=jawt.lib
 AVMEDIALIB=iavmedia.lib
 ICUINLIB=icuin.lib
 ICULELIB=icule.lib
 ICUUCLIB=icuuc.lib
-.IF "$(GUI)"=="OS2"
 ICUDATALIB=icudt.lib
-.ELSE
-ICUDATALIB=icudata.lib
-.ENDIF
 I18NUTILLIB=ii18nutil.lib
 I18NISOLANGLIB=ii18nisolang.lib
 I18NPAPERLIB=ii18npaper.lib
@@ -378,11 +362,7 @@ LDAPBERLIB=ldapber.lib
 CPPULIB=icppu.lib
 CPPUHELPERLIB=icppuhelper.lib
 UCBHELPERLIB=iucbhelper.lib
-.IF "$(GUI)"=="OS2"
-OPENSSLLIB=ssl.lib crypto.lib
-.ELSE
 OPENSSLLIB=ssleay32.lib libeay32.lib
-.ENDIF
 ODBCLIB=iodbc.lib
 ODBCBASELIB=iodbcbase.lib
 DBFILELIB=ifile.lib
@@ -390,7 +370,6 @@ TOOLSLIB=itools.lib
 TOOLSLIBST=atools.lib
 BPICONVLIB=bpiconv.lib
 SALLIB=isal.lib
-VOSLIB=ivos.lib
 UNOTOOLSLIB=iutl.lib
 RMCXTLIB=irmcxt.lib
 XMLOFFLIB=ixo.lib
@@ -411,7 +390,6 @@ FWELIB=ifwe.lib
 FWILIB=ifwi.lib
 BTSTRPLIB=btstrp.lib
 BTSTRPDTLIB=bootstrpdt.lib
-SOLDEPLIB=soldep.lib
 TRANSEXLIB=transex.lib
 ICOLIB=icom.lib
 SVTOOLLIB=svtool.lib
@@ -437,7 +415,6 @@ DOCMGRLIB=docmgr.lib
 BASICLIB=basic.lib
 VBAHELPERLIB=vbahelper.lib
 TKTLIB=tkt.lib
-SJLIB=sj.lib
 SVXCORELIB=isvxcore.lib
 MSFILTERLIB=imsfilter.lib
 SVXLIB=isvx.lib
@@ -468,6 +445,7 @@ SDLIB=sdlib.lib
 SDLLIB=sdl.lib
 SWLIB=swlib.lib
 PRXLIB=ilprx2.lib
+PACKAGE2LIB=ipackage.lib
 ISWLIB=_sw.lib
 ISCLIB=sci.lib
 ISDLIB=sdi.lib
@@ -490,11 +468,7 @@ HELPLINKERLIB=ihelplinker.lib
 JVMACCESSLIB = ijvmaccess.lib
 CPPUNITLIB = icppunit_dll.lib
 XSLTLIB = libxslt.lib $(LIBXML2LIB)
-.IF "$(GUI)"=="OS2"
-REDLANDLIB = raptor.a rasqal.a rdf.a $(LIBXML2LIB) $(OPENSSLLIB) pthread.lib
-.ELSE
 REDLANDLIB = librdf.lib
-.ENDIF
 
 JVMFWKLIB = ijvmfwk.lib
 
@@ -535,6 +509,7 @@ LPSOLVELIB=lpsolve55.lib
 SOFFICELIB=isofficeapp.lib
 UNOPKGAPPLIB=iunopkgapp.lib
 TESTLIB=itest.lib
+BOOSTTHREADLIB=boostthread.lib
 XMLREADERLIB=ixmlreader.lib
 
-.ENDIF              # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
+.ENDIF              # ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 4b42cd7b34c9..38646f16b5b3 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
-RSCVERSION=300
-RSCREVISION=300m106(Build:9582)
-BUILD=9582
-LAST_MINOR=m106
-SOURCEVERSION=DEV300
+RSCVERSION=350
+RSCREVISION=350m1(Build:1)
+BUILD=1
+LAST_MINOR=m1
+SOURCEVERSION=OOO350
diff --git a/solenv/inc/os2.mk b/solenv/inc/os2.mk
deleted file mode 100644
index 981479f184c4..000000000000
--- a/solenv/inc/os2.mk
+++ /dev/null
@@ -1,333 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# --- OS2-Environment ----------------------------------------------
-
-.IF "$(GUI)" == "OS2"
-
-# YD defined in os2env.cmd
-#.IF "$(NOSOLAR_JAVA)"==""
-#SOLAR_JAVA=TRUE
-#.ENDIF
-
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.ENDIF
-JAVAFLAGSDEBUG=-g
-
-# --- Borland ---
-.IF "$(COM)" == "BLC"
-
-JAVADEF=-DSOLAR_JAVA
-
-ASM=tasm
-AFLAGS=
-
-CXX=bcc
-CC=bcc
-CFLAGS=-c -3 -a1 -X -d -wbbf -weas -wucp -w-hid -w-par -I. $(MINUS_I)$(INCLUDE)
-CFLAGSCXX=-Pcxx -RT- -x- -V
-CFLAGSOBJGUIST=
-CFLAGSOBJCUIST=
-CFLAGSOBJGUIMT=-sm
-CFLAGSOBJCUIMT=-sm
-CFLAGSSLOGUIMT=-sm -sd
-CFLAGSSLOCUIMT=-sm -sd
-CFLAGSPROF=
-CFLAGSDEBUG=-v
-CFLAGSDBGUTIL=
-CFLAGSOPT=-Os -Ob -k-
-CFLAGSNOOPT=-Od
-CFLAGSOUTOBJ=-o
-
-LINK=tlink
-LINKFLAGS=/m /L$(LIB)
-#LINKFLAGSAPPGUI=/Toe /B:0x10000 /aa
-#Base wg. lxopt raus
-LINKFLAGSAPPGUI=/Toe /aa
-LINKFLAGSSHLGUI=/Tod
-LINKFLAGSAPPCUI=/Toe /B:0x10000 /ap
-LINKFLAGSSHLCUI=/Tod
-LINKFLAGSTACK=/S:
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=/v
-.IF "$(SOLAR_JAVA)"==""
-LINKFLAGSOPT=/Oc
-.ENDIF
-
-STDOBJVCL=$(L)/salmain.obj
-STDOBJGUI=c02.obj
-STDSLOGUI=c02d.obj
-STDOBJCUI=c02.obj
-STDSLOCUI=c02d.obj
-STDLIBGUIST=c2.lib os2.lib
-STDLIBCUIST=c2.lib os2.lib
-STDLIBGUIMT=c2mt.lib os2.lib
-STDLIBCUIMT=c2mt.lib os2.lib
-STDSHLGUIMT=c2mt.lib os2.lib
-STDSHLCUIMT=c2mt.lib os2.lib
-
-LIBMGR=tlib
-LIBFLAGS=/C /P128
-
-IMPLIB=implib
-IMPLIBFLAGS=/c
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=rc
-RCFLAGS=-r $(RCFILES) $@
-RCLINK=rc
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX=bo
-
-.ENDIF
-
-# --- IBM ---
-.IF "$(COM)" == "ICC"
-
-ASM=tasm
-AFLAGS=/ml /oi
-
-CXX=icc
-CC=icc
-.IF "$(COMEX)"=="3"
-CFLAGS=/C+ /Q+ /Gf+ /Sp1 /G4 /Se /Gs+ /Gt+ /Gd+ /J- /W2 /D__EXTENDED__ /Si+ /Xi+ $(MINUS_I)$(INCLUDE)  /Wvft-
-.ELSE
-.IF "$(COMEX)"=="I"
-CFLAGS=/C+ /Tl10 /Q+ /Gf+ /Sp4 /G4 /Sc /Gs- /D__EXTENDED__ /Si+ /Su4
-.ELSE
-CFLAGS=/C+ /Tl10 /Q+ /Gf+ /Sp1 /G4 /Sc /Gs+ /D__EXTENDED__ /Si+
-.ENDIF
-.ENDIF
-
-CFLAGSCXX=/Tdp 
-
-CFLAGSEXCEPTIONS=-Gx-
-CFLAGS_NO_EXCEPTIONS=-Gx+
-
-CFLAGSOBJGUIST=/Ge+
-CFLAGSOBJCUIST=/Ge+
-.IF "$(COMEX)"=="I"
-CFLAGSOBJGUIMT=/Ge+ /Gm+ 
-CFLAGSOBJCUIMT=/Ge+ /Gm+
-CFLAGSSLOGUIMT=/Ge- /Gm+
-CFLAGSSLOCUIMT=/Ge- /Gm+
-.ELSE
-CFLAGSOBJGUIMT=/Ge+ /Gm+
-CFLAGSOBJCUIMT=/Ge+ /Gm+
-CFLAGSSLOGUIMT=/Ge- /Gm+
-CFLAGSSLOCUIMT=/Ge- /Gm+
-.ENDIF
-CFLAGSPROF=/Gh+
-CFLAGSDEBUG=/Ti+
-CFLAGSDBGUTIL=
-CFLAGSOPT=/O+ /Oi+ /Oc+
-CFLAGSNOOPT=/O-
-CFLAGSOUTOBJ=/Fo
-
-CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
-
-LINK=ilink
-#LINKFLAGS=/PACKCODE:8192 /ALIGN:16 /NOD /NOE /NOI /MAP /NOFREE
-
-#bei too many segments ist /SEGMENTS:nnnn hilfreich. 3072 ist max!
-.IF "$(CPPRTST)"!=""
-LINKFLAGS=/NOFREE /NOD /NOE /NOI /MAP /OPTFUNC /PACKD:65536 /EXEPACK:2
-.ELSE
-LINKFLAGS=/NOFREE /NOD /NOE /NOI /MAP /OPTFUNC /PACKD:65536
-.ENDIF
-LINKFLAGSAPPGUI=/PM:PM /NOBASE
-LINKFLAGSSHLGUI=
-LINKFLAGSAPPCUI=/PM:VIO /NOBASE
-LINKFLAGSSHLCUI=
-LINKFLAGSTACK=/STACK:
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=/COD
-#LINKFLAGSOPT=/EXEPACK:2 /OPTFUNC
-LINKFLAGSOPT=
-#.IF "$(product)"!="full" && "$(product)"!="demo" && "$(product)"!="compact"
-#LINKFLAGS=$(LINKFLAGS) /COD
-#.ELSE
-#LINKFLAGS=$(LINKFLAGS)
-#.ENDIF
-
-.IF "$(product)"=="full" || "$(product)"=="demo" || "$(product)"=="compact"
-#	LINKFLAGS=$(LINKFLAGS)
-.ELSE
-LINKFLAGS+=/COD
-.ENDIF
-
-STDOBJVCL=$(L)/salmain.obj
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-.IF "$(COMEX)"=="3"
-.IF "$(CPPRTST)"!=""
-STDLIBGUIST=cppom30o.lib cpprtst.lib os2386.lib
-STDLIBCUIST=cppom30o.lib cpprtst.lib os2386.lib
-STDLIBGUIMT=cppom30o.lib cpprtst.lib os2386.lib
-STDLIBCUIMT=cppom30o.lib cpprtst.lib os2386.lib
-STDSHLGUIMT=cppom30o.lib cpprtst.lib os2386.lib
-STDSHLCUIMT=cppom30o.lib cpprtst.lib os2386.lib
-.ELSE
-STDLIBGUIST=cppom30o.lib cppom30i.lib os2386.lib
-STDLIBCUIST=cppom30o.lib cppom30i.lib os2386.lib
-STDLIBGUIMT=cppom30o.lib cppom30i.lib os2386.lib
-STDLIBCUIMT=cppom30o.lib cppom30i.lib os2386.lib
-STDSHLGUIMT=cppom30o.lib cppom30i.lib os2386.lib
-STDSHLCUIMT=cppom30o.lib cppom30i.lib os2386.lib
-.ENDIF
-.ELSE
-STDLIBGUIST=dde4sbs.lib os2386.lib
-STDLIBCUIST=dde4sbs.lib os2386.lib
-STDLIBGUIMT=dde4mbs.lib os2386.lib
-STDLIBCUIMT=dde4mbs.lib os2386.lib
-STDSHLGUIMT=dde4mbs.lib os2386.lib
-STDSHLCUIMT=dde4mbs.lib os2386.lib
-.ENDIF
-
-.IF "$(COMEX)"=="3"
-LIBMGR=ilib
-.ELSE
-LIBMGR=lib
-.ENDIF
-LIBFLAGS=/NOI
-
-IMPLIB=implib
-IMPLIBFLAGS=/noi
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=rc
-RCFLAGS=-r $(RCFILES) $@
-RCLINK=rc
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX=co
-
-.ENDIF
-
-# --- GNU ---
-.IF "$(COM)" == "GCC"
-
-.INCLUDE : os2gcci.mk
-
-.ENDIF
-
-# --- Watcom ---
-.IF "$(COM)" == "WTC"
-
-ASM=wasm
-AFLAGS=/ml /4pr
-
-CC=wcl386
-CXX=wcl386
-.IF "$(e2p)" != ""
-CFLAGS=-c -W3 -Zp4 -Zld $(MINUS_I)$(INCLUDE) -bt=os2 -zq  -zm -ep -ee
-.ELSE
-CFLAGS=-c -Zp4 -W3 -Zl -Zld $(MINUS_I)$(INCLUDE) -bt=os2 -zq -s
-.ENDIF
-CFLAGSCXX=-cc++ -xst
-CFLAGSOBJGUIST=          #-Alfd -GA -GEfs
-CFLAGSOBJCUIST=
-CFLAGSOBJGUIMT=-bm          #-Alfw -GA -GEd
-CFLAGSOBJCUIMT=-bm
-CFLAGSSLOGUIMT=-bm -bd              #-Alfw -GD -GEfd
-CFLAGSSLOCUIMT=-bm -bd
-CFLAGSPROF=
-CFLAGSDEBUG=/d2
-CFLAGSDBGUTIL=
-.IF "$(e2p)" != ""
-CFLAGSOPT=-otexan -3s
-CFLAGSNOOPT=-od -3s
-.ELSE
-CFLAGSOPT=-otexan -4s
-CFLAGSNOOPT=-od -4s
-.ENDIF
-CFLAGSOUTOBJ=-Fo
-
-LINK=wlink
-LINKFLAGS=op symf op caseexact op statics op MANY
-LINKFLAGSAPPGUI=sys os2v2 pm
-LINKFLAGSSHLGUI=sys os2v2 dll INITINSTANCE TERMINSTANCE
-LINKFLAGSAPPCUI=sys os2v2
-LINKFLAGSSHLCUI=sys os2v2 dll
-LINKFLAGSTACK=op stack=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=debug all op undefsok
-LINKFLAGSOPT=
-
-STDOBJVCL=$(L)/salmain.obj
-STDOBJGUI=libr clib3s.lib libr plib3s.lib libr math387s.lib
-STDSLOGUI=libr clib3s.lib libr os2386.lib libr plib3s.lib libr math387s.lib
-STDOBJCUI=libr clib3s.lib libr plib3s.lib libr math387s.lib
-STDSLOCUI=libr clib3s.lib libr plib3s.lib libr math387s.lib
-STDLIBGUIST=libr os2386.lib libr clib3s.lib libr plib3s.lib
-STDLIBCUIST=libr os2386.lib libr clib3s.lib libr plib3s.lib
-STDLIBGUIMT=libr os2386.lib libr clib3s.lib libr plib3s.lib
-STDLIBCUIMT=libr os2386.lib libr clib3s.lib libr plib3s.lib
-STDSHLGUIMT=libr os2386.lib libr clib3s.lib libr plibmt3s.lib libr math387s.lib libr plib3s.lib libr noemu387.lib
-STDSHLCUIMT=libr os2386.lib libr clib3s.lib libr plibmt3s.lib libr matg387s.lib libr plib3s.lib
-
-LIBMGR=wlib
-LIBFLAGS=/p=128 /c /m
-
-IMPLIB=echo
-IMPLIBFLAGS=
-
-MAPSYM=mapsym
-MAPSYMFLAGS=
-
-RC=rc
-RCFLAGS=-r $(RCFILES) $@
-RCLINK=rc
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX=wo
-
-.ENDIF
-
-# --- OS2 Allgemein ---
-HC=toipf
-HCFLAGS=
-PATH_SEPERATOR*=;
-DLLPRE=
-DLLPOST=.dll
-EXECPOST=.exe
-SCPPOST=.ins
-DLLDEST=$(BIN)
-SOLARSHAREDBIN=$(SOLARBINDIR)
-
-.ENDIF
diff --git a/solenv/inc/os2gcci.mk b/solenv/inc/os2gcci.mk
deleted file mode 100644
index 46dcba24aaa1..000000000000
--- a/solenv/inc/os2gcci.mk
+++ /dev/null
@@ -1,288 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# --- OS2-Environment ----------------------------------------------
-
-#change output dir name using the object binary format.
-#.IF "$(aout)"==""
-#OUTFMT=omf
-#.ELSE
-#OUTFMT=aout
-#.ENDIF
-#OUTPATH+=OUTFMT
-#INPATH+=OUTFMT
-#GVERDIR+=OUTFMT
-
-# mk file for os2gcci
-ASM=as
-AFLAGS=
-
-#//YD SOLAR_JAVA=TRUE
-JAVAFLAGSDEBUG=-g
-
-# filter for supressing verbose messages from linker
-#not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
-
-.IF "$(ttt)"!=""
-CDEFS+=-E
-.ENDIF
-
-# _PTHREADS is needed for the stl
-CDEFS+=-DX86 -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
-
-# this is a platform with JAVA support
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=javai.lib
-.ELSE
-JAVA_RUNTIME=javai_g.lib
-.ENDIF
-.ENDIF
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-# name of C++ Compiler
-CXX*=g++
-# name of C Compiler
-CC*=gcc
-# flags for C and C++ Compiler
-CFLAGS+=-c
-# flags for the C++ Compiler
-CFLAGSCC= $(ARCH_FLAGS)
-
-.IF "$(aout)"==""
-CFLAGS+=-Zomf
-.ENDIF
-
-# Flags for enabling exception handling
-CFLAGSEXCEPTIONS=-fexceptions
-# Flags for disabling exception handling
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-CFLAGSCXX= -frtti $(ARCH_FLAGS)
-CFLAGSCXX+= -Wno-ctor-dtor-privacy  -fmessage-length=0
-PICSWITCH:=
-
-# Compiler flags for compiling static object in single threaded environment with graphical user interface
-CFLAGSOBJGUIST=-Zcrtdll
-# Compiler flags for compiling static object in single threaded environment with character user interface
-CFLAGSOBJCUIST=-Zcrtdll
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=-Zcrtdll
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=-Zcrtdll
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH) -Zdll -Zcrtdll
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH) -Zdll -Zcrtdll
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-# Compiler flags for enabling optimazations
-CFLAGSOPT=-s -O1 -march=pentium -mtune=pentium4
-# Compiler flags for disabling optimazations
-CFLAGSNOOPT=-O0
-# Compiler flags for discibing the output path
-CFLAGSOUTOBJ=-o
-
-# Warnings switched off for CXX:
-# - doubunder: we have many identifiers containing double underscores, some of
-#   them in the stable UDK API we cannot change
-# - inllargeuse: "function is too large and will not be expanded inline" is
-#   merely a hint
-# - inllargeint: "function is too large to generate inline, consider writing
-#   it yourself" is merely a hint
-# - notemsource: "could not find source for function" appears to be spurious
-# - reftotemp: warns about calling non-const functions on temporary objects,
-#   something legally done by boost::scoped_array<T>::reset, for example
-#   (this_type(p).swap(*this))
-# - truncwarn: "conversion of 64 bit type value to smaller type causes
-#   truncation" at least with CC 5.8 is reported only at the end of a
-#   compilation unit that uses std::hash_map<sal_Int64, sal_Int64> (see
-#   sfx2/source/toolbox/imgmgr.cxx:1.27) and thus unfortunately needs to be
-#   disabled globally
-CFLAGSWARNCC=
-CFLAGSWARNCXX=+w2 -erroff=doubunder,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn
-CFLAGSWARNCXX=
-CFLAGSWALLCC=$(CFLAGSWARNCC)
-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-errwarn=%all
-CFLAGSWERRCXX=-xwe
-
-# Once all modules on this platform compile without warnings, set
-# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
-# settings.mk):
-MODULES_WITH_WARNINGS := \
-    b_server \
-    basctl \
-    basebmp \
-    canvas \
-    chart2 \
-    cppcanvas \
-    desktop \
-    devtools \
-    dxcanvas \
-    extensions \
-    filter \
-    glcanvas \
-    lingu \
-    r_tools \
-    sc \
-    sd \
-    slideshow \
-    starmath \
-    svx \
-    sw \
-    writerperfect \
-    xmlsecurity
-
-
-# switches for dynamic and static linking
-STATIC		= 
-DYNAMIC		= 
-
-# this is needed to allow stl headers to include os2.h instead of svpm.h
-# in earlier stages of project build. Once svpm.h is in place, we can
-# compile without this flag.
-.IF "$(STL_OS2_BUILDING)" != ""
-CFLAGS+=-DSTL_OS2_BUILDING
-CFLAGSCXX+=-DSTL_OS2_BUILDING
-.ENDIF
-
-# name of linker
-LINK*=gcc
-# default linker flags
-LINKFLAGS= -Zbin-files -Zmap 
-#27/01/06 bin-files confuses transex/rsc work, removed.
-LINKFLAGS= -Zno-fork -Zhigh-mem -Zmap
-.IF "$(OS2_ARGS_WILD)" != ""
-LINKFLAGS+=-Zargs-wild -Zargs-resp
-.ENDIF
-
-.IF "$(aout)"==""
-#LINKFLAGS+= -Zlinker /NOI -Zlinker /PACKD:65536 -Zlinker /EXEPACK:2
-#LINKFLAGS+= -Zlinker /NOExtdictionary
-LINKFLAGS+= -Zomf
-#LINKFLAGS+= -Zlinker "DISABLE 1121"
-.ENDIF
-
-
-# linker flags for linking applications
-.IF "$(aout)"==""
-#LINKFLAGSAPPGUI= -Zlinker /PM:PM -Zstack 0x2000
-#LINKFLAGSAPPCUI= -Zlinker /PM:VIO
-.ELSE
-LINKFLAGSAPPGUI=
-LINKFLAGSAPPCUI=
-.ENDIF
-
-# linker flags for linking shared libraries
-LINKFLAGSSHLGUI= -Zdll #-Zsym
-LINKFLAGSSHLCUI= -Zdll #-Zsym
-
-.IF "$(aout)"==""
-LINKFLAGSTACK=-Zlinker /STACK:
-LINKFLAGSPROF=
-#LINKFLAGSDEBUG=-Zlinker /DEBUG
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=-g
-.ELSE
-LINKFLAGSTACK=-Zstack
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=-s
-.ENDIF
-
-.IF "$(NO_BSYMBOLIC)"==""
-.IF "$(PRJNAME)" != "envtest"
-LINKFLAGSSHLGUI+=
-LINKFLAGSSHLCUI+=
-.ENDIF
-.ENDIF				# "$(NO_BSYMBOLIC)"==""
-
-LINKVERSIONMAPFLAG=-Wl,--version-script
-
-SONAME_SWITCH=-Wl,-h
-
-# Sequence of libs does matter !
-
-#STDLIBCPP=stdc++ supc++ gcc_eh
-#STDLIBCPP=stdc++ gcc432
-STDLIBCPP=stdc432 gcc432
-
-# default objectfilenames to link
-STDOBJVCL=$(L)/salmain.obj
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-# libraries for linking applications
-STDLIBCUIST=$(STDLIBCPP)
-STDLIBGUIMT=$(STDLIBCPP)
-STDLIBCUIMT=$(STDLIBCPP)
-STDLIBGUIST=$(STDLIBCPP)
-# libraries for linking shared libraries
-STDSHLGUIMT=$(STDLIBCPP)
-STDSHLCUIMT=$(STDLIBCPP)
-
-LIBSTLPORT=$(DYNAMIC) stlp45.lib
-LIBSTLPORTST=$(STATIC) stlp45.lib $(DYNAMIC)
-
-
-# name of library manager
-LIBMGR=ar
-LIBFLAGS=crv
-
-.IF "$(aout)"==""
-LIBMGR=emxomfar -p2048
-.ENDIF
-
-# tool for generating import libraries
-IMPLIB=emximp
-IMPLIBFLAGS=-o
-
-MAPSYM=mapsym
-MAPSYMFLAGS=
-
-RC=wrc -bt=os2 -i$(PATH_EMXPGCC)\include
-RCFLAGS=-r $(RCFILES) -fo=$@
-RCLINK=wrc -bt=os2
-RCLINKFLAGS=
-RCSETVERSION=
-
-# platform specific identifier for shared libs
-DLLPOSTFIX=go
-DLLPRE=lib
-DLLPOST=.dll
-
diff --git a/solenv/inc/postmac.h b/solenv/inc/postmac.h
index 8a36af4c4389..f53ee6ae0e03 100644
--- a/solenv/inc/postmac.h
+++ b/solenv/inc/postmac.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,10 +44,11 @@
 #undef LSize
 #undef ModalDialog
 #undef SetCursor
-//#undef ShowWindow
 #undef StringPtr
 #undef DirInfo
 //#undef ULONG
 #undef Line
 #undef TimeValue
 #undef Pattern
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index 59d37a95405e..3d4f4158d08f 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -29,7 +29,7 @@
 # This language will be always included!
 defaultlangiso=en-US
 
-# Complete list of all supported ISO codes
+# Complete list of all supported localizations (ISO codes)
 .INCLUDE : langlist.mk
 
 alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))
diff --git a/solenv/inc/postwin.h b/solenv/inc/postwin.h
new file mode 100644
index 000000000000..1ec09435b5cb
--- /dev/null
+++ b/solenv/inc/postwin.h
@@ -0,0 +1,252 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+/* nicht geschuetz, muss als gegenstueck zu prewin.h includet werden */
+
+#ifdef WNT
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+#undef Region
+#undef PolyPolygon
+#undef Polygon
+#undef Rectangle
+#undef DELETE
+
+#undef Folder
+#undef GradientStyle_RECT
+
+/* Hilfe-Ids umbenennen */
+#define WIN_HELP_INDEX       0x0003
+#define WIN_HELP_HELPONHELP  0x0004
+#undef HELP_INDEX
+#undef HELP_HELPONHELP
+
+#define WIN_MOUSE_MOVED 0x0001
+#undef MOUSE_MOVED
+
+#define WIN_WB_LEFT               0
+#define WIN_WB_RIGHT              1
+#undef WB_LEFT
+#undef WB_RIGHT
+
+#ifdef GetObject
+#undef GetObject
+#ifdef UNICODE
+#define WIN_GetObject   GetObjectW
+#else
+#define WIN_GetObject   GetObjectA
+#endif
+#else
+#define WIN_GetObject   GetObject
+#endif
+
+#ifdef SetPrinter
+#undef SetPrinter
+#ifdef UNICODE
+#define WIN_SetPrinter  SetPrinterW
+#else
+#define WIN_SetPrinter  SetPrinterA
+#endif
+#else
+#define WIN_SetPrinter  SetPrinter
+#endif
+
+#ifdef GetPrinter
+#undef GetPrinter
+#ifdef UNICODE
+#define WIN_GetPrinter  GetPrinterW
+#else
+#define WIN_GetPrinter  GetPrinterA
+#endif
+#else
+#define WIN_GetPrinter  GetPrinter
+#endif
+
+#ifdef DrawText
+#undef DrawText
+#ifdef UNICODE
+#define WIN_DrawText    DrawTextW
+#else
+#define WIN_DrawText    DrawTextA
+#endif
+#else
+#define WIN_DrawText    DrawText
+#endif
+
+#ifdef mciSetCommand
+#undef mciSetCommand
+#ifdef UNICODE
+#define WIN_mciSetCommand   mciSetCommandW
+#else
+#define WIN_mciSetCommand   mciSetCommandA
+#endif
+#else
+#define mciSetCommand   mciSetCommand
+#endif
+
+#ifdef SetPort
+#undef SetPort
+#ifdef UNICODE
+#define WIN_SetPort     SetPortW
+#else
+#define WIN_SetPort     SetPortA
+#endif
+#else
+#define WIN_SetPort     SetPort
+#endif
+
+#ifdef CopyFile
+#undef CopyFile
+#ifdef UNICODE
+#define WIN_CopyFile    CopyFileW
+#else
+#define WIN_CopyFile    CopyFileA
+#endif
+#else
+#define WIN_CopyFile    CopyFile
+#endif
+
+
+#ifdef GetUserName
+#undef GetUserName
+#ifdef UNICODE
+#define WIN_GetUserName GetUserNameW
+#else
+#define WIN_GetUserName GetUserNameA
+#endif
+#else
+#define WIN_GetUserName GetUserName
+#endif
+
+#ifdef GetClassName
+#undef GetClassName
+#ifdef UNICODE
+#define WIN_GetClassName GetClassNameW
+#else
+#define WIN_GetClassName GetClassNameA
+#endif
+#else
+#define WIN_GetClassName GetClassName
+#endif
+
+#ifdef GetCharWidth
+#undef GetCharWidth
+#ifdef UNICODE
+#define WIN_GetCharWidth GetCharWidthW
+#else
+#define WIN_GetCharWidth GetCharWidthA
+#endif
+#else
+#define WIN_GetCharWidth GetCharWidth
+#endif
+
+#ifdef GetMetaFile
+#undef GetMetaFile
+#ifdef UNICODE
+#define WIN_GetMetaFile GetMetaFileW
+#else
+#define WIN_GetMetaFile GetMetaFileA
+#endif
+#else
+#define WIN_GetMetaFile GetMetaFile
+#endif
+
+#ifdef GetNumberFormat
+#undef GetNumberFormat
+#ifdef UNICODE
+#define WIN_GetNumberFormat GetNumberFormatW
+#else
+#define WIN_GetNumberFormat GetNumberFormatA
+#endif
+#else
+#define WIN_GetNumberFormat GetNumberFormat
+#endif
+
+#ifdef GetGlyphOutline
+#undef GetGlyphOutline
+#ifdef UNICODE
+#define WIN_GetGlyphOutline GetGlyphOutlineW
+#else
+#define WIN_GetGlyphOutline GetGlyphOutlineA
+#endif
+#else
+#define WIN_GetGlyphOutline GetGlyphOutline
+#endif
+
+#ifdef GetKerningPairs
+#undef GetKerningPairs
+#ifdef UNICODE
+#define WIN_GetKerningPairs GetKerningPairsW
+#else
+#define WIN_GetKerningPairs GetKerningPairsA
+#endif
+#else
+#define WIN_GetKerningPairs GetKerningPairs
+#endif
+
+#ifdef FindWindow
+#undef FindWindow
+#ifdef UNICODE
+#define WIN_FindWindow FindWindowW
+#else
+#define WIN_FindWindow FindWindowA
+#endif
+#else
+#define WIN_FindWindow FindWindow
+#endif
+
+// keine Yield-Definition
+#undef Yield
+
+/* new StretchBlt() Modes (simpler names) */
+#ifndef STRETCH_ANDSCANS
+#define STRETCH_ANDSCANS        1
+#endif
+#ifndef STRETCH_ORSCANS
+#define STRETCH_ORSCANS         2
+#endif
+#ifndef STRETCH_DELETESCANS
+#define STRETCH_DELETESCANS     3
+#endif
+
+#ifdef WNT
+extern "C"
+{
+BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 );
+BOOL WINAPI WIN_Polygon( HDC hDC, CONST POINT * ppt, int ncnt );
+BOOL WINAPI WIN_PolyPolygon( HDC hDC, CONST POINT * ppt, LPINT npcnt, int ncnt );
+}
+#endif
+
+// svwin.h nicht mehr includen
+#define _SVWIN_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/inc/preinclude.h b/solenv/inc/preinclude.h
index dee99bc6d3f4..f05dc8399138 100644
--- a/solenv/inc/preinclude.h
+++ b/solenv/inc/preinclude.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,3 +37,5 @@
 #include <wchar.h>
 #include <features.h>
 #include <assert.h>
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h
index 1c453c8f51a7..abf0a7b6ca92 100644
--- a/solenv/inc/premac.h
+++ b/solenv/inc/premac.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,10 +44,11 @@
 #define LSize MacOSLSize
 #define ModalDialog MacOSModalDialog
 #define SetCursor MacOSSetCursor
-//#define ShowWindow MacOSShowWindow
 #define StringPtr MacOSStringPtr
 #define DirInfo MacOSDirInfo
 //#define ULONG MacOSULONG
 #define Line MacOSLine
 #define TimeValue MacOSTimeValue
 #define Pattern MacOSPattern
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stlport/systemstl/vector b/solenv/inc/prewin.h
index f15038f9eaaf..0eedfe122963 100644
--- a/stlport/systemstl/vector
+++ b/solenv/inc/prewin.h
@@ -1,7 +1,8 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,25 +26,49 @@
  *
  ************************************************************************/
 
-#ifndef SYSTEM_STL_VECTOR
-#define SYSTEM_STL_VECTOR
+/* nicht geschuetzt, darf nur einmal includet werden */
 
-#ifdef GCC
+#if defined WNT
 
-#ifdef __MINGW32__
-#  define _SYSTEM_STL_MAKE_HEADER(path,header) <path/header>
-#  include _SYSTEM_STL_MAKE_HEADER(GXX_INCLUDE_PATH,vector)
-#else
-#  include <ext/../vector>
-#endif
+#define Rectangle    BLA_Rectangle
+#define Polygon      BLA_Polygon
+#define PolyPolygon  BLA_PolyPolygon
+#define Region       WIN_Region
+#define Folder       WIN_Folder
+#define GradientStyle_RECT  WIN_GradientStyle_RECT
 
-namespace std
-{
-    typedef vector<bool, std::allocator<bool> > bit_vector;
-}
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#else
-#error UNSUPPORTED COMPILER
+#define STRICT
+#ifdef _MSC_VER
+#pragma warning(push, 1)
+#endif
+#include <windows.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#include <shellapi.h>
+#include <commdlg.h>
+#include <dlgs.h>
+#ifdef USE_TOOLHELP
+#include <tlhelp32.h>
+#endif
+#ifdef USE_IMAGEHLP
+#include <imagehlp.h>
 #endif
+#ifdef INCLUDE_MMSYSTEM
+#include <mmsystem.h>
 #endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+#ifdef _MSC_VER
+#pragma warning(push, 1)
+#endif
+#include <commctrl.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/inc/sc.mk b/solenv/inc/productversion.mk
index ad2102a92b4f..15ea3085f0e7 100644
--- a/solenv/inc/sc.mk
+++ b/solenv/inc/productversion.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -25,4 +25,8 @@
 #
 #*************************************************************************
 
-# TODO: remove usage and file...
+PRODUCTLIST = libreoffice oxygenoffice
+
+# default values to minimize maintainance effort
+PRODUCTVERSION = 3.4
+PRODUCTVERSIONSHORT = 3
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk
index a845b9ae86fe..9dd6cc1963c4 100644
--- a/solenv/inc/pstrules.mk
+++ b/solenv/inc/pstrules.mk
@@ -138,9 +138,6 @@ $(PAR)/%.par :
     $(COMMAND_ECHO)$(CPPLCC) -+ -P $(INCLUDE) $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
 .ENDIF
 # YD: INCLUDE macro too long, include only few items (scp2 compile)
-.IF "$(GUI)"=="OS2"
-    $(CPPLCC) -+ -P -I..\..\inc -I..\..\os2gcci.pro\inc $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
-.ENDIF
 .IF "$(GUI)"=="UNX"
     $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
 .ENDIF
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 2155ab8842d5..0ff659c7ec1b 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -637,7 +637,7 @@ $(MISC)/%.dpj :
 $(SLO)/%.obj : %.asm
        @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(COM)"=="GCC"
-.IF "$(ASM)"=="ml"
+.IF "$(ASM)"=="ml" || "$(ASM)"=="ml64"
        $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm
        @@-$(RM) $*.err
 .ELSE			# "$(ASM)"=="ml"
@@ -650,7 +650,7 @@ $(SLO)/%.obj : %.asm
         @-$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI)
 .ELSE
 .IF "$(COM)"=="MSC"
-.IF "$(ASM)"=="ml"
+.IF "$(ASM)"=="ml" || "$(ASM)"=="ml64"
     $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm
     @-$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI)
 .ELSE			# "$(ASM)"=="ml"
@@ -715,14 +715,14 @@ $(MISC)/%.sh : %.sh
 .IF "$(WITH_LANG)"!=""
 $(COMMONMISC)/$(TARGET)/%.ulf : %.ulf
     @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
+    $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)$(ULFEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
 $(COMMONMISC)/$(TARGET)/%.xrb : %.xrb
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
+    $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)$(XMLEX) -t xrb -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index 412fb3bd2821..bc8fb7445dfd 100755..100644
--- a/solenv/inc/set_wntx64.mk
+++ b/solenv/inc/set_wntx64.mk
@@ -35,18 +35,18 @@
 
 .IF "$(BUILD_X64)"!=""
 # ----------------- settings for x64 --------------------
-CC_X64*:=$(WRAPCMD) $(CXX_X64_BINARY)
-CXX_X64*:=$(WRAPCMD) $(CXX_X64_BINARY)
-LINK_X64*:=$(WRAPCMD) $(LINK_X64_BINARY) $(NOLOGO) -MACHINE:X64
-LIBMGR_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY) $(NOLOGO)
-IMPLIB_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY)
+CC_X64*:="$(CXX_X64_BINARY)"
+CXX_X64*:="$(CXX_X64_BINARY)"
+LINK_X64*:="$(LINK_X64_BINARY)" $(NOLOGO) -MACHINE:X64
+LIBMGR_X64="$(LIBMGR_X64_BINARY)" $(NOLOGO)
+IMPLIB_X64="$(LIBMGR_X64_BINARY)"
 
 USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR
 
 # Stack buffer overrun detection.
 CFLAGS+=-GS
 
-USE_CDEFS_X64+= -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
+USE_CDEFS_X64+= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -DX86_64 -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
 .IF "$(debug)"!=""
 USE_CFLAGS_X64+=-Zi -Fd$(MISC_X64)/$(@:b).pdb
 USE_CDEFS_X64+=-DDEBUG
@@ -114,7 +114,7 @@ STDSLOCUI_X64=
 
 IMPLIBFLAGS_X64=-machine:X64
 
-LIBPATH_X64=$(PSDK)/lib/x64
+LIBPATH_X64=$(WINDOWS_SDK_HOME)/lib/x64
 LIBPATH_VC_X64=$(COMPATH)/lib/amd64
 
 ADVAPI32LIB_X64=$(LIBPATH_X64)/advapi32.lib
@@ -127,7 +127,6 @@ WINSPOOLLIB_X64=$(LIBPATH_X64)/winspool.lib
 IMM32LIB_X64=$(LIBPATH_X64)/imm32.lib
 VERSIONLIB_X64=$(LIBPATH_X64)/version.lib
 WINMMLIB_X64=$(LIBPATH_X64)/winmm.lib
-WSOCK32LIB_X64=$(LIBPATH_X64)/wsock32.lib
 MPRLIB_X64=$(LIBPATH_X64)/mpr.lib
 WS2_32LIB_X64=$(LIBPATH_X64)/ws2_32.lib
 KERNEL32LIB_X64=$(LIBPATH_X64)/kernel32.lib
@@ -142,7 +141,6 @@ MSILIB_X64=$(LIBPATH_X64)/msi.lib
 DDRAWLIB_X64=$(LIBPATH_X64)/ddraw.lib
 SHLWAPILIB_X64=$(LIBPATH_X64)/shlwapi.lib
 URLMONLIB_X64=$(LIBPATH_X64)/urlmon.lib
-UNICOWSLIB_X64=$(LIBPATH_X64)/unicows.lib
 WININETLIB_X64=$(LIBPATH_X64)/wininet.lib
 OLDNAMESLIB_X64=$(LIBPATH_VC_X64)/oldnames.lib
 MSIMG32LIB_X64=$(LIBPATH_X64)/msimg32.lib
@@ -158,7 +156,7 @@ L_X64=$(SOLARLIBDIR_X64)
 VERSIONOBJ_X64=$(SLO_X64)/_version.obj
 BIN_X64=$(BIN)/x64
 RES_X64=$(RES)/x64
-SOLARLIBDIR_X64=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT)/x64
+SOLARLIBDIR_X64=$(SOLARVERSION)/$(INPATH)/lib/x64
 LIB_X64:=$(LB_X64);$(SLB_X64);$(ILIB_X64)
 
 .IF "$(LIBTARGET)"==""
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index b0872169bfc6..e44458fc99a7 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -64,16 +64,16 @@ EXTNAME*=$(EXTENSIONNAME)_in
 WRONG_SOURCEVERSION
 .ENDIF
 
-# Create $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk if needed
+# Create $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk if needed
 %minor.mk : $(SOLARENV)/inc/minor.mk
-    @@-$(MKDIRHIER) $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)
-    @@$(COPY) $(SOLARENV)/inc/minor.mk $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk
-    @@$(TOUCH) $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg
+    @@-$(MKDIRHIER) $(SOLARVERSION)/$(INPATH)/inc
+    @@$(COPY) $(SOLARENV)/inc/minor.mk $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk
+    @@$(TOUCH) $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg
 .ENDIF          # "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!=""
 
-# Force creation of $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/
+# Force creation of $(SOLARVERSION)/$(INPATH)/inc/
 # $(UPD)minor.mk could be empty as it's contents were already included from minor.mk
-.INCLUDE : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk
+.INCLUDE : $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk
 
 .IF "$(BSCLIENT)"=="TRUE"
 .IF "$(UPDATER)"!="YES"
@@ -147,6 +147,9 @@ JAVAI:=$(JAVAINTERPRETER)
 .IF "$(JAVACISGCJ)" == "yes"
 JAVAC+=--encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
 .ENDIF
+.IF "$(JDK)" != "gcj" && $(JAVACISKAFFE) != "yes"
+JAVAC+=-source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER)
+.ENDIF
 
 #classpath and response
 .IF "$(JDK)" == "J++"
@@ -299,11 +302,11 @@ dbgutil=
 # ---------------------------------------------------------------------------
 
 DMAKE_WORK_DIR*:=$(subst,/,/ $(PWD))
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI_FOR_BUILD)"=="WNT"
 posix_PWD:=/cygdrive/$(PWD:s/://)
-.ELSE			#GUI)"=="WNT"
+.ELSE
 posix_PWD:=$(PWD)
-.ENDIF			#GUI)"=="WNT"
+.ENDIF
 
 
 .IF "$(TMP)"!=""
@@ -351,10 +354,6 @@ DBG_LEVEL=$(dbglevel)
 nodebug=$(NODEBUG)
 .ENDIF
 
-.IF "$(hbtoolkit)"!=""
-HBTOOLKIT=$(hbtoolkit)
-.ENDIF
-
 .IF "$(PRODUCT)"!=""
 product*=$(PRODUCT)
 .ENDIF
@@ -389,10 +388,6 @@ COMPILER_WARN_ALL=TRUE
 COMPILER_WARN_ERRORS=TRUE
 .ENDIF
 
-.IF "$(RSC_ONCE)"!=""
-rsc_once*=$(RSC_ONCE)
-.ENDIF
-
 #.IF "$(COMMON_BUILD)"!=""
 #common_build*=$(COMMON_BUILD)
 #.ENDIF
@@ -468,7 +463,7 @@ product=full
 .ENDIF
 
 .IF "$(debug)"!=""
-DBG_LEVEL*=2
+DBG_LEVEL*=1
 .ENDIF
 
 # Produkt auf einen Wert setzen (alles klein)
@@ -488,7 +483,7 @@ DBG_LEVEL*=0
 optimize!=true
 dbgutil!=true
 DBG_LEVEL*=1
-USE_STLP_DEBUG*=TRUE
+USE_DEBUG_RUNTIME*=TRUE
 .ENDIF
 
 .IF "$(debug)"!=""
@@ -534,25 +529,30 @@ TARGETTYPE=CUI
 # profile has to be first for not getting the .pro extension
 .IF "$(profile)"!=""
 OUT=$(PRJ)/$(OUTPATH).cap
+OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).cap
 ROUT=$(OUTPATH).cap
 .ELSE
 
 .IF "$(product)"!=""
 OUT=$(PRJ)/$(OUTPATH).pro
+OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).pro
 ROUT=$(OUTPATH).pro
 
 .ELSE
 .IF "$(profile)"!=""
 OUT=$(PRJ)/$(OUTPATH).cap
+OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).cap
 ROUT=$(OUTPATH).cap
 .ENDIF
 .IF "$(dbcs)"!=""
 OUT=$(PRJ)/$(OUTPATH).w
+OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).w
 ROUT=$(OUTPATH).w
 .ENDIF
 # could already be set by makefile.mk
 .IF "$(OUT)" == ""
 OUT*=$(PRJ)/$(OUTPATH)
+OUT_FOR_BUILD*=$(PRJ)/$(OUTPATH_FOR_BUILD)
 ROUT*=$(OUTPATH)
 .ENDIF
 .ENDIF
@@ -560,19 +560,17 @@ ROUT*=$(OUTPATH)
 
 .IF "$(bndchk)" != ""
 OUT:=$(PRJ)/$(OUTPATH).bnd
+OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).bnd
 ROUT=$(OUTPATH).bnd
 .ENDIF
 .IF "$(truetime)" != ""
 OUT=$(PRJ)/$(OUTPATH).tt
+OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).tt
 ROUT=$(OUTPATH).tt
 .ENDIF
-.IF "$(hbtoolkit)"!=""
-OUT=$(PRJ)/$(OUTPATH).tlk
-ROUT=$(OUTPATH).tlk
-.ENDIF
 
 .IF "$(PRJ)"!="."
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 PATH_IN_MODULE:=\
     $(subst,$(normpath $(shell @+cd $(PRJ) && pwd $(PWDFLAGS)))/, $(PWD))
 .ELSE			# "$(GUI)"=="WNT"
@@ -602,6 +600,7 @@ COMMON_OUTDIR:=$(OUTPATH)
 #.ENDIF			# "$(common_build)"!=""
 
 LOCAL_OUT:=$(OUT)
+LOCAL_OUT_FOR_BUILD:=$(OUT_FOR_BUILD)
 LOCAL_COMMON_OUT:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))
 .EXPORT : LOCAL_OUT LOCAL_COMMON_OUT
 
@@ -635,6 +634,7 @@ MISCX=$(OUT)/umisc
 MISC=$(OUT)/umisc
 .ELSE
 MISC=$(OUT)/misc
+MISC_FOR_BUILD=$(OUT_FOR_BUILD)/misc
 # pointing to misc in common output tree if exists
 COMMONMISC={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))}
 .ENDIF
@@ -699,7 +699,7 @@ PROCESSOUT*:=$(MISC)
 # Makros fuer die Librarynamen des Solar
 .INCLUDE : libs.mk
 
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 VERSIONOBJ=$(SLO)/_version.obj
 .ENDIF
 
@@ -707,11 +707,11 @@ VERSIONOBJ=$(SLO)/_version.obj
 VERSIONOBJ=$(SLO)/_version.o
 .ENDIF
 
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 WINVERSIONNAMES=$(UNIXVERSIONNAMES)
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
 SHELLLIB=-lgdi32 -lshell32 -ladvapi32 -lcomdlg32
 .ELSE
@@ -768,39 +768,35 @@ BIN=$(PRJ)/$(OUTPATH).xl/bin
 # damit gezielt Abhaengigkeiten auf s: angegeben werden koennen
 
 .IF "$(common_build)"!=""
-SOLARIDLDIR=$(SOLARVERSION)/common$(PROEXT)/idl$(UPDMINOREXT)
+SOLARIDLDIR=$(SOLARVERSION)/common$(PROEXT)/idl
 .ELSE
-SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl$(UPDMINOREXT)
+SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl
 .ENDIF
 
-#.IF "$(UPDMINOR)" != ""
-#UPDMINOREXT=.$(UPDMINOR)
-#.ELSE
-#UPDMINOREXT=
-#.ENDIF
-SOLARRESDIR=$(SOLARVERSION)/$(INPATH)/res$(UPDMINOREXT)
-SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res$(UPDMINOREXT)
-SOLARLIBDIR=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT)
-SOLARJAVADIR=$(SOLARVERSION)/$(INPATH)/java$(UPDMINOREXT)
-SOLARINCDIR=$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)
-SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)
+SOLARRESDIR=$(SOLARVERSION)/$(INPATH)/res
+SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res
+SOLARLIBDIR=$(SOLARVERSION)/$(INPATH)/lib
+SOLARLIBDIR_FOR_BUILD=$(SOLARVERSION)/$(INPATH_FOR_BUILD)/lib
+SOLARJAVADIR=$(SOLARVERSION)/$(INPATH)/java
+SOLARINCDIR=$(SOLARVERSION)/$(INPATH)/inc
+SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc
 .IF "$(SOLARLANG)"!="deut"
 .IF "$(SOLARLANG)" != ""
-SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(SOLARLANG)
-SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res$(UPDMINOREXT)/$(SOLARLANG)
-.ENDIF
-.ENDIF
-SOLARBINDIR:=$(SOLARVERSION)/$(INPATH)/bin$(UPDMINOREXT)
-SOLARUCRDIR=$(SOLARVERSION)/$(INPATH)/ucr$(UPDMINOREXT)
-SOLARPARDIR=$(SOLARVERSION)/$(INPATH)/par$(UPDMINOREXT)
-SOLARXMLDIR=$(SOLARVERSION)/$(INPATH)/xml$(UPDMINOREXT)
-SOLARDOCDIR=$(SOLARVERSION)/$(INPATH)/doc$(UPDMINOREXT)
-SOLARPCKDIR=$(SOLARVERSION)/$(INPATH)/pck$(UPDMINOREXT)
-SOLARSDFDIR=$(SOLARVERSION)/$(INPATH)/sdf$(UPDMINOREXT)
-SOLARCOMMONBINDIR=$(SOLARVERSION)/common$(PROEXT)/bin$(UPDMINOREXT)
-SOLARCOMMONRESDIR=$(SOLARVERSION)/common$(PROEXT)/res$(UPDMINOREXT)
-SOLARCOMMONPCKDIR=$(SOLARVERSION)/common$(PROEXT)/pck$(UPDMINOREXT)
-SOLARCOMMONSDFDIR=$(SOLARVERSION)/common$(PROEXT)/sdf$(UPDMINOREXT)
+SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc/$(SOLARLANG)
+SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res/$(SOLARLANG)
+.ENDIF
+.ENDIF
+SOLARBINDIR:=$(SOLARVERSION)/$(INPATH_FOR_BUILD)/bin
+SOLARUCRDIR=$(SOLARVERSION)/$(INPATH)/ucr
+SOLARPARDIR=$(SOLARVERSION)/$(INPATH)/par
+SOLARXMLDIR=$(SOLARVERSION)/$(INPATH)/xml
+SOLARDOCDIR=$(SOLARVERSION)/$(INPATH)/doc
+SOLARPCKDIR=$(SOLARVERSION)/$(INPATH)/pck
+SOLARSDFDIR=$(SOLARVERSION)/$(INPATH)/sdf
+SOLARCOMMONBINDIR=$(SOLARVERSION)/common$(PROEXT)/bin
+SOLARCOMMONRESDIR=$(SOLARVERSION)/common$(PROEXT)/res
+SOLARCOMMONPCKDIR=$(SOLARVERSION)/common$(PROEXT)/pck
+SOLARCOMMONSDFDIR=$(SOLARVERSION)/common$(PROEXT)/sdf
 .IF "$(common_build)"==""
 SOLARCOMMONBINDIR=$(SOLARBINDIR)
 SOLARCOMMONRESDIR=$(SOLARRESDIR)
@@ -810,19 +806,9 @@ SOLARCOMMONSDFDIR=$(SOLARSDFDIR)
 
 .EXPORT : SOLARBINDIR
 
-L10N_MODULE*=$(SOURCE_ROOT_DIR)/l10n/l10n
-ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so
-
 .IF "$(WITH_LANG)"!=""
 .INCLUDE .IGNORE: $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk
-.INCLUDE .IGNORE: $(ALT_L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk
-
-# check for localizations not hosted in l10n module. if a file exists there
-# it won't in l10n
-.IF "$(ALT_LOCALIZATION_FOUND)"!=""
-TRYALTSDF:=$(ALT_L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
-LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYALTSDF) $(THEN) echo $(TRYALTSDF) $(FI)))
-.ENDIF			# "$(ALT_LOCALIZATION_FOUND)"!=""
+
 # if the l10n module exists, use split localize.sdf directly from there
 .IF "$(LOCALIZATION_FOUND)"!="" && "$(LOCALIZESDF)"==""
 # still check for existence as there may be no localization yet
@@ -863,8 +849,8 @@ LIB:=$(LB);$(BIN);$(ILIB)
 CPUNAME=CPUNAME_HAS_TO_BE_SET_IN_ENVIRONMENT
 .ENDIF
 
-.IF "$(USE_STLP_DEBUG)" != ""
-SCPCDEFS+=-D_STLP_DEBUG
+.IF "$(USE_DEBUG_RUNTIME)" != ""
+SCPCDEFS+=-D_DEBUG_RUNTIME
 .ENDIF
 
 .IF "$(UDK_MAJOR)"!=""
@@ -876,10 +862,6 @@ SCPDEFS+=-DCCNUMVER=$(CCNUMVER)
 .IF "$(COM)"=="GCC"
 SCPDEFS+=-DSHORTSTDCPP3=$(SHORTSTDCPP3) -DSHORTSTDC3=$(SHORTSTDC3)
 .ENDIF			# "$(SHORTSTDCPP3)"!=""
-# extend library path for OS/2 gcc/wlink
-.IF "$(GUI)"=="OS2"
-LIB:=$(LB);$(SLB);$(ILIB)
-.ENDIF
 
 
 UNOIDLDEFS+=-DSUPD=$(UPD) -DUPD=$(UPD)
@@ -888,10 +870,10 @@ UNOIDLDEPFLAGS=-Mdepend=$(SOLARVER)
 
 UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR)
 
-CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME)
+CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CPUNAME)
 
-.IF "$(USE_STLP_DEBUG)" != "" && "$(GUI)"!="OS2"
-CDEFS+=-D_STLP_DEBUG
+.IF "$(USE_DEBUG_RUNTIME)" != ""
+CDEFS+=-D_DEBUG_RUNTIME
 .ENDIF
 
 .IF "$(CDEFS_PRESET)" != ""
@@ -904,7 +886,11 @@ CDEFS+=-DTIMELOG
 
 CDEFSCXX=
 CDEFSOBJ=
+.IF "$(OS)"=="IOS"
+CDEFSSLO=
+.ELSE
 CDEFSSLO=-DSHAREDLIB -D_DLL_
+.ENDIF
 CDEFSGUI=-DGUI
 CDEFSCUI=-DCUI
 #CDEFSMT=-DMULTITHREAD
@@ -917,9 +903,9 @@ CDEFSOPT=-DOPTIMIZE
 
 MKDEPFLAGS+=-I$(INCDEPN:s/ / -I/:s/-I-I/-I/)
 MKDEPALLINC=$(SOLARINC:s/-I/ -I/)
-MKDEPPREINC=-I$(PREPATH)/$(INPATH)/inc$(UPDMINOREXT)
-MKDEPSOLENV=-I$(SOLARENV)/inc -I$(SOLARENV)/$(GUI)$(CVER)$(COMEX)/inc
-MKDEPSOLVER=-I$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT) -I$(SOLARVERSION)/$(INPATH)/inc
+MKDEPPREINC=-I$(PREPATH)/$(INPATH)/inc
+MKDEPSOLENV=-I$(SOLARENV)/inc -I$(SOLARENV)/$(GUI)$(COMEX)/inc
+MKDEPSOLVER=-I$(SOLARVERSION)/$(INPATH)/inc
 MKDEPLOCAL=-I$(INCCOM)
 
 .IF "$(MKDEPENDALL)"!=""
@@ -970,10 +956,8 @@ RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc
     VERBOSITY=-verbose
 .ELSE
     COMMAND_ECHO=@
-    .IF "$(VERBOSE)" == "FALSE"
-        VERBOSITY=-quiet
-        ZIP_VERBOSITY=-q
-    .ENDIF
+    VERBOSITY=-quiet
+    ZIP_VERBOSITY=-q
 .ENDIF # "$(VERBOSE)" == "TRUE"
 COMPILE_ECHO_SWITCH=
 COMPILE_ECHO_FILE=$(<:f)
@@ -983,7 +967,7 @@ RSCUPDVER=$(RSCREVISION)
 RSCUPDVERDEF=-DUPDVER="$(RSCUPDVER)"
 
 RSCFLAGS=-s
-RSCDEFS=-D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) $(JAVADEF)
+RSCDEFS=-D$(GUI) -D$(GVER) -D$(COM) $(JAVADEF)
 
 .IF "$(BUILD_SPECIAL)"!=""
 RSCDEFS+=-DBUILD_SPECIAL=$(BUILD_SPECIAL)
@@ -1019,9 +1003,7 @@ LNTFLAGSOUTOBJ=-os
 .INCLUDE : unx.mk
 .ENDIF
 
-.IF "$(GUI)" == "OS2"
-.INCLUDE : os2.mk
-.ENDIF
+DLLPOSTFIX=lo
 
 .IF "$(OOO_LIBRARY_PATH_VAR)" != ""
 # Add SOLARLIBDIR at the begin of a (potentially previously undefined) library
@@ -1035,32 +1017,43 @@ AUGMENT_LIBRARY_PATH_LOCAL = : && \
     $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}}
 .END
 
-# remove if .Net 2003 support has expired 
-.IF "$(debug)"!=""
-.IF "$(OS)$(COM)$(CPU)" == "WNTMSCI"
-.IF "$(COMEX)" == "10"
-.IF "$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)"!=""
-MAXPROCESS!:=1
-.EXPORT : MAXPROCESS
-.ENDIF			# "$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)"!=""
-.ENDIF			# "$(COMEX)" == "10"
-.ENDIF			# "$(OS)$(COM)$(CPU)" == "WNTMSCI"
-.ENDIF			# "$(debug)"!=""
-
 # for multiprocess building in external modules
 # allow seperate handling
 EXTMAXPROCESS*=$(MAXPROCESS)
 
+GDBTRACE=gdb -nx --command=$(SOLARENV)/bin/gdbtrycatchtrace --args
+
+#use with export VALGRIND=memcheck, that method of invocation is used because
+#hunspell will aslo run its own unit tests under valgrind when this variable is
+#set.
+.IF "$(VALGRIND)" != ""
+VALGRINDTOOL=valgrind --tool=$(VALGRIND) --num-callers=50
+.IF "$(VALGRIND)" == "memcheck"
+VALGRINDTOOL+=--leak-check=yes
+G_SLICE*:=always-malloc
+.EXPORT : G_SLICE
+.ENDIF
+.ENDIF
+
 IDLC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/idlc
-REGMERGE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regmerge
-REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regcompare
-REGCOMP*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regcomp
+REGMERGE*=$(AUGMENT_LIBRARY_PATH) $(VALGRINDTOOL) $(SOLARBINDIR)/regmerge
+REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) $(VALGRINDTOOL) $(SOLARBINDIR)/regcompare
+
+.IF "$(DEBUGREGCOMP)" != "" || "$(debugregcomp)" != ""
+GDBREGCOMPTRACE=$(GDBTRACE)
+.ENDIF
+
+REGCOMP*=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBREGCOMPTRACE) $(SOLARBINDIR)/regcomp
 CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cppumaker
 JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/javamaker
 RDBMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rdbmaker
 CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/climaker
 
-CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(SOLARBINDIR)/cppunittester
+.IF "$(DEBUGCPPUNIT)" != "" || "$(debugcppunit)" != ""
+GDBCPPUNITTRACE=$(GDBTRACE)
+.ENDIF
+
+CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(VALGRINDTOOL) $(SOLARBINDIR)/cppunit/cppunittester
 HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/helpex
 LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/lngconvex
 HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/HelpLinker
@@ -1101,9 +1094,12 @@ CDEFS+= -DSUPD=$(UPD)
 
 # flags to enable build with symbols; required for crashdump feature
 .IF ("$(ENABLE_CRASHDUMP)"!="" && "$(ENABLE_CRASHDUMP)"!="DUMMY") || "$(ENABLE_SYMBOLS)"!=""
+# if debug is enabled, this may enable less debug info than debug, so rely just on debug
+.IF "$(debug)" == ""
 CFLAGSENABLESYMBOLS_CC_ONLY*=$(CFLAGSENABLESYMBOLS)
 CFLAGSCXX+=$(CFLAGSENABLESYMBOLS)
 CFLAGSCC+=$(CFLAGSENABLESYMBOLS_CC_ONLY)
+.ENDIF          # "$(DEBUG)" == ""
 .ENDIF          # ("$(ENABLE_CRASHDUMP)"!="" && "$(ENABLE_CRASHDUMP)"!="DUMMY") || "$(ENABLE_SYMBOLS)"!=""
 
 .IF "$(profile)"!=""
@@ -1173,6 +1169,10 @@ CDEFS+=-DENABLE_LAYOUT_EXPERIMENTAL=1
 CFLAGS+=-DENABLE_LAYOUT_EXPERIMENTAL=0
 .ENDIF # ENABLE_LAYOUT_EXPERIMENTAL != TRUE
 
+.IF "$(ENABLE_GSTREAMER)" == "TRUE"
+CDEFS+=-DGSTREAMER
+.ENDIF
+
 # compose flags and defines for GUI
 .IF "$(TARGETTYPE)"=="GUI"
 CDEFS+= $(CDEFSGUI)
@@ -1209,15 +1209,6 @@ STDSHL=$(STDSHLCUIMT)
 
 .EXPORT : PICSWITCH
 
-.IF "$(USE_SYSTEM_STL)"=="YES"
-LIBSTLPORT=""
-.ENDIF
-
-.IF "$(NO_DEFAULT_STL)"==""
-STDLIB+=$(LIBSTLPORT)
-STDSHL+=$(LIBSTLPORT)
-.ENDIF			# "$(NO_DEFAULT_STL)"==""
-
 # fill up unresolved symbols not found else where
 .IF "$(FILLUPARC)"!=""
 STDLIB+=$(FILLUPARC)
@@ -1234,11 +1225,13 @@ CDEFS+=$(JAVADEF)
 # .mk file for that platform should set COMPILER_WARN_ERRORS=TRUE and no longer
 # set MODULES_WITH_WARNINGS, and once no platform sets MODULES_WITH_WARNINGS any
 # longer, this code can go away:
-.IF "$(MODULES_WITH_WARNINGS)" != ""
+.IF "$(MODULES_WITH_WARNINGS)" == ""
+COMPILER_WARN_ERRORS=TRUE
+.ELSE
 MODULES_WITH_WARNINGS_1 := $(foreach,i,$(MODULES_WITH_WARNINGS) .$(i).)
 MODULES_WITH_WARNINGS_2 := $(subst,.$(PRJNAME)., $(MODULES_WITH_WARNINGS_1))
 .IF "$(MODULES_WITH_WARNINGS_1)" == "$(MODULES_WITH_WARNINGS_2)"
-COMPILER_WARN_ERRORS = TRUE
+COMPILER_WARN_ERRORS=TRUE
 .ENDIF
 .ENDIF
 
diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
index 3e090272408d..5896f2b55c12 100644
--- a/solenv/inc/shlinfo.rc
+++ b/solenv/inc/shlinfo.rc
@@ -25,19 +25,8 @@
  *
  ************************************************************************/
 
-#if !defined(ENGLISH)
-#define LG_D 					// generate always german version
-#endif
-
 #define VER_FIRSTYEAR	2010
 
-
-#if defined(OS2)
-
-#define OS2_VERSION "hello world"
-
-#else
-
 #include <windows.h>
 #include "version.hrc"
 
@@ -45,16 +34,16 @@
 // 				version information
 // -----------------------------------------------------------------------
 
-VS_VERSION_INFO versioninfo
+VS_VERSION_INFO VERSIONINFO
 #ifndef SUBVERSION
-	fileversion    VERSION, 0, VERVARIANT, VER_COUNT
-	productversion VERSION, 0, VERVARIANT, VER_COUNT
+	FILEVERSION    VERSION, 0, VERVARIANT, VER_COUNT
+	PRODUCTVERSION VERSION, 0, VERVARIANT, VER_COUNT
 #else
-	fileversion    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-	productversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+	FILEVERSION    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+	PRODUCTVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
 #endif
-	fileflagsmask 0x3F
-	fileflags
+	FILEFLAGSMASK 0x3F
+	FILEFLAGS
 #if defined(DEBUG)
 	VS_FF_DEBUG |
 #endif
@@ -62,52 +51,27 @@ VS_VERSION_INFO versioninfo
 	VS_FF_PRERELEASE |
 #endif
 	0
-#ifndef WIN32
-	fileos VOS_DOS_WINDOWS16
-#else
-	fileos VOS_NT_WINDOWS32
-#endif
-	filetype VFT_APP
+	FILEOS VOS_NT_WINDOWS32
+	FILETYPE VFT_APP
 	{
-		block "StringFileInfo"
+		BLOCK "StringFileInfo"
 		{
-#ifdef LG_D
-			block "040704E4"
-			{
-				// German StringTable
-				value "CompanyName",		"OpenOffice.org\0"
-				value "FileVersion",		PPS(VER_LEVEL) "\0"
-				value "OriginalFilename",	PPS(ORG_NAME) "\0"
-				value "InternalName", 		PPS(INTERNAL_NAME) "\0"
-				value "LegalCopyright",		S_CRIGHT " Oracle, Inc.\0"
-				ADDITIONAL_VERINFO1
-				ADDITIONAL_VERINFO2
-				ADDITIONAL_VERINFO3
-			}
-#else
-			block "040904E4"
+			BLOCK "040904E4"
 			{
 				// International StringTable
-				value "CompanyName",		"OpenOffice.org\0"
-				value "FileVersion",		PPS(VER_LEVEL) "\0"
-				value "OriginalFilename",	PPS(ORG_NAME) "\0"
-				value "InternalName", 		PPS(INTERNAL_NAME) "\0"
-				value "LegalCopyright", 	S_CRIGHT " Oracle, Inc.\0"
+                VALUE "CompanyName",		"The Document Foundation\0"
+				VALUE "FileVersion",		PPS(VER_LEVEL) "\0"
+				VALUE "OriginalFilename",	PPS(ORG_NAME) "\0"
+				VALUE "InternalName", 		PPS(INTERNAL_NAME) "\0"
+                VALUE "LegalCopyright", 	S_CRIGHT " The Document Foundation\0"
 				ADDITIONAL_VERINFO1
 				ADDITIONAL_VERINFO2
 				ADDITIONAL_VERINFO3
 			}
-#endif
 		}
 
-		block "VarFileInfo"
+		BLOCK "VarFileInfo"
 		{
-#ifdef LG_D
-			value "Translation", 0x0407, 1252
-#else
-			value "Translation", 0x0409, 1252
-#endif
+			VALUE "Translation", 0x0409, 1252
 		}
 	}
-
-#endif // OS2
diff --git a/solenv/inc/startup/startup.mk b/solenv/inc/startup/startup.mk
index b4aa9a74353a..da4f38e5e5ad 100644
--- a/solenv/inc/startup/startup.mk
+++ b/solenv/inc/startup/startup.mk
@@ -30,10 +30,10 @@ CALLMACROS:=$(MAKEMACROS)
 CALLTARGETS=$(MAKETARGETS)
 .ENDIF			# "$(TNR)" == ""
 
-.INCLUDEDIRS : $(DMAKE_INC) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) $(SOLARENV)$/inc
+.INCLUDEDIRS : $(DMAKE_INC) $(SOLARVERSION)$/$(INPATH)$/inc $(SOLARENV)$/inc
 
 # Grab key definitions from the environment
-# .IMPORT .IGNORE : OS TMPDIR UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME CVER GVER COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT VCL SO3 ENVCFLAGS
+# .IMPORT .IGNORE : OS TMPDIR UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME GVER COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT VCL SO3 ENVCFLAGS
 
 .IF "$(OS)" == "" || "$(OS)" == "Windows_NT"
 .ERROR : ; @echo Forced error: Environment variable OS has to be set for OOo build!
@@ -42,9 +42,7 @@ OS_variable_needed
 
 # Customize macro definitions based on seting of OS.
 # This must come before the default macro definitions which follow.
-.IF "$(OS)" == "OS2"
-.INCLUDE: $(INCFILENAME:d)OS2/macros.mk
-.ELIF "$(OS)" == "WNT"
+.IF "$(OS_FOR_BUILD)" == "WNT"
 .INCLUDE: $(INCFILENAME:d)wnt/macros.mk
 .END
 
diff --git a/solenv/inc/startup/wnt/macros.mk b/solenv/inc/startup/wnt/macros.mk
index 2d8181439e81..391c1a9145d4 100644
--- a/solenv/inc/startup/wnt/macros.mk
+++ b/solenv/inc/startup/wnt/macros.mk
@@ -1,12 +1,7 @@
-# Define additional MSDOS specific settings.
+# Define additional Windows-specific settings.
 #
 
-# --- Set Wrapper command ---
-# Provide a macro that can be used to access the wrapper and to avoid
-# hardcoding the program name everywhere
-GUWCMD*=guw.exe
-
-# This is a no-op for native W32 dmake
+# This is a no-op for native Windows dmake
 .WINPATH !:= yes
 
 # Directory cache configuration.
@@ -24,9 +19,6 @@ E *:= .exe	# Executables
    __.DIVSEP-sh-no  *:= \\
    DIRSEPSTR :=/
 
-.EXPORT : GUWCMD
-
 # Does not respect case of filenames.
 .DIRCACHERESPCASE := no
 NAMEMAX	=	256
-
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 6e8007425454..ed4a7b9c7566 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -31,9 +31,6 @@ MKFILENAME:=TARGET.MK
 # INCLUDE-Path
 # ------------------------------------------------------------------
 
-.IF "$(STL_OS2_BUILDING)" != ""
-CDEFS+=-DSTL_OS2_BUILDING
-.ENDIF
 .IF "$(VISIBILITY_HIDDEN)" != ""
 .IF "$(COMNAME)" == "gcc3" && "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
 CFLAGS += -fvisibility=hidden
@@ -197,7 +194,7 @@ DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(IDLDIRS)/$i)
 DEPIDLFILES:=$(IDLFILES)
 .ENDIF			# "$(EXTERNIDLFILES)"!=""
 .ELSE			# "$(LOCALIDLFILES)$(EXTERNIDLFILES)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(!null,$(shell @$(FIND) . -name $i) $i $(shell @($(FIND) $(IDLDIRS) -name $(i:f)) | $(SED) s/\//\\/g )))
 .ELSE			# "$(GUI)"=="WNT"
 DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(!null,$(shell @$(FIND) . -name $i -print) $i $(shell @$(FIND) $(IDLDIRS) -name $(i:f) -print )  ))
@@ -209,7 +206,7 @@ DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(!null,$(shell @$(FIND) . -name $i -print)
 .IF "$(JARFILES)"!=""
 LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)/$i)
 NEWCLASS:=$(LOCALJARS)
-NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARBINDIR)/$i $(NULL)))
+NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARVERSION)$/$(INPATH)$/bin$/$i $(NULL)))
 .ENDIF			# "$(JARFILES)"!=""
 NEWCLASS+=$(EXTRAJARFILES)
 .IF "$(GENJAVACLASSFILES)"!=""
@@ -344,14 +341,8 @@ JAVATARGET:=$(MISC)/$(TARGET)_dummy.java
 
 .IF "$(JARTARGET)"!=""
 JARCLASSDIRS*=.
-.IF "$(NEW_JAR_PACK)"!=""
 JARMANIFEST*=$(CLASSDIR)/$(TARGET)/META-INF/MANIFEST.MF
-.ENDIF			# "$(NEW_JAR_PACK)"!=""
 JARTARGETN=$(CLASSDIR)/$(JARTARGET)
-.IF "$(NOJARDEP)$(NEW_JAR_PACK)"==""
-JARTARGETDEP=$(JARTARGET).dep
-JARTARGETDEPN=$(MISC)/$(JARTARGET).dep
-.ENDIF			# "$(NOJARDEP)$(NEW_JAR_PACK)"==""
 .ENDIF			# "$(JARTARGET)"!=""
 .ELSE			# "$(SOLAR_JAVA)"!=""
 JAVACLASSFILES:=
@@ -441,7 +432,7 @@ APP2BASEX=/BASE:$(APP2BASE)
 .IF "$(APP3TARGET)"!=""
 APP3TARGETN=$(BIN)/$(APP3TARGET)$(EXECPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(APP3BASE)"==""
 APP3BASE=$(BASE)
 .ENDIF
@@ -501,7 +492,7 @@ APP7BASEX=/BASE:$(APP7BASE)
 .IF "$(APP8TARGET)"!=""
 APP8TARGETN=$(BIN)/$(APP8TARGET)$(EXECPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(APP8BASE)"==""
 APP8BASE=$(BASE)
 .ENDIF
@@ -513,7 +504,7 @@ APP8BASEX=/BASE:$(APP8BASE)
 .IF "$(APP9TARGET)"!=""
 APP9TARGETN=$(BIN)/$(APP9TARGET)$(EXECPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(APP9BASE)"==""
 APP9BASE=$(BASE)
 .ENDIF
@@ -529,7 +520,7 @@ SHL1TARGET!:=$(SHL1TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL1DLLPRE*=$(DLLPRE)
 SHL1TARGETN=$(DLLDEST)/$(SHL1DLLPRE)$(SHL1TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL1BASE)"==""
 SHL1BASE=$(BASE)
 .ENDIF
@@ -545,7 +536,7 @@ SHL2TARGET!:=$(SHL2TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL2DLLPRE*=$(DLLPRE)
 SHL2TARGETN=$(DLLDEST)/$(SHL2DLLPRE)$(SHL2TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL2BASE)"==""
 SHL2BASE=$(BASE)
 .ENDIF
@@ -561,7 +552,7 @@ SHL3TARGET!:=$(SHL3TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL3DLLPRE*=$(DLLPRE)
 SHL3TARGETN=$(DLLDEST)/$(SHL3DLLPRE)$(SHL3TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL3BASE)"==""
 SHL3BASE=$(BASE)
 .ENDIF
@@ -577,7 +568,7 @@ SHL4TARGET!:=$(SHL4TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL4DLLPRE*=$(DLLPRE)
 SHL4TARGETN=$(DLLDEST)/$(SHL4DLLPRE)$(SHL4TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL4BASE)"==""
 SHL4BASE=$(BASE)
 .ENDIF
@@ -593,7 +584,7 @@ SHL5TARGET!:=$(SHL5TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL5DLLPRE*=$(DLLPRE)
 SHL5TARGETN=$(DLLDEST)/$(SHL5DLLPRE)$(SHL5TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL5BASE)"==""
 SHL5BASE=$(BASE)
 .ENDIF
@@ -609,7 +600,7 @@ SHL6TARGET!:=$(SHL6TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL6DLLPRE*=$(DLLPRE)
 SHL6TARGETN=$(DLLDEST)/$(SHL6DLLPRE)$(SHL6TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL6BASE)"==""
 SHL6BASE=$(BASE)
 .ENDIF
@@ -625,7 +616,7 @@ SHL7TARGET!:=$(SHL7TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL7DLLPRE*=$(DLLPRE)
 SHL7TARGETN=$(DLLDEST)/$(SHL7DLLPRE)$(SHL7TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL7BASE)"==""
 SHL7BASE=$(BASE)
 .ENDIF
@@ -641,7 +632,7 @@ SHL8TARGET!:=$(SHL8TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL8DLLPRE*=$(DLLPRE)
 SHL8TARGETN=$(DLLDEST)/$(SHL8DLLPRE)$(SHL8TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL8BASE)"==""
 SHL8BASE=$(BASE)
 .ENDIF
@@ -657,7 +648,7 @@ SHL9TARGET!:=$(SHL9TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL9DLLPRE*=$(DLLPRE)
 SHL9TARGETN=$(DLLDEST)/$(SHL9DLLPRE)$(SHL9TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL9BASE)"==""
 SHL9BASE=$(BASE)
 .ENDIF
@@ -779,7 +770,7 @@ LIB8TARGETN=$(LIB8TARGET)
 LIB9TARGETN=$(LIB9TARGET)
 .ENDIF
 
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(COM)"!="GCC"
 LIB1ARCHIV=
 LIB2ARCHIV=
@@ -1035,7 +1026,7 @@ ALL_JAVA_TARGETS= \
 .IF "$(lintit)"==""
 .IF "$(L10N_framework)"!=""
 ALLTAR:	\
-        "$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk" \
+        "$(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk" \
         $(SUBDIRS)		\
         $(DPRTARGET) \
         $(DPZTARGET) \
@@ -1083,7 +1074,7 @@ ALLTAR:	\
 .ELSE			# "$(L10N_framework)"!=""
 
 ALLTAR: \
-        "$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk" \
+        "$(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk" \
         $(MAKEDEMODIR)	$(MAKECOMPDIR) $(MAKEXLDIR)	\
         $(COMPVERMK) \
         $(JAVAVERMK) \
@@ -1363,7 +1354,7 @@ $(UNIXTEXT) : $(UNIXTEXT:f)
     $(TOUCH) $@
 
 .IF "$(LOCALIZATION_FOUND)"==""
-.IF "$(LOCALSDFFILE)"!=""
+.IF "$(LOCALSDFFILE)"!="" && "$(LOCALSDFFILE)"=="$(LOCALIZESDF)"
 "$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip
     @@-$(MKDIRHIER) $(@:d)
     @@-$(MKDIRHIER) $(COMMONMISC)/$(PRJNAME)_$(TARGET)
@@ -1422,7 +1413,7 @@ $(SCP_PRODUCT_TYPE):
 
 .ENDIF			# "$(PARFILES)"!=""
 
-"$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg" :
+"$(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg" :
     $(TOUCH) $@
 
 .IF "$(COMPVERMK)"!=""
@@ -1431,7 +1422,7 @@ $(SCP_PRODUCT_TYPE):
 COMPVERMK_PHONY:=.PHONY
 .ENDIF			# "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)"
 COMPVTMP:=$(mktmp iii)
-"$(COMPVERMK)" $(COMPVERMK_PHONY): $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg
+"$(COMPVERMK)" $(COMPVERMK_PHONY): $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg
 .IF "$(CCNUMVER)"!=""
     @echo COMNAME:=$(COMNAME) > $(COMPVTMP)
     @echo COMID:=$(COMID) >> $(COMPVTMP)
@@ -1459,7 +1450,7 @@ COMPVTMP:=$(mktmp iii)
 .IF "$(JAVALOCATION)"!="$(JAVA_HOME)"
 "$(JAVAVERMK)" .PHONY :
 .ELSE          # "$(JAVALOCATION)"!="$(JAVA_HOME)"
-"$(JAVAVERMK)" : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg
+"$(JAVAVERMK)" : $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg
 .ENDIF          # "$(JAVALOCATION)"!="$(JAVA_HOME)"
     @-$(RM) $@
     @echo JAVAVER:=$(JAVAVER) > $@
@@ -1756,7 +1747,7 @@ ALLTAR : forcedeps
     @$(TOUCH) $(TMP)/makedt.don
 
 killbin:
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
     @$(IFEXIST) $(BIN)/$(SHL1TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL1TARGET).dll $(FI)
     @$(IFEXIST) $(BIN)/$(SHL2TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL2TARGET).dll $(FI)
     @$(IFEXIST) $(BIN)/$(SHL3TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL3TARGET).dll $(FI)
@@ -1963,7 +1954,7 @@ $(MISC)/$(TARGET).dpz $(ZIPDEPPHONY) : $(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGE
 .ENDIF
 
 VERSIONTMP:=$(mktmp iii)
-$(INCCOM)/%_version.h : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg
+$(INCCOM)/%_version.h : $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg
     @echo $(EMQ)#define _BUILD $(EMQ)"$(BUILD)$(EMQ)" > $(VERSIONTMP)
     @echo $(EMQ)#define _UPD $(EMQ)"$(UPD)$(EMQ)"                 >> $(VERSIONTMP)
     @echo $(EMQ)#define _LAST_MINOR $(EMQ)"$(LAST_MINOR)$(EMQ)"   >> $(VERSIONTMP)
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index cefdf14db033..cd9d44424369 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -29,10 +29,6 @@
 # instructions for linking
 # unroll begin
 
-.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP$(TNR)DEF = $(MISC)/$(APP$(TNR)TARGET).def
-.ENDIF
-
 .IF "$(APP$(TNR)LINKTYPE)" != ""
 #must be either STATIC or SHARED
 APP$(TNR)LINKTYPEFLAG=$(APPLINK$(APP$(TNR)LINKTYPE))
@@ -88,7 +84,7 @@ APP$(TNR)PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP$(TNR)PRODUCTNAME)\"
 .ENDIF			# "$(APP$(TNR)PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(APP$(TNR)LIBS)"!=""
 $(MISC)/$(APP$(TNR)TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -103,16 +99,8 @@ $(APP$(TNR)TARGETN) : $(LINKINCTARGETS)
 # Allow for target specific LIBSALCPPRT override
 APP$(TNR)LIBSALCPPRT*=$(LIBSALCPPRT)
 
-.IF "$(GUI)" == "OS2"
-_APP$(TNR)IMP_ORD = $(APP$(TNR)STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP$(TNR)STDLIBS:^"$(LB)/") 
-APP$(TNR)IMP_ORD = $(foreach,i,$(_APP$(TNR)IMP_ORD) $(shell @-ls $i))
-.ELSE
-APP$(TNR)IMP_ORD = 
-.ENDIF
-
 $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     $(APP$(TNR)RES) \
-    $(APP$(TNR)IMP_ORD) \
     $(APP$(TNR)ICON) $(APP$(TNR)DEPN) $(USE_APP$(TNR)DEF)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
@@ -123,7 +111,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP$(TNR)OBJS:s/.obj/.o/) \
     `cat /dev/null $(APP$(TNR)LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
     $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd` \
@@ -176,7 +164,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     @echo mingw
 .IF "$(APP$(TNR)LINKRES)" != "" || "$(APP$(TNR)RES)" != ""
     @cat $(APP$(TNR)LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP$(TNR)RES)) >  $(MISC)/$(@:b)_all.res
-    windres $(MISC)/$(@:b)_all.res $(APP$(TNR)RESO)
+    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP$(TNR)RESO)
 .ENDIF
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP$(TNR)BASEX) $(APP$(TNR)STACKN) -o $@ $(APP$(TNR)OBJS) \
@@ -247,66 +235,6 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
 
 .ENDIF			# "$(GUI)" == "WNT"
 
-.IF "$(GUI)" == "OS2"
-    @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
-.IF "$(APP$(TNR)LINKRES)" != ""
-    @+-$(RM) $(MISC)/$(APP$(TNR)LINKRES:b).rc >& $(NULLDEV)
-.IF "$(APP$(TNR)ICON)" != ""
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP$(TNR)ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
-.ENDIF		# "$(APP$(TNR)ICON)" != ""
-.IF "$(APP$(TNR)VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP$(TNR)VERINFO)$(EMQ)" >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
-.ENDIF		# "$(APP$(TNR)VERINFO)" != ""
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP$(TNR)LINKRES:b).rc
-.ENDIF			# "$(APP$(TNR)LINKRES)" != ""
-
-.IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP$(TNR)TARGET) WINDOWAPI > $(MISC)/$(APP$(TNR)TARGET).def
-.ENDIF
-
-  .IF "$(VERBOSE)" == "TRUE"
-    @+echo	$(APP$(TNR)LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP$(TNR)BASEX) \
-        $(APP$(TNR)STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP$(TNR)LINKRES) \
-        $(APP$(TNR)RES) \
-        $(APP$(TNR)DEF) \
-        $(APP$(TNR)OBJS) \
-        $(APP$(TNR)LIBS) \
-        $(APP$(TNR)STDLIBS:^"-l") \
-        $(APP$(TNR)STDLIB:^"-l") $(STDLIB$(TNR):^"-l") 
-  .ENDIF
-    $(COMMAND_ECHO)$(APP$(TNR)LINKER) -v \
-        $(APP$(TNR)LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP$(TNR)BASEX) \
-        $(APP$(TNR)STACKN) \
-        -o $@ \
-        -Zmap -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(STDOBJ) \
-        $(APP$(TNR)LINKRES) \
-        $(APP$(TNR)RES) \
-        $(APP$(TNR)DEF) \
-        $(APP$(TNR)OBJS) \
-        $(APP$(TNR)LIBS) \
-        $(APP$(TNR)STDLIBS:^"-l") \
-        $(APP$(TNR)STDLIB:^"-l") $(STDLIB$(TNR):^"-l") 
-
-
-.IF "$(APP$(TNR)TARGET)" == "loader"
-    $(COMMAND_ECHO)+$(PERL) loader.pl $@
-    $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)+$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(APP$(TNR)TARGETN)"!=""
 
 
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index c68ae5af430e..a9fc9202ea2c 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -68,9 +68,11 @@ CCVER:=$(shell @-$(CXX) $(CFLAGSVERSION_CMD))
 CCNUMVER:=$(shell @-$(CXX) $(CFLAGSNUMVERSION_CMD))
 
 .IF "$(COM)"=="MSC"
-.IF "$(CCNUMVER)">="001200000000"
 COMID=MSC
+.IF "$(CPU)"=="I"
 COMNAME=msci
+.ELSE
+COMNAME=mscx
 .ENDIF
 .ENDIF
 
diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk
index cfe2fe147ebe..bd3e7bbd9413 100644
--- a/solenv/inc/tg_config.mk
+++ b/solenv/inc/tg_config.mk
@@ -32,10 +32,6 @@ XCSROOTURL!:=$(ABSXCSROOT)
 XCSROOTURL!:=file:///$(subst,\,/ $(XCSROOTURL))
 .ENDIF
 SYSXSLDIR*:=$(XSLDIR)/
-.IF $(GUI)==OS2
-XCSROOTURL!:=$(subst,\,/ $(XCSROOTURL))
-SYSXSLDIR!:=$(subst,\,/ $(SYSXSLDIR))/
-.ENDIF
 
 #
 # --- XCS ---
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk
index 0bbd1f6b1ab1..763ad26e5021 100644
--- a/solenv/inc/tg_def.mk
+++ b/solenv/inc/tg_def.mk
@@ -55,7 +55,7 @@ $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP)
     $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)nm -gP $(SHL$(TNR)OBJS) \
+    $(COMMAND_ECHO)$(NM) -gP $(SHL$(TNR)OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL$(TNR)LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
         | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
@@ -65,12 +65,6 @@ $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP)
 
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-DEF$(TNR)EXPORTFILE=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET).dxp
-$(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.ENDIF			# "$(GUI)"=="OS2"
-
 .ENDIF			# "$(DEF$(TNR)EXPORTFILE)"==""
 .ENDIF			# "$(SHL$(TNR)VERSIONMAP)"!=""
 
@@ -192,112 +186,6 @@ $(DEF$(TNR)TARGETN) .PHONY :
     @$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL$(TNR)TARGET8=$(shell @fix_shl $(SHL$(TNR)TARGETN:f))
-
-DEF$(TNR)FILTER=$(SOLARENV)/inc/dummy.flt
-DEF$(TNR)NAMELIST=$(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib)
-
-.IF "$(link_always)"==""
-$(DEF$(TNR)TARGETN) : \
-        $(DEF$(TNR)DEPN) \
-        $(DEF$(TNR)EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF$(TNR)TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    @+-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(SHL$(TNR)TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
-    @echo DATA MULTIPLE	 >>$@.tmpfile
-    @echo DESCRIPTION	'StarView 3.00 $(DEF$(TNR)DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-    @echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    @echo _GetVersionInfo		>$@.tmp_ord
-.ENDIF
-
-.IF "$(DEFLIB$(TNR)NAME)"!=""
-    @+echo $(SLB)/$(DEFLIB$(TNR)NAME).lib
-    @+emxexpr $(DEF$(TNR)NAMELIST) | fix_exp_file >> $@.tmp_ord
-.ENDIF				# "$(DEFLIB$(TNR)NAME)"!=""
-
-.IF "$(DEF$(TNR)EXPORT1)"!=""
-    @echo $(DEF$(TNR)EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT2)"!=""
-    @echo $(DEF$(TNR)EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT3)"!=""
-    @echo $(DEF$(TNR)EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT4)"!=""
-    @echo $(DEF$(TNR)EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT5)"!=""
-    @echo $(DEF$(TNR)EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT6)"!=""
-    @echo $(DEF$(TNR)EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT7)"!=""
-    @echo $(DEF$(TNR)EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT8)"!=""
-    @echo $(DEF$(TNR)EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT9)"!=""
-    @echo $(DEF$(TNR)EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT10)"!=""
-    @echo $(DEF$(TNR)EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT11)"!=""
-    @echo $(DEF$(TNR)EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT12)"!=""
-    @echo $(DEF$(TNR)EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT13)"!=""
-    @echo $(DEF$(TNR)EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT14)"!=""
-    @echo $(DEF$(TNR)EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT15)"!=""
-    @echo $(DEF$(TNR)EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT16)"!=""
-    @echo $(DEF$(TNR)EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT17)"!=""
-    @echo $(DEF$(TNR)EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT18)"!=""
-    @echo $(DEF$(TNR)EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT19)"!=""
-    @echo $(DEF$(TNR)EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT20)"!=""
-    @echo $(DEF$(TNR)EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORTFILE)"!=""
-    @fix_def_file < $(DEF$(TNR)EXPORTFILE) >> $@.tmp_ord
-.ENDIF
-    @sort < $@.tmp_ord | uniq > $@.exptmpfile
-    @fix_def_ord < $@.exptmpfile >> $@.tmpfile
-    @+-$(RM) $@
-    $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
-    @+-$(RM) $@.tmp_ord
-    @+-$(RM) $@.exptmpfile
-    $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL$(TNR)IMPLIBN:s/.lib/.a/) $@
-    $(COMMAND_ECHO)+emxomf -o $(SHL$(TNR)IMPLIBN) $(SHL$(TNR)IMPLIBN:s/.lib/.a/) 
-
-.ENDIF			# "$(GUI)"=="OS2"
-
 .IF "$(GUI)"=="UNX"
 $(DEF$(TNR)TARGETN): \
         $(DEF$(TNR)DEPN) \
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 63c0c995f42a..a4217779094b 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -29,11 +29,7 @@
 
 # setup INCLUDE variable for use by VC++
 .IF "$(GUI)$(COM)"=="WNTMSC"
-.IF "$(EXT_USE_STLPORT)"==""
-INCLUDE!:=. $(subst,/stl, $(SOLARINC))
-.ELSE			# "$(EXT_USE_STLPORT)"==""
 INCLUDE!:=. $(SOLARINC)
-.ENDIF			# "$(EXT_USE_STLPORT)"==""
 INCLUDE!:=$(INCLUDE:s/ -I/;/)
 .EXPORT : INCLUDE
 .ENDIF			# "$(GUI)$(COM)"=="WNTMSC"
@@ -43,7 +39,7 @@ LDFLAGS!:=$(EXTRA_LINKFLAGS) $(LDFLAGS)
 .EXPORT : LDFLAGS
 .ENDIF
 
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI_FOR_BUILD)"=="WNT"
 PATH!:=.:$(SOLARBINDIR:^"/cygdrive/":s/://):$(PATH)
 .ELSE           # "$(GUI)"=="WNT"
 PATH!:=.$(PATH_SEPERATOR)$(SOLARBINDIR)$(PATH_SEPERATOR)$(PATH)
@@ -110,9 +106,9 @@ clean:
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2
     @-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - ")
+    @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ")
 .ELSE			# "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - )
 .ENDIF			# "$(GUI)"=="UNX"
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
@@ -120,28 +116,28 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.Z
     @-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := sh -c "uncompress -c $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.Z | $(GNUTAR) -x$(tar_verbose_switch)f - ")
+    @noop $(assign UNPACKCMD := sh -c "uncompress -c $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.Z | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ")
 .ELSE			# "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := uncompress -c $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.Z | $(GNUTAR) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := uncompress -c $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.Z | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - )
 .ENDIF			# "$(GUI)"=="UNX"
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.gz
     @-$(RM) $@
-    @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - )
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tgz
     @-$(RM) $@
-    @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - )
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar
     @-$(RM) $@
-    @noop $(assign UNPACKCMD := $(GNUTAR) -x$(tar_verbose_switch)f $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar)
+    @noop $(assign UNPACKCMD := $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar)
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
@@ -151,6 +147,12 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.zip
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
+$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.oxt
+    @-$(RM) $@
+    @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).oxt)
+    @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
+    @$(RENAME) $@.$(INPATH) $@
+
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.jar
     @-$(RM) $@
 .IF "$(OS)"=="SOLARIS"
@@ -163,13 +165,14 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.jar
 
 #do unpack
 $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) : $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack $(PATCH_FILE_DEP)
-    $(IFEXIST) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(THEN) $(RENAME:s/+//) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme $(FI)
+    $(IFEXIST) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR).exists $(THEN) $(RENAME:s/+//) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme $(FI)
     $(COMMAND_ECHO)-rm -rf $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme
     @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
+    @$(TOUCH) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR).exists # $(IFEXIST) only works with files
     $(COMMAND_ECHO)cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE)
     @echo make writeable...
-    @cd $(PACKAGE_DIR) && chmod -R +rw $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE)
-    @cd $(PACKAGE_DIR) && find $(TARFILE_ROOTDIR) -type d -exec chmod a+x {{}} \;
+    @-cd $(PACKAGE_DIR) && chmod -R +rw $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE)
+    @-cd $(PACKAGE_DIR) && find $(TARFILE_ROOTDIR) -type d -print0 | xargs -0 chmod a+x
 
 #add new files to patch
 $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE) : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) $(T_ADDITIONAL_FILES:+".dummy")
@@ -186,13 +189,7 @@ $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE)
     $(COMMAND_ECHO)$(TOUCH) $@
 .ELSE			# "$(PATCH_FILES)"=="none" ||	"$(PATCH_FILES)"==""
 .IF "$(GUI)"=="WNT"
-# hack to make 4nt version 4,01 work and still get propper
-# errorcodes for versions < 3,00
-#.IF "$(my4ver:s/.//:s/,//)" >= "300"
-#	$(COMMAND_ECHO)cd $(PACKAGE_DIR) && ( $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 ) && $(TOUCH) $(PATCH_FLAG_FILE)
-#.ELSE			# "$(my4ver:s/.//:s/,//)" >= "300"
     $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
-#.ENDIF			# "$(my4ver:s/.//:s/,//)" >= "300"
 .ELSE           # "$(GUI)"=="WNT"
 .IF "$(BSCLIENT)"=="TRUE"
     $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
@@ -202,7 +199,7 @@ $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE)
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF			# "$(PATCH_FILES)"=="none" ||	"$(PATCH_FILES)"==""
 .IF "$(T_ADDITIONAL_FILES)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI_FOR_BUILD)"=="WNT"
 # Native W32 tools generate only filedates with even seconds, cygwin also with odd seconds
     $(DELAY) 2
 .ENDIF # "$(GUI)"=="WNT"
@@ -230,11 +227,7 @@ $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
     $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE)
 .ELSE			# "$(CONFIGURE_ACTION)"=="none" || "$(CONFIGURE_ACTION)"==""
     $(COMMAND_ECHO)-$(MKDIR) $(P_CONFIGURE_DIR)
-.IF "$(OS)"=="OS2"
-    $(COMMAND_ECHO)cd $(P_CONFIGURE_DIR) && sh -c "$(CONFIGURE_ACTION:s!\!/!) $(CONFIGURE_FLAGS:s!\!/!)" && $(TOUCH) $(CONFIGURE_FLAG_FILE)
-.ELSE
     $(COMMAND_ECHO)cd $(P_CONFIGURE_DIR) && $(CONFIGURE_ACTION) $(CONFIGURE_FLAGS) && $(TOUCH) $(CONFIGURE_FLAG_FILE)
-.ENDIF
     $(COMMAND_ECHO)mv $(P_CONFIGURE_DIR)/$(CONFIGURE_FLAG_FILE) $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE)
 .ENDIF			# "$(CONFIGURE_ACTION)"=="none" ||	"$(CONFIGURE_ACTION)"==""
 
diff --git a/solenv/inc/tg_jar.mk b/solenv/inc/tg_jar.mk
index fa6ae24110b7..df39ba65229f 100644
--- a/solenv/inc/tg_jar.mk
+++ b/solenv/inc/tg_jar.mk
@@ -26,7 +26,7 @@
 #*************************************************************************
 
 
-.IF "$(VERBOSE)"=="FALSE"
+.IF "$(VERBOSE)"!="TRUE"
 ZIP_VERBOSITY=-q
 .ENDIF
 
@@ -36,11 +36,8 @@ ZIP_VERBOSITY=-q
 JARCOMPRESS_FLAG=0
 .ENDIF
 
-.IF "$(NEW_JAR_PACK)"!=""
 $(JARTARGETN) : $(JARMANIFEST) $(JAVACLASSFILES) $(JAVATARGET)
-.ENDIF			# "$(NEW_JAR_PACK)"!=""
 
-.IF "$(NEW_JAR_PACK)"!=""
 .IF "$(JARMANIFEST)"!=""
 
 .IF "$(CUSTOMMANIFESTFILE)"!=""
@@ -65,7 +62,6 @@ $(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP)
     $(COMMAND_ECHO)$(TYPE) $(MISC)/$(TARGET)_$(CUSTOMMANIFESTFILE:f) >> $@
 .ENDIF			# "$(CUSTOMMANIFESTFILE)"!=""
 .ENDIF			# "$(JARMANIFEST)"!=""
-.ENDIF			# "$(NEW_JAR_PACK)"!=""
 
 .IF "$(JARCLASSEXCLUDES)" == ""
 ZIPJAR_EXCLUDE=
@@ -78,14 +74,8 @@ ZIPJAR_EXCLUDE=$(foreach,i,$(JARCLASSEXCLUDES) -x "$i")
 #
 # build jar 
 #
-.IF "$(NOJARDEP)"!="" || "$(NEW_JAR_PACK)"!=""
 $(JARTARGETN) .PHONY :
 #  $(JARMANIFEST)
-.ELSE			# "$(NOJARDEP)"!="" || "$(NEW_JAR_PACK)"!=""
-.DIRCACHE = no
-$(JARTARGETN) :
-#$(JARTARGETN) .SETDIR=$(CLASSDIR) .SEQUENTIAL : $(JARTARGETDEP) $(shell @-cat -s $(MISC)/$(JARTARGETN).dep )
-.ENDIF			# "$(NOJARDEP)"!="" || "$(NEW_JAR_PACK)"!=""
 .IF "$(OS)$(CPU)"=="SOLARISS"
     @-find . -type d -user $(USER) ! -perm -5 -print | xargs test "$$1" != "" && chmod +r $$1 
 .ENDIF
diff --git a/solenv/inc/tg_java.mk b/solenv/inc/tg_java.mk
index c85d2d9bdfd2..054dcc5fbaff 100644
--- a/solenv/inc/tg_java.mk
+++ b/solenv/inc/tg_java.mk
@@ -51,23 +51,23 @@ $(CLASSDIR)/%.class .NOINFER .IGNORE : %.java
 
 $(JAVATARGET) :	$(JAVAFILES) $(JAVACLASSFILES) 
 .IF "$(JAVARESPONSE)"!=""
-    $(JAVAC) @<<
+    $(COMMAND_ECHO)$(JAVAC) @<<
     $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES)
     <<keep
 .ELSE			# "$(JAVARESPONSE)"!=""
 .IF "$(use_jdep)"!=""
-    $(JAVAC) -depend $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES)
+    $(COMMAND_ECHO)$(JAVAC) -depend $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES)
 .ELSE			# "$(use_jdep)"!=""
 .IF "$(javauno)"!=""
 .IF "$(JAVAFILES:d)"==""
-    $(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES)
+    $(COMMAND_ECHO)$(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES)
 .ELSE			# "$(JAVAFILES:d)"==""
     @@$(TOUCH) $(INPATH)_$(VCSID)_a_dummy.java
-    $(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) ./*.java $(uniq $(JAVAFILES:d:+"*.java"))
+    $(COMMAND_ECHO)$(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) ./*.java $(uniq $(JAVAFILES:d:+"*.java"))
     @@-$(RM) $(INPATH)_$(VCSID)_a_dummy.java
 .ENDIF			# "$(JAVAFILES:d)"==""
 .ELSE			# "$(javauno)"!=""
-    $(JAVAC) $(JAVACPS) "$(CLASSPATH)" -d $(CLASSDIR) $(JAVAFLAGS) @$(mktmp $(strip $(JAVAFILES)))
+    $(COMMAND_ECHO)$(JAVAC) $(JAVACPS) "$(CLASSPATH)" -d $(CLASSDIR) $(JAVAFLAGS) @$(mktmp $(strip $(JAVAFILES)))
 .ENDIF			# "$(javauno)"!=""
 .ENDIF			# "$(use_jdep)"!=""
 .ENDIF			# "$(JAVARESPONSE)"!=""
diff --git a/solenv/inc/tg_lib.mk b/solenv/inc/tg_lib.mk
index 08909156b729..a93d6ad5602c 100644
--- a/solenv/inc/tg_lib.mk
+++ b/solenv/inc/tg_lib.mk
@@ -37,12 +37,6 @@ $(LIB$(TNR)ARCHIV) :	$(LIB$(TNR)TARGET)
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
     @-$(RM) $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
-.ENDIF
     @echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @echo  ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
@@ -58,7 +52,7 @@ $(LIB$(TNR)ARCHIV) :	$(LIB$(TNR)TARGET)
 .IF "$(GUI)$(COM)"=="WNTGCC"
     @+-$(RM) $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
     @+echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
-    @+echo  ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
+    @+echo $(RANLIB) $(LIB$(TNR)ARCHIV) >> $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
 .IF "$(VERBOSE)" == "TRUE"
     @cat $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
 .ENDIF
@@ -91,17 +85,6 @@ $(LIB$(TNR)TARGET) :	$(LIB$(TNR)FILES) \
     @nm `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
-.ELIF "$(GUI)"=="OS2"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB$(TNR)FILES) $(LIB$(TNR)OBJFILES)
-    @+-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB$(TNR)OBJFILES)"!=""    
-    @+$(TYPE) $(mktmp $(LIB$(TNR)OBJFILES)) > $(null,$(LIB$(TNR)OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB$(TNR)OBJFILES)"!=""    
-.IF "$(LIB$(TNR)FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB$(TNR)FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB$(TNR)FILES)"!=""    
-    @+$(ECHONL)
-
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
diff --git a/solenv/inc/tg_merge.mk b/solenv/inc/tg_merge.mk
index a40d48a81c66..19f44cb828af 100644
--- a/solenv/inc/tg_merge.mk
+++ b/solenv/inc/tg_merge.mk
@@ -31,36 +31,27 @@ MKFILENAME:=tg_merge.mk
 
 .IF "$(WITH_LANG)"!=""
 .IF "$(ULFFILES)"!=""
-$(foreach,i,$(ULFFILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) 
-.ENDIF          # "$(ULFFILES)"!=""
+$(foreach,i,$(ULFFILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
+.ENDIF
 
 # *.xrb merge
 .IF "$(XMLPROPERTIES)"!=""
-$(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) 
-.ENDIF          # "$(ULFFILES)"!=""
+$(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
+.ENDIF
 
 # *.xrm merge
 .IF "$(READMEFILES)"!=""
-$(foreach,i,$(READMEFILES) $(COMMONMISC)/$(TARGET)/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF) 
-.ENDIF          # "$(ULFFILES)"!=""
+$(foreach,i,$(READMEFILES) $(COMMONMISC)/$(TARGET)/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF)
+.ENDIF
 
-# *.xrm merge
-#.IF "$(APOCHELPFILES)"!=""
-#$(foreach,i,$(APOCHELPFILES) $(COMMONMISC)/$(MYPATH)/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF) 
-#.ENDIF          # "$(ULFFILES)"!=""
 # *.xcu merge
 .IF "$(LOCALIZEDFILES)"!=""
 $(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)/merge/{$(subst,.,/ $(PACKAGE))}/$(i:b).xcu) : $$(@:f) $(LOCALIZESDF) 
-.ENDIF          # "$(ULFFILES)"!=""
-.ENDIF			# "$(WITH_LANG)"!=""
+.ENDIF
+.ENDIF # "$(WITH_LANG)"!=""
 
 # dependencies from *.ulf to par-files
 .IF "$(ULFPARFILES)"!=""
 $(ULFPARFILES) : $(COMMONMISC)/$(TARGET)/$$(@:b).$(LANGFILEEXT)
 .ENDIF          # "$(ULFPARFILES)"!=""
 
-# *.xrm merge
-#.IF "$(READMEFILES)"!=""
-#$(uniq $(foreach,i,$(READMEFILES) $(COMMONMISC)/$(TARGET)/$(i:b).xrm)) : $$(@:f) $(LOCALIZESDF)
-#.ENDIF          # "$(ULFFILES)"!=""
-
diff --git a/solenv/inc/tg_obj.mk b/solenv/inc/tg_obj.mk
index 3a597c2409b3..73fae59d6762 100644
--- a/solenv/inc/tg_obj.mk
+++ b/solenv/inc/tg_obj.mk
@@ -30,12 +30,6 @@ MKFILENAME:=TG_OBJ.MK
 .IF "$(OBJTARGET)"!=""
 $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES)
     @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="OS2"
-.IF "$(LIBTARGET)"!="NO"
-    @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIBTARGET)"!="NO"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(&)
-.ENDIF		# "$(GUI)"=="OS2"
 
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
@@ -62,12 +56,6 @@ $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES)
 .IF "$($(SECOND_BUILD)OBJTARGET)"!=""
 $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES)
     @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="OS2"
-.IF "$(LIBTARGET)"!="NO"
-    @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIBTARGET)"!="NO"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(&)
-.ENDIF			# "$(GUI)"=="OS2"
 
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
@@ -85,10 +73,3 @@ $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES)
 .ENDIF			# "$(GUI)"=="UNX"
 .ENDIF			# "$($(SECOND_BUILD)OBJTARGET)"!=""
 .ENDIF			# "$(SECOND_BUILD)"!=""
-
-.IF "$(GUI)"=="OS2"
-.IF "$(LIBTARGET)"!="NO"
-    @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIBTARGET)"!="NO"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(&)
-.ENDIF			# "$(GUI)"=="OS2"
diff --git a/solenv/inc/tg_res.mk b/solenv/inc/tg_res.mk
index cad40533e7b8..2a99f61216a1 100644
--- a/solenv/inc/tg_res.mk
+++ b/solenv/inc/tg_res.mk
@@ -30,14 +30,13 @@
 $(RCTARGET): $(RCFILES) 		\
              $(RCDEPN)
     @echo "Making:   " $(@:f)
-.IF "$(CCNUMVER)" > "001300000000"
+.IF "$(COM)"=="MSC"
 .IF "$(MFC_INCLUDE)"!=""
-    $(COMMAND_ECHO)$(RC) $(INCLUDE) -I$(SOLARRESDIR) $(foreach,i,$(ATL_INCLUDE) -I$(i)) -I$(MFC_INCLUDE) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGS)
+    $(COMMAND_ECHO)$(RC) $(INCLUDE) -I$(SOLARRESDIR) $(foreach,i,$(ATL_INCLUDE) -I$(i)) -I$(MFC_INCLUDE) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGSOUTRES)$@ $(RCFLAGS)
 .ELSE
-    $(COMMAND_ECHO)$(RC) $(INCLUDE) -I$(SOLARRESDIR) $(foreach,i,$(ATL_INCLUDE) -I$(i)) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGS)
+    $(COMMAND_ECHO)$(RC) $(INCLUDE) -I$(SOLARRESDIR) $(foreach,i,$(ATL_INCLUDE) -I$(i)) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGSOUTRES)$@ $(RCFLAGS)
 .ENDIF
 .ELSE
-    $(COMMAND_ECHO)$(RC) $(INCLUDE) -I$(SOLARRESDIR) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGS)
+    $(COMMAND_ECHO)$(RC) $(INCLUDE) -I$(SOLARRESDIR) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGS) $@
 .ENDIF
 .ENDIF
-
diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk
index 1f0aff311903..0b1659a28796 100644
--- a/solenv/inc/tg_rslb.mk
+++ b/solenv/inc/tg_rslb.mk
@@ -41,12 +41,11 @@ $(RSC_MULTI$(TNR)) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB$(TNR)NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
@@ -57,12 +56,11 @@ $(RSC_MULTI$(TNR)) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB$(TNR)NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-    -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+    -subMODULE=$(SOLARDEFIMG) \
+    -subGLOBALRES=$(SOLARDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 1bcebb8c72e3..e8c2b7596a16 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -31,10 +31,6 @@
 
 .IF "$(SHL$(TNR)TARGETN)"!=""
 
-.IF "$(OS)"=="AIX"
-SHL$(TNR)STDLIBS=
-.ENDIF
-
 .IF "$(SHLLINKARCONLY)" != ""
 SHL$(TNR)STDLIBS=
 STDSHL=
@@ -91,20 +87,23 @@ $(MISC)/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL$(
 .ENDIF
 
 .IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)" == "WNT"
 .IF "$(SHL$(TNR)IMPLIB)" == ""
 SHL$(TNR)IMPLIB=i$(TARGET)_t$(TNR)
 .ENDIF			# "$(SHL$(TNR)IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
 USE_$(TNR)IMPLIB=-implib:$(LB)/$(SHL$(TNR)IMPLIB).lib
-.ENDIF			# "$(COM)" != "GCC"
 SHL$(TNR)IMPLIBN=$(LB)/$(SHL$(TNR)IMPLIB).lib
+.ELSE
+SHL$(TNR)IMPLIBN=$(LB)/lib$(SHL$(TNR)IMPLIB).dll.a
+USE_$(TNR)IMPLIB=-Wl,--out-implib=$(SHL$(TNR)IMPLIBN)
+.ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL$(TNR)IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
 USE_$(TNR)IMPLIB_DEPS=$(LB)/$(SHL$(TNR)IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.ENDIF			# "$(GUI)" == "WNT"
 USE_SHL$(TNR)DEF=$(SHL$(TNR)DEF)
 .ELSE			# "$(GUI)" != "UNX"
 USE_SHL$(TNR)DEF=
@@ -129,7 +128,9 @@ $(USE_SHL$(TNR)VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL$(TNR)VERSIONMAP)"!=""
 
+.IF "$(OS)" != "AIX"
 SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
+.ENDIF
 
 $(USE_SHL$(TNR)VERSIONMAP): \
                     $(SHL$(TNR)OBJS)\
@@ -166,7 +167,9 @@ $(USE_SHL$(TNR)VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL$(TNR)VERSIONMAP)"!=""
 USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET)$(SHL$(TNR)VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
 SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
+.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)OBJS) $(SHL$(TNR)LIBS)
@@ -214,7 +217,7 @@ $(USE_SHL$(TNR)VERSIONMAP) .ERRREMOVE: $(SHL$(TNR)VERSIONMAP)
 .ENDIF			# "$(GUI)" != "UNX"
 
 .IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
 .IF "$(GUI)"=="UNX"
 SHL$(TNR)SONAME=\"$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f)\"
 .ENDIF			# "$(GUI)"!="UNX"
@@ -237,7 +240,7 @@ SHL$(TNR)LINKRESO*=$(MISC)/$(SHL$(TNR)TARGET)_res.o
 #.IF "$(SHL$(TNR)TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL$(TNR)LIBS)"!=""
 $(MISC)/$(SHL$(TNR)TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -250,7 +253,7 @@ $(SHL$(TNR)TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
 .IF "$(SHL$(TNR)USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL$(TNR)LIBS)"!=""
 SHL$(TNR)LINKLIST=$(MISC)/$(SHL$(TNR)TARGET)_link.lst
@@ -267,20 +270,6 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
-.IF "$(GUI)" == "OS2"
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL$(TNR)TARGET8=$(shell @fix_shl $(SHL$(TNR)TARGET))
-.ENDIF
-
-.IF "$(GUI)" == "OS2"
-_SHL$(TNR)IMP_ORD = $(SHL$(TNR)STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL$(TNR)STDLIBS:^"$(LB)/") 
-SHL$(TNR)IMP_ORD = $(foreach,i,$(_SHL$(TNR)IMP_ORD) $(shell @-ls $i))
-.ELSE
-SHL$(TNR)IMP_ORD = 
-.ENDIF
-
-
 $(SHL$(TNR)TARGETN) : \
                     $(SHL$(TNR)OBJS)\
                     $(SHL$(TNR)LIBS)\
@@ -289,7 +278,6 @@ $(SHL$(TNR)TARGETN) : \
                     $(USE_SHL$(TNR)VERSIONMAP)\
                     $(SHL$(TNR)RES)\
                     $(SHL$(TNR)DEPN) \
-                    $(SHL$(TNR)IMP_ORD) \
                     $(SHL$(TNR)LINKLIST)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
@@ -311,39 +299,69 @@ $(SHL$(TNR)TARGETN) : \
     @echo $(EMQ)#define INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
     @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
+.IF "$(RCFLAGSOUTRES)"!=""
+# rc, takes separate flag naming output file, source .rc file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL$(TNR)DEFAULTRES) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
+.ELSE
+# windres, just takes output file last
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc $(SHL$(TNR)DEFAULTRES)
+.ENDIF
 .ENDIF			# "$(SHL$(TNR)DEFAULTRES)"!=""
 .IF "$(SHL$(TNR)ALLRES)"!=""
     $(COMMAND_ECHO)$(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES)
 .IF "$(COM)"=="GCC"
-    windres $(SHL$(TNR)LINKRES) $(SHL$(TNR)LINKRESO)
+    $(WINDRES) $(SHL$(TNR)LINKRES) $(SHL$(TNR)LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL$(TNR)ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --dllname $(SHL$(TNR)TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+# GNU ld since 2.17 supports @cmdfile syntax
+.IF "$(USE_DEFFILE)"!=""
+    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL$(TNR)LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(SHL$(TNR)DEF) \
+        $(USE_$(TNR)IMPLIB) \
+        $(STDOBJ) \
+        $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL$(TNR)LIBS))) \
+        -Wl,--exclude-libs,ALL,--start-group $(SHL$(TNR)STDLIBS) -Wl,--end-group \
+        $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \
+        $(SHL$(TNR)LINKRESO) \
+    ))
+.ELSE
     @noop $(assign ALL$(TNR)OBJLIST:=$(STDOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) $(shell $(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB$(TNR)NAME)"!=""	# do not have to include objs
     @noop $(assign DEF$(TNR)OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF$(TNR)OBJLIST) $(assign ALL$(TNR)OBJLIST:=$(ALL$(TNR)OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB$(TNR)NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-.IF "$(SHL$(TNR)DEF)"!=""
-    @echo	--input-def $(SHL$(TNR)DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-.ELSE
-    @echo	$(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-.ENDIF
-    @echo	$(ALL$(TNR)OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
-        $(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \
-        `$(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
+        --dllname $(SHL$(TNR)TARGET)$(DLLPOST) \
+        --kill-at \
+        --output-exp $(MISC)/$(@:b)_exp.o \
+        $(SHL$(TNR)VERSIONOBJ) \
+        @(ALL$(TNR)OBJLIST)
+    )
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+        $(SHL$(TNR)LINKFLAGS) \
+        $(LINKFLAGSSHL) \
+	$(SOLARLIB) \
+        $(MINGWSSTDOBJ) \
+        -o $@ \
+        -Wl,-Map,$(MISC)/$(@:b).map \
+        $(MISC)/$(@:b)_exp.o \
+        $(USE_$(TNR)IMPLIB) \
+        $(STDOBJ) \
+        $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)OBJS) \
+        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL$(TNR)LIBS))) \
         -Wl,--exclude-libs,ALL,--start-group $(SHL$(TNR)STDLIBS) -Wl,--end-group \
-        $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+        $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \
+        $(SHL$(TNR)LINKRESO) \
+    ))
+.ENDIF
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL$(TNR)USE_EXPORTS)"!="name"
@@ -458,7 +476,7 @@ $(SHL$(TNR)TARGETN) : \
     @echo $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \
     $(SHL$(TNR)VERSIONOBJ) \
     `cat /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
     $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd` \
@@ -478,6 +496,9 @@ $(SHL$(TNR)TARGETN) : \
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN)
 .ENDIF				# "$(SHL$(TNR)NOCHECK)"!=""
 .ENDIF
+.ELIF "$(OS)"=="IOS"
+    $(COMMAND_ECHO)$(AR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL$(TNR)OBJS)) $(shell cat /dev/null $(LIB$(TNR)TARGET) $(SHL$(TNR)LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
+    $(COMMAND_ECHO)$(RANLIB) $@
 .ELSE			# "$(OS)"=="MACOSX"
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
     @echo $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)SONAME) $(LINKFLAGSSHL) $(SHL$(TNR)VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \
@@ -500,7 +521,7 @@ $(SHL$(TNR)TARGETN) : \
 .ENDIF				# "$(SHL$(TNR)NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!=""
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
     $(COMMAND_ECHO)$(RM) $(LB)/$(SHL$(TNR)TARGETN:b)
     $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL$(TNR)TARGETN:f) $(SHL$(TNR)TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -509,65 +530,6 @@ $(SHL$(TNR)TARGETN) : \
 .ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
-.IF "$(GUI)" == "OS2"
-
-.IF "$(SHL$(TNR)DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc >& $(NULLDEV)
-.IF "$(SHL$(TNR)ICON)" != ""
-    @-+echo 1 ICON $(SHL$(TNR)ICON) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL$(TNR)ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL$(TNR)ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-.ENDIF			# "$(SHL$(TNR)ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-# YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-.ENDIF			# "$(SHL$(TNR)DEFAULTRES)"!=""
-
-.IF "$(SHL$(TNR)ALLRES)"!=""
-    $(COMMAND_ECHO)+$(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES)
-.ENDIF			# "$(SHL$(TNR)ALLRES)"!=""
-
-.IF "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
-        $(SHL$(TNR)DEF) \
-        $(STDOBJ) \
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \
-        $(SHL$(TNR)LIBS) \
-        $(SHL$(TNR)STDLIBS:^"-l") \
-        $(SHL$(TNR)LINKRES) \
-        $(SHL$(TNR)STDSHL:^"-l") $(STDSHL$(TNR):^"-l") 
-
-.ELSE			# "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL$(TNR)LINKER) -v 	$(SHL$(TNR)LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL$(TNR)BASEX)		\
-        $(SHL$(TNR)STACK) -o $(SHL$(TNR)TARGETN)	\
-        $(SHL$(TNR)DEF) \
-        $(STDOBJ)							\
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \
-        $(SHL$(TNR)LIBS) \
-        $(SHL$(TNR)STDLIBS:^"-l") \
-        $(SHL$(TNR)LINKRES) \
-        $(SHL$(TNR)STDSHL:^"-l") $(STDSHL$(TNR):^"-l")                           \
-    @$(LS) $@ >& $(NULLDEV)
-
-.ENDIF			# "$(USE_DEFFILE)"!=""
-
-.IF "$(SHL$(TNR)TARGET8)" != "$(SHL$(TNR)TARGET)"
-    $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL$(TNR)TARGET8).dll
-.ENDIF
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(SHL$(TNR)TARGETN)"!=""
 
 # unroll end
@@ -590,6 +552,7 @@ USELIB$(TNR)DEPN+=$(SHL$(TNR)LIBS)
 USE_SHL$(TNR)TARGET=$(SHL$(TNR)TARGETN)
 .ENDIF
 
+.IF "$(GUI)$(COM)" != "WNTGCC"
 .IF "$(GUI)" != "UNX"
 $(SHL$(TNR)IMPLIBN):	\
                     $(SHL$(TNR)DEF) \
@@ -602,11 +565,6 @@ $(SHL$(TNR)IMPLIBN):	\
 .ENDIF
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
-.IF "$(COM)"=="GCC"
-    @echo no ImportLibs on mingw
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ELSE			# "$(COM)=="GCC"
 # bei use_deffile implib von linker erstellt
 .IF "$(USE_DEFFILE)"==""
     $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL$(TNR)IMPLIBN) \
@@ -615,14 +573,6 @@ $(SHL$(TNR)IMPLIBN):	\
     @echo build of $(SHL$(TNR)TARGETN) creates $@
     @$(TOUCH) $@
 .ENDIF			# "$(USE_DEFFILE)==""
-.ENDIF			# "$(COM)"=="GCC"
-
-.ELIF "$(GUI)" == "OS2"
-
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-    $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL$(TNR)VERSIONOBJ)
-    +@echo build of $(SHL$(TNR)TARGETN) creates $@
 
 .ELSE
     @echo no ImportLibs on Mac and *ix
@@ -630,6 +580,7 @@ $(SHL$(TNR)IMPLIBN):	\
     @$(TOUCH) $@
 .ENDIF
 .ENDIF
+.ENDIF
 
 # unroll end
 #######################################################
diff --git a/solenv/inc/tg_slo.mk b/solenv/inc/tg_slo.mk
index 0a0ae789a8c7..4195ffda1c1d 100644
--- a/solenv/inc/tg_slo.mk
+++ b/solenv/inc/tg_slo.mk
@@ -47,13 +47,6 @@ $(SLOTARGET): $(SLOFILES) $(IDLSLOFILES)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-.IF "$(LIBTARGET)"!="NO"
-    @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIBTARGET)"!="NO"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(&)
-.ENDIF			# "$(GUI)"=="OS2"
-
 .IF "$(GUI)"=="UNX"
     @echo $(foreach,i,$(SLOFILES:f) $(RSLO)/$(i:s/.obj/.o/)) | xargs -n1 > $@
 .IF "$(OS)"=="MACOSX"
@@ -81,13 +74,6 @@ $($(SECOND_BUILD)SLOTARGET): $(REAL_$(SECOND_BUILD)_SLOFILES)
 .ENDIF          # "$(LIBTARGET)"!="NO"
     $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
 
-.IF "$(GUI)"=="OS2"
-.IF "$(LIBTARGET)"!="NO"
-    @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIBTARGET)"!="NO"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(&)
-.ENDIF			# "$(GUI)"=="OS2"
-
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(GUI)"=="WNT"
 
diff --git a/solenv/inc/tg_wntx64.mk b/solenv/inc/tg_wntx64.mk
index 85f60c0f95a0..05a3155fb97a 100644
--- a/solenv/inc/tg_wntx64.mk
+++ b/solenv/inc/tg_wntx64.mk
@@ -24,14 +24,12 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-###############################################
-#        Windows 64 bit special
-#	only used for 64 bit shell extension
-#          ( Windows Vista )
-# ---------------------------------------------
-# THIS FILE WILL BE DELETED when a fully ported
-# Windows 64 bit version is available
-###############################################
+##############################################################################################
+#       Used when building 64-bit Windows code for the 64-bit Explorer shell extension
+#	in an otherwise 32-bit LibreOffice build. Don't confuse with
+#	building a completely 64-bit LibreOffice on Windows, which is unfinished
+#	and highly experimental work.
+##############################################################################################
 
 .IF "$(BUILD_X64)"!=""
 
@@ -43,7 +41,7 @@ $(SLOTARGET_X64): $(SLOFILES_X64) $(IDLSLOFILES_X64)
 .ENDIF
     @echo ------------------------------
     @echo Making: $@
-    @-$(MKDIR) $(SLB_X64)
+    @-$(MKDIRHIER) $(SLB_X64)
 .IF "$(LIBTARGET)"!="NO"
     @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
 .ENDIF          # "$(LIBTARGET)"!="NO"
@@ -73,10 +71,7 @@ SHL1IMPLIBN_X64=$(LB_X64)/$(SHL1IMPLIB_X64).lib
 .ENDIF # "$(SLOFILES_X64)$(OBJFILES_X64)"!=""
 
 make_x64_dirs :
-    -$(MKDIR) $(BIN_X64)
-    -$(MKDIR) $(MISC_X64)
-    -$(MKDIR) $(LB_X64)
-    -$(MKDIR) $(SLB_X64)
+    $(MKDIRHIER) $(BIN_X64) $(MISC_X64) $(LB_X64) $(SLB_X64)
 
 
 .IF "$(LIBTARGET)" == ""
@@ -92,7 +87,7 @@ $(LIB1TARGET_X64) :	$(LIB1FILES_X64) \
     @echo using: $(LIB1TARGET_X64)
     @echo ------------------------------
     @echo Making: $@
-    -$(MKDIR) $(SLB_X64)
+    $(MKDIRHIER) $(SLB_X64)
     @@-$(RM) $@
     $(LIBMGR_X64) $(LIBFLAGS_X64) /OUT:$@ @$(mktmp $(LIB1FILES_X64) $(LIB1OBJFILES_X64))
     @-$(RM) $(@:s/.lib/.lin/)
@@ -113,7 +108,7 @@ $(LIB2TARGET_X64) :	$(LIB2FILES_X64) \
     @echo using: $(LIB2TARGET_X64)
     @echo ------------------------------
     @echo Making: $@
-    -$(MKDIR) $(SLB_X64)
+    $(MKDIRHIER) $(SLB_X64)
     @@-$(RM) $@
     $(LIBMGR_X64) $(LIBFLAGS_X64) /OUT:$@ @$(mktmp $(LIB2FILES_X64) $(LIB2OBJFILES_X64))
     @-$(RM) $(@:s/.lib/.lin/)
@@ -131,7 +126,7 @@ $(LIB2TARGET_X64) :	$(LIB2FILES_X64) \
 $(DEF1TARGETN_X64) : \
         $(DEF1DEPN_X64) \
         $(DEF1EXPORTFILE_X64)
-        @-$(MKDIR) $(MISC_X64)
+        @-$(MKDIRHIER) $(MISC_X64)
     @-$(RM) $@.tmpfile
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
@@ -169,7 +164,7 @@ $(DEF1TARGETN_X64) : \
 $(DEF2TARGETN_X64) : \
         $(DEF2DEPN_X64) \
         $(DEF2EXPORTFILE_X64)
-    @-$(MKDIR) $(MISC_X64)
+    @-$(MKDIRHIER) $(MISC_X64)
     @-$(RM) $@.tmpfile
     @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(EMQ)"$(SHL2TARGETN:f)$(EMQ)" 								 >$@.tmpfile
@@ -325,7 +320,7 @@ $(SHL1IMPLIBN_X64):	\
                     $(USELIBDEPN_X64)
     @echo Making: $(SHL1IMPLIBN_X64)
 # bei use_deffile implib von linker erstellt
-    @-mkdir $(LB_X64)
+    @-$(MKDIRHIER) $(LB_X64)
 .IF "$(USE_DEFFILE_X64)"==""
     $(IMPLIB_X64) $(IMPLIBFLAGS_X64) @$(mktmp -out:$(SHL1IMPLIBN_X64) \
     -def:$(SHL1DEF_X64) )
@@ -469,7 +464,7 @@ $(SHL2IMPLIBN_X64):	\
                     $(USELIBDEPN_X64)
     @echo Making: $(SHL2IMPLIBN_X64)
 # bei use_deffile implib von linker erstellt
-    @-mkdir $(LB_X64)
+    @-$(MKDIRHIER) $(LB_X64)
 .IF "$(USE_DEFFILE_X64)"==""
     $(IMPLIB_X64) $(IMPLIBFLAGS_X64) @$(mktmp -out:$(SHL2IMPLIBN_X64) \
     -def:$(SHL2DEF_X64) )
@@ -484,21 +479,21 @@ $(SLO_X64)/%.obj : %.cpp
     @echo ------------------------------
     @echo Making: $@
     @@-$(RM) $@ >& $(NULLDEV)
-    -$(MKDIR) $(@:d)
-    @-$(MKDIR) $(MISC_X64)
+    -$(MKDIRHIER) $(@:d)
+    @-$(MKDIRHIER) $(MISC_X64)
     $(CAPTURE_COMMAND) $(CXX_X64) $(USE_CFLAGS_X64) $(INCLUDE_X64) $(CFLAGSCXX_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp $(CAPTURE_OUTPUT)
 
 $(SLO_X64)/%.obj : %.cxx
     @echo Making: $@
     @@-$(RM) $@ >& $(NULLDEV)
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    $(COMMAND_ECHO)@-$(MKDIR) $(MISC_X64)
+    $(COMMAND_ECHO)$(MKDIRHIER) $(@:d)
+    $(COMMAND_ECHO)-$(MKDIRHIER) $(MISC_X64)
     $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX_X64) $(USE_CFLAGS_X64) $(INCLUDE_X64) $(CFLAGSCXX_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
 
 $(SLO_X64)/%.obj : $(MISC)/%.c
     @echo Making: $@
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    $(COMMAND_ECHO)@-$(MKDIR) $(MISC_X64)
+    $(COMMAND_ECHO)$(MKDIRHIER) $(@:d)
+    $(COMMAND_ECHO)$(MKDIRHIER) $(MISC_X64)
     @@-$(RM) $@
     @$(TYPE) $(mktmp $(CC_X64) $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC)/$*.c )
     @$(ECHONL)
@@ -506,8 +501,8 @@ $(SLO_X64)/%.obj : $(MISC)/%.c
 
 $(SLO_X64)/%.obj : %.c
     @echo Making: $@
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    $(COMMAND_ECHO)@-$(MKDIR) $(MISC_X64)
+    $(COMMAND_ECHO)$(MKDIRHIER) $(@:d)
+    $(COMMAND_ECHO)$(MKDIRHIER) $(MISC_X64)
     @@-$(RM) $@
     $(COMMAND_ECHO)$(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $*.c )
 
diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk
index 0a0364e02ab3..4468a2139397 100644
--- a/solenv/inc/tg_zip.mk
+++ b/solenv/inc/tg_zip.mk
@@ -32,8 +32,6 @@
 command_seperator=&&
 #command_seperator=^
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELIF "$(GUI)"=="OS2"
-command_seperator=&&
 .ELSE
 command_seperator=;
 avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
@@ -42,6 +40,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 
 .IF "$(ZIP$(TNR)TARGET)"!=""
 
+.IF "$(ZIP$(TNR)STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
 ZIP$(TNR)EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP$(TNR)LIST:s/LANGDIR//)" == "$(ZIP$(TNR)LIST)"
@@ -145,6 +148,11 @@ $(ZIP$(TNR)TARGETN) : delzip $(ZIP$(TNR)DEPS)
     $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
         $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
         $(FI)
+.IF "$(ZIP$(TNR)STRIPLANGUAGETAGS)" != ""
+    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+        $(SOLARENV)/bin/striplanguagetags.sh $@ \
+        $(FI)
+.ENDIF
 .ENDIF			# "$(ZIP$(TNR)DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index cea303c2ae0f..893340e9125f 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -107,9 +107,10 @@ PERL*=perl
 TYPE=cat
 CDD=cd
 COPY=cp -f
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS_FOR_BUILD)"=="MACOSX" || "$(OS_FOR_BUILD)"=="NETBSD" || "$(OS_FOR_BUILD)"=="OPENBSD" || \
+    "$(OS_FOR_BUILD)"=="DRAGONFLY"
 COPYRECURSE=-R
-.ELSE #"$(OS)"=="MACOSX"
+.ELSE # Not BSD based ones:
 COPYRECURSE=-r
 .ENDIF
 .IF "$(OS)"=="SOLARIS"
@@ -118,6 +119,12 @@ GNUCOPY*=gnucp
 GNUPATCH*=gnupatch
 GNUTAR*=/usr/sfw/bin/gtar
 DEREFERENCE=
+.ELIF "$(OS)"=="AIX"
+AWK*=/opt/freeware/bin/awk
+GNUCOPY*=cp
+GNUPATCH*=/opt/freeware/bin/patch
+GNUTAR*=gtar
+DEREFERENCE=-L
 .ELSE			# "$(OS)"=="SOLARIS"
 AWK*=awk
 # this is not true, as BSD does not default to a GNU cp, but BSD cp
@@ -142,33 +149,6 @@ FIND=find
 LS=ls
 ECHON=echo -n
 ECHONL=echo
-.ELIF "$(GUI)"=="OS2"
-SED*=sed
-SORT*=sort
-PERL*=perl
-TYPE=cat
-CDD=@cd
-COPY*=$(SHELL) /c copy /b
-COPYRECURSE=/s
-COPYUPDATE=/u
-DELAY=sleep
-ECHON*=echos
-ECHONL=+echo.
-AWK*=awk
-GNUCOPY*=cp
-GNUPATCH*=gnupatch
-GNUMAKE*=make
-TOUCH=touch /c
-#YD rename doesn't work across different drives!
-RENAME=mv
-MKDIR=+md
-MKDIRHIER=+md /s
-GREP=grep
-FIND=find
-LS=ls
-DUMPBIN=echo
-4nt_force_shell:=+
-
 .ENDIF			# "$(GUI)"=="UNX"
 
 # (Global) Set if not set before
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index e558c9955d82..74ed8d5eb721 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -35,22 +35,6 @@
 
 # --- Compiler ---
 
-.IF "$(COM)$(OS)$(CPU)" == "C50SOLARISS"
-.INCLUDE : unxsols2.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "C50SOLARISI"
-.INCLUDE : unxsoli2.mk
-.ENDIF
-
-.IF "$(OS)$(CPU)$(COMEX)" == "SOLARISS3"
-.INCLUDE : unxsols3.mk
-.ENDIF
-
-.IF "$(OS)$(CPU)$(COMEX)" == "SOLARISI3"
-.INCLUDE : unxsoli3.mk
-.ENDIF
-
 .IF "$(OS)$(CPU)$(COMEX)" == "SOLARISS4"
 .INCLUDE : unxsols4.mk
 .ENDIF
@@ -63,10 +47,6 @@
 .INCLUDE : unxsolu4.mk
 .ENDIF
 
-.IF "$(OS)$(CPU)$(COMEX)" == "SOLARISX4"
-.INCLUDE : unxsolx4.mk
-.ENDIF
-
 .IF "$(COM)$(OS)$(CPU)" == "GCCSOLARISS"
 .INCLUDE : unxsogs.mk
 .ENDIF
@@ -75,10 +55,6 @@
 .INCLUDE : unxsogi.mk
 .ENDIF
 
-.IF "$(COM)$(OS)$(CPU)" == "GCCSCOI"
-.INCLUDE : unxscoi.mk
-.ENDIF
-
 .IF "$(COM)$(OS)$(CPU)" == "GCCLINUXS"
 .INCLUDE : unxlngs.mk
 .ENDIF
@@ -99,6 +75,10 @@
 .INCLUDE : unxlngppc64.mk
 .ENDIF
 
+.IF "$(COM)$(OS)$(CPU)" == "GCCAIXP"
+.INCLUDE : unxaigppc.mk
+.ENDIF
+
 .IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUX3S390"
 .INCLUDE : unxlngs390.mk
 .ENDIF
@@ -111,40 +91,28 @@
 .INCLUDE : unxlngr.mk
 .ENDIF
 
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXA"
-.INCLUDE : unxlnga.mk
+.IF "$(COM)$(OS)$(CPU)" == "GCCANDROIDR"
+.INCLUDE : unxandr.mk
 .ENDIF
 
-.IF "$(COM)$(OS)$(CPU)" == "ACCHPUXR"
-.INCLUDE : unxhpxr.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCHPUXR"
-.INCLUDE : unxhpgr.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCNETBSDA"
-.INCLUDE : unxbsda.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "ICCAIXP"
-.INCLUDE : unxaixp.mk
+.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXA"
+.INCLUDE : unxlnga.mk
 .ENDIF
 
-.IF "$(COM)$(CVER)$(OS)$(CPU)" == "GCCC295NETBSDI"
-.INCLUDE : unxbsdi.mk
+.IF "$(COM)$(OS)" == "GCCNETBSD"
+.INCLUDE : unxnbsd.mk
 .ENDIF
 
-.IF "$(COM)$(CVER)$(OS)$(CPU)" == "GCCC300NETBSDI"
-.INCLUDE : unxbsdi2.mk
+.IF "$(COM)$(OS)" == "GCCFREEBSD"
+.INCLUDE : unxfbsd.mk
 .ENDIF
 
-.IF "$(COM)$(OS)$(CPU)" == "GCCNETBSDS"
-.INCLUDE : unxbsds.mk
+.IF "$(COM)$(OS)" == "GCCOPENBSD"
+.INCLUDE : unxobsd.mk
 .ENDIF
 
-.IF "$(COM)$(OS)" == "GCCFREEBSD"
-.INCLUDE : unxfbsd.mk
+.IF "$(COM)$(OS)" == "GCCDRAGONFLY"
+.INCLUDE : unxdfly.mk
 .ENDIF
 
 .IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
@@ -155,6 +123,10 @@
 .INCLUDE : unxmacxi.mk
 .ENDIF
 
+.IF "$(COM)$(OS)$(CPU)" == "GCCIOSR"
+.INCLUDE : unxiosr.mk
+.ENDIF
+
 .IF "$(COM)$(OS)$(CPU)" == "GCCLINUXM"
 .INCLUDE : unxlngmips.mk
 .ENDIF
@@ -186,11 +158,13 @@ YACCFLAGS*=-d -t
 EXECPOST=
 SCPPOST=.ins
 DLLDEST=$(LB)
-SOLARSHAREDBIN=$(SOLARLIBDIR)
+SOLARSHAREDBIN=$(SOLARLIBDIR_FOR_BUILD)
 SONAME_SWITCH*=-h
 
 .IF "$(UNIXVERSIONNAMES)"!=""
+.IF "$(OS)"!="IOS"
 DLLPOST!:=$(DLLPOST).$($(UNIXVERSIONNAMES)_MAJOR)
+.ENDIF
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
 
 # enable building/linking KDE-dependent code in both OOo and SO build environment
diff --git a/solenv/inc/unxaigppc.mk b/solenv/inc/unxaigppc.mk
new file mode 100644
index 000000000000..240aa9c03b09
--- /dev/null
+++ b/solenv/inc/unxaigppc.mk
@@ -0,0 +1,68 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# mk file for Unix AIX PowerPC using GCC, please make generic modifications to unxlng.mk
+
+LIBSALCPPRT*=-Wl,-bnogc -lsalcpprt -Wl,-bgc
+
+.INCLUDE : unxlngppc.mk
+
+CDEFS+=-D_THREAD_SAFE
+
+.INCLUDE : productversion.mk
+
+COLON=":"
+URELIBDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/basis-link/ure-link/lib))
+UREBINDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/basis-link/ure-link/bin))
+BASISPROGRAMDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/basis-link/program))
+BRANDPROGRAMDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/program))
+
+LINKFLAGSRUNPATH_URELIB:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
+LINKFLAGSRUNPATH_UREBIN:=-Wl,-blibpath:$(URELIBDIRS):$(UREBINDIRS):/usr/lib:/lib
+LINKFLAGSRUNPATH_OOO:=-Wl,-blibpath:$(BASISPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
+LINKFLAGSRUNPATH_SDK:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
+LINKFLAGSRUNPATH_BRAND:=-Wl,-blibpath:$(BRANDPROGRAMDIRS):$(BASISPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
+LINKFLAGSRUNPATH_BOXT:=-Wl,-blibpath:$(BASISPROGRAMDIRS):/usr/lib:/lib
+LINKFLAGS:=-Wl,-brtl -Wl,-bnolibpath
+
+LINKFLAGSAPPGUI:=
+LINKFLAGSAPPCUI:=
+
+LINKVERSIONMAPFLAG:=
+
+SONAME_SWITCH:=
+
+STDLIBGUIMT:=-ldl -lpthread -lm
+STDLIBCUIMT:=-ldl -lpthread -lm
+STDSHLGUIMT:=-ldl -lpthread -lm
+STDSHLCUIMT:=-ldl -lpthread -lm
+X11LINK_DYNAMIC:=-lXext -lX11
+
+
+CFLAGSDEBUG:=
+
+OOO_LIBRARY_PATH_VAR=LIBPATH
diff --git a/solenv/inc/unxaixp.mk b/solenv/inc/unxaixp.mk
index 571cee1053c6..be35f438378d 100644
--- a/solenv/inc/unxaixp.mk
+++ b/solenv/inc/unxaixp.mk
@@ -101,10 +101,6 @@ RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=
 
-DLLPOSTFIX=		ap
-.IF "$(WORK_STAMP)"=="MIX364"
-DLLPOSTFIX=
-.ENDIF
 DLLPRE=			lib
 DLLPOST=		.so
 
diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk
new file mode 100644
index 000000000000..070db53af6c9
--- /dev/null
+++ b/solenv/inc/unxandr.mk
@@ -0,0 +1,33 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# mk file for Android Linux ARM using GCC, please make generic modifications to unxgcc.mk
+
+CDEFAULTOPT=-Os
+.INCLUDE : unxgcc.mk
+CDEFS+=-DARM32
+CFLAGS+=-fno-omit-frame-pointer
diff --git a/solenv/inc/unxbsda.mk b/solenv/inc/unxbsda.mk
deleted file mode 100644
index fefaa1f02bd7..000000000000
--- a/solenv/inc/unxbsda.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mak file fuer unxbsda
-
-ASM=
-AFLAGS=
-
-ARCH_FLAGS*=
-
-CC=				gcc -c
-CXX=			g++ -c
-CDEFS+=			-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
-CDEFS+=			-D_REENTRANT 		# -D_PTHREADS -DPOSIX_PTHREAD_SEMANTICS
-CDEFS+= 		-DPRINTER_DUMMY
-CFLAGSCC=		-fsigned-char $(ARCH_FLAGS)
-CFLAGSCXX=		-fsigned-char $(ARCH_FLAGS)
-PICSWITCH:=-fPIC
-CFLAGSOBJGUIMT=
-CFLAGSOBJCUIMT=
-CFLAGSSLOGUIMT=$(PICSWITCH)
-CFLAGSSLOCUIMT=$(PICSWITCH)
-CFLAGSPROF=
-CFLAGSDEBUG=	-g
-CFLAGSDBGUTIL=
-CFLAGSOPT=		-O2
-CFLAGSNOOPT=
-CFLAGSOUTOBJ=	-o
-
-STATIC=			-Bstatic
-DYNAMIC=		-Bdynamic
-
-THREADLIB=		pthread
-LINK=			ld -e start -dc -dp
-LINKFLAGS=
-LINKFLAGSAPPGUI=
-LINKFLAGSSHLGUI=
-LINKFLAGSAPPCUI=
-LINKFLAGSSHLCUI=
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=
-LINKFLAGSOPT=
-
-STDOBJGUI=		/usr/lib/crt0.o
-STDSLOGUI=		/usr/lib/crt0.o
-STDOBJCUI=		/usr/lib/crt0.o
-STDSLOCUI=		/usr/lib/crt0.o
-STDLIBGUIMT=	-Bdynamic -lc -Bstatic -lg++ -lstdc++ -Bdynamic -lm -lgcc -lc -lgcc
-STDLIBCUIMT=	-Bdynamic -lc -Bstatic -lg++ -lstdc++ -Bdynamic -lm -lgcc -lc -lgcc
-STDSHLGUIMT=	-Bdynamic -lc -Bstatic -lg++ -lstdc++ -Bdynamic -lm -lgcc -lc -lgcc
-STDSHLCUIMT=	-Bdynamic -lc -Bstatic -lg++ -lstdc++ -Bdynamic -lm -lgcc -lc -lgcc
-
-LIBMGR=			ar
-LIBFLAGS=		-r
-LIBEXT=			.a
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=		-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX=		ba
-DLLPRE=			lib
-DLLPOST=		.so
-
-LDUMP=
-
diff --git a/solenv/inc/unxbsdi.mk b/solenv/inc/unxbsdi.mk
deleted file mode 100644
index 5e9c06605940..000000000000
--- a/solenv/inc/unxbsdi.mk
+++ /dev/null
@@ -1,179 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for unxbsdi
-ASM=
-AFLAGS=
-
-SOLAR_JAVA=TRUE
-JAVAFLAGSDEBUG=-g
-
-# filter for supressing verbose messages from linker
-#not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
-
-# _PTHREADS is needed for the stl
-CDEFS+=-DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
-
-# this is a platform with JAVA support
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF 
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=-mpentiumpro
-
-# name of C++ Compiler
-CXX*=g++
-# name of C Compiler
-CC*=gcc
-# flags for C and C++ Compiler
-CFLAGS+=-c
-# flags for the C++ Compiler
-CFLAGSCC= -pipe $(ARCH_FLAGS)
-# Flags for enabling exception handling
-CFLAGSEXCEPTIONS=-fexceptions
-# Flags for disabling exception handling
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-CFLAGSCXX= -pipe -frtti $(ARCH_FLAGS)
-PICSWITCH:=-fpic
-
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-# Compiler flags for enabling optimizations
-CFLAGSOPT=-O2
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
-CFLAGSWERRCC=-Werror
-
-# switches for dynamic and static linking
-STATIC		= -Wl,-Bstatic
-DYNAMIC		= -Wl,-Bdynamic
-
-# name of linker
-LINK*=gcc
-# default linker flags
-LINKFLAGS=
-
-# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic 
-LINKFLAGSAPPCUI= -Wl,-export-dynamic 
-
-# linker flags for linking shared libraries
-LINKFLAGSSHLGUI= -shared
-LINKFLAGSSHLCUI= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-.IF "$(NO_BSYMBOLIC)"==""
-.IF "$(PRJNAME)" != "envtest"
-LINKFLAGSSHLGUI+=-Wl,-Bsymbolic
-LINKFLAGSSHLCUI+=-Wl,-Bsymbolic
-.ENDIF
-.ENDIF				# "$(NO_BSYMBOLIC)"==""
-
-LINKVERSIONMAPFLAG=-Wl,--version-script
-
-SONAME_SWITCH=-Wl,-h
-
-# Sequence of libs does matter !
-
-STDLIBCPP=-lstdc++
-
-# default objectfilenames to link
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-# libraries for linking applications
-STDLIBGUIMT=-lX11 -lpthread -lm
-STDLIBCUIMT=-lpthread -lm
-# libraries for linking shared libraries
-STDSHLGUIMT=-lX11 -lXext -lpthread -lm
-STDSHLCUIMT=-lpthread -lm
-
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF
-
-
-# name of library manager
-LIBMGR=ar
-LIBFLAGS=-r
-
-# tool for generating import libraries
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-# platform specific identifier for shared libs
-DLLPOSTFIX=bi
-DLLPRE=lib
-DLLPOST=.so
-
diff --git a/solenv/inc/unxbsdi2.mk b/solenv/inc/unxbsdi2.mk
deleted file mode 100644
index f4206304501b..000000000000
--- a/solenv/inc/unxbsdi2.mk
+++ /dev/null
@@ -1,198 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for unxbsdi2
-ASM=
-AFLAGS=
-
-SOLAR_JAVA=TRUE
-JAVAFLAGSDEBUG=-g
-
-# filter for supressing verbose messages from linker
-#not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
-
-# _PTHREADS is needed for the stl
-CDEFS+= -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
-
-# this is a platform with JAVA support
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF 
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-# name of C++ Compiler
-CXX*=g++
-# name of C Compiler
-CC*=gcc
-# flags for C and C++ Compiler
-CFLAGS+=-fmessage-length=0 -c
-
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
-CFLAGSENABLESYMBOLS=-g
-.ENDIF
-
-# flags for the C++ Compiler
-CFLAGSCC= -pipe $(ARCH_FLAGS)
-# Flags for enabling exception handling
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-# Flags for disabling exception handling
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-CFLAGSCXX= -pipe -frtti $(ARCH_FLAGS)
-PICSWITCH:=-fpic
-
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-# Compiler flags for enabling optimizations
-# CFLAGSOPT=-O2
-# reduce to -O1 to avoid optimization problems
-CFLAGSOPT=-O1
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
-CFLAGSWERRCC=-Werror
-
-# switches for dynamic and static linking
-STATIC		= -Wl,-Bstatic
-DYNAMIC		= -Wl,-Bdynamic
-
-# name of linker
-LINK*=$(CC)
-
-# default linker flags
-LINKFLAGSDEFS*=-z defs
-LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
-    #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
-LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_NONE=
-LINKFLAGS=-z combreloc $(LINKFLAGSDEFS)
-
-# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic 
-LINKFLAGSAPPCUI= -Wl,-export-dynamic 
-
-# linker flags for linking shared libraries
-LINKFLAGSSHLGUI= -shared
-LINKFLAGSSHLCUI= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-# linker flags for optimization (symbol hashtable)
-# for now, applied to symbol scoped libraries, only
-LINKFLAGSOPTIMIZE*=-Wl,-O1
-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-
-SONAME_SWITCH=-Wl,-h
-
-# Sequence of libs does matter !
-
-STDLIBCPP=-lstdc++
-
-# default objectfilenames to link
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-# libraries for linking applications
-STDLIBGUIMT=-lX11 -lpthread -lm
-STDLIBCUIMT=-lpthread -lm
-# libraries for linking shared libraries
-STDSHLGUIMT=-lX11 -lXext -lpthread -lm
-STDSHLCUIMT=-lpthread -lm
-
-LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport -lstdc++
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF
-
-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-
-# name of library manager
-LIBMGR=ar
-LIBFLAGS=-r
-
-# tool for generating import libraries
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-# platform specific identifier for shared libs
-DLLPOSTFIX=bi
-DLLPRE=lib
-DLLPOST=.so
-
diff --git a/solenv/inc/unxbsds.mk b/solenv/inc/unxbsds.mk
deleted file mode 100644
index 0811c85a4c6d..000000000000
--- a/solenv/inc/unxbsds.mk
+++ /dev/null
@@ -1,179 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for unxbsds
-ASM=gcc
-AFLAGS=-Wa,-Av8plusa,-K,PIC -x assembler-with-cpp -c $(CDEFS)
-
-SOLAR_JAVA=TRUE
-JAVAFLAGSDEBUG=-g
-
-# filter for supressing verbose messages from linker
-#not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
-
-# _PTHREADS is needed for the stl
-CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) -DOSL_USE_SYS_V_SEMAPHORE
-
-# this is a platform with JAVA support
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF 
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-# name of C++ Compiler
-CXX=g++ 
-# name of C Compiler
-CC=gcc 
-# flags for C and C++ Compiler
-CFLAGS=-c
-# flags for the C++ Compiler
-CFLAGSCC= -pipe $(ARCH_FLAGS)
-
-# Flags for enabling exception handling
-CFLAGSEXCEPTIONS=-fexceptions
-# Flags for disabling exception handling
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-CFLAGSCXX= -pipe $(ARCH_FLAGS)
-PICSWITCH:=-fPIC
-
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=$(PICSWITCH)
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-# Compiler flags for enabling optimizations
-CFLAGSOPT=-O2
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
-CFLAGSWERRCC=-Werror
-
-# switches for dynamic and static linking
-STATIC		= -Wl,-Bstatic
-DYNAMIC		= -Wl,-Bdynamic
-
-# name of linker
-LINK=gcc
-# default linker flags
-LINKFLAGS=
-
-# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic 
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
-# linker flags for linking shared libraries
-LINKFLAGSSHLGUI= -shared
-LINKFLAGSSHLCUI= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT= 
-
-.IF "$(NO_BSYMBOLIC)"==""
-.IF "$(PRJNAME)" != "envtest"
-LINKFLAGSSHLGUI+=-Wl,-Bsymbolic
-LINKFLAGSSHLCUI+=-Wl,-Bsymbolic
-.ENDIF
-.ENDIF				# "$(NO_BSYMBOLIC)"==""
-
-LINKVERSIONMAPFLAG=-Wl,--version-script
-
-# Sequence of libs does matter !
-
-STDLIBCPP=-lstdc++
-
-# default objectfilenames to link
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-# libraries for linking applications
-STDLIBGUIMT=-lX11 -lpthread -lm
-STDLIBCUIMT=-lpthread -lm
-# libraries for linking shared libraries
-STDSHLGUIMT=-lX11 -lXext -lpthread -lm
-STDSHLCUIMT=-lpthread -lm
-
-# STLport always needs pthread. This may yield some redundant -lpthread
-# but that doesn't matter. 
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport -lpthread
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) -lpthread
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lpthread
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -lpthread
-.ENDIF
-
-
-# name of library manager
-LIBMGR=ar
-LIBFLAGS=-r
-
-# tool for generating import libraries
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-# platform specific identifier for shared libs
-DLLPOSTFIX=bs
-DLLPRE=lib
-DLLPOST=.so
-
diff --git a/solenv/inc/unxdfly.mk b/solenv/inc/unxdfly.mk
new file mode 100644
index 000000000000..55b331630b9f
--- /dev/null
+++ b/solenv/inc/unxdfly.mk
@@ -0,0 +1,45 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#         Fran�ois Tigeot  <ftigeot@wolfpond.org>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+# Makefile for DragonFly BSD
+
+# arch specific defines
+.IF "$(CPUNAME)" == "INTEL"
+CDEFS+=-DX86
+.ENDIF
+
+.IF "$(CPUNAME)" == "X86_64"
+CDEFS+=-DX86_64
+BUILD64=1
+.ENDIF
+
+.INCLUDE : unxgcc.mk
+
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+
+# default linker flags
+LINKFLAGSDEFS:=
diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk
index 4a22beaec256..f751384c4bb8 100644
--- a/solenv/inc/unxfbsd.mk
+++ b/solenv/inc/unxfbsd.mk
@@ -46,7 +46,7 @@ JAVAFLAGSDEBUG=-g
 #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
 
 # _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1
 
 # enable visibility define in "sal/types.h"
 .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -74,13 +74,8 @@ CC+:=$(CFLAGS_SYSBASE)
 .ENDIF          # "$(SYSBASE)"!=""
 CFLAGS+=-fmessage-length=0 -c
 
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-
-.ENDIF
+# flags to enable build with symbols
+CFLAGSENABLESYMBOLS=-g
 
 # flags for the C++ Compiler
 CFLAGSCC= -pipe $(ARCH_FLAGS)
@@ -148,8 +143,8 @@ LINKFLAGSRUNPATH_NONE=
 LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
 
 # linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPGUI= -Wl,-export-dynamic
+LINKFLAGSAPPCUI= -Wl,-export-dynamic
 
 # linker flags for linking shared libraries
 LINKFLAGSSHLGUI= -shared
@@ -187,26 +182,6 @@ STDSHLCUIMT=$(PTHREAD_LIBS) -lm
 
 LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
 
-.IF "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlportstlg
-LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-.ENDIF
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-
 # name of library manager
 LIBMGR=ar
 LIBFLAGS=-r
diff --git a/solenv/inc/unxfbsdi.mk b/solenv/inc/unxfbsdi.mk
index c1227a35f2d3..c01fc21fbb2d 100644
--- a/solenv/inc/unxfbsdi.mk
+++ b/solenv/inc/unxfbsdi.mk
@@ -41,6 +41,3 @@ CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
 .ELSE 	# "$(PRODUCT)"!=""
 CFLAGSOPT= 					# no optimizing for non products
 .ENDIF	# "$(PRODUCT)"!=""
-
-# platform specific identifier for shared libs
-DLLPOSTFIX=fi
diff --git a/solenv/inc/unxfbsdx.mk b/solenv/inc/unxfbsdx.mk
index 4a8e120d318e..6fb0641d94d3 100644
--- a/solenv/inc/unxfbsdx.mk
+++ b/solenv/inc/unxfbsdx.mk
@@ -44,6 +44,4 @@ CFLAGSOPT=-O2 -fno-strict-aliasing		# optimizing for products
 CFLAGSOPT=   					# no optimizing for non products
 .ENDIF	# "$(PRODUCT)"!=""
 
-# platform specific identifier for shared libs
-DLLPOSTFIX=fx
 BUILD64=1
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
new file mode 100644
index 000000000000..752de80c7b36
--- /dev/null
+++ b/solenv/inc/unxgcc.mk
@@ -0,0 +1,266 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# generic mk file for gcc on unix systems
+
+ASM*=
+AFLAGS*=
+SOLAR_JAVA*=
+# default optimization level for product code
+CDEFAULTOPT*=-O2
+# architecture dependent flags for the C and C++ compiler that can be changed by
+# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
+ARCH_FLAGS*=
+# position independent code switch
+PICSWITCH*:=-fpic
+JAVAFLAGSDEBUG=-g
+
+# filter for supressing verbose messages from linker
+#not needed at the moment
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
+
+# _PTHREADS is needed for the stl
+CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
+# this is a platform with JAVA support
+.IF "$(SOLAR_JAVA)"!=""
+JAVADEF=-DSOLAR_JAVA
+.IF "$(debug)"==""
+JAVA_RUNTIME=-ljava
+.ELSE
+JAVA_RUNTIME=-ljava_g
+.ENDIF
+.ENDIF
+
+# name of C++ Compiler
+CXX*=g++
+# name of C Compiler
+CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF          # "$(SYSBASE)"!=""
+CFLAGS+=-fmessage-length=0 -c
+
+# flags to enable build with symbols
+CFLAGSENABLESYMBOLS=-g
+
+# flags for the C++ Compiler
+CFLAGSCC= -pipe $(ARCH_FLAGS)
+# Flags for enabling exception handling
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe $(ARCH_FLAGS)
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" && "$(HAVE_GCC_VISIBILITY_BROKEN)" != "TRUE"
+CFLAGSCXX+=-fvisibility-inlines-hidden
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+.IF "$(HAVE_CXX0X)" == "TRUE"
+CFLAGSCXX+=-std=c++0x -Wno-deprecated-declarations
+.ENDIF # "$(HAVE_CXX0X)" == "TRUE"
+
+CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
+CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
+CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
+
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=$(PICSWITCH)
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=$(PICSWITCH)
+# Compiler flags for profiling
+CFLAGSPROF=
+# Compiler flags for debugging
+CFLAGSDEBUG=-g
+CFLAGSDBGUTIL=
+
+GCCNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
+GCCNUMVER:=$(shell @-$(CXX) $(GCCNUMVERSION_CMD))
+
+# Compiler flags for enabling optimizations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=$(CDEFAULTOPT) # optimizing for products
+.IF "$(GCCNUMVER)" <= "000400050000"
+#At least SLED 10.2 gcc 4.3 overly agressively optimizes
+#uno::Sequence into junk, so only strict-alias on compiler
+#later than 4.5.1
+CFLAGSOPT+=-fno-strict-aliasing
+.ENDIF
+.ELSE 	# "$(PRODUCT)"!=""
+CFLAGSOPT=   							# no optimizing for non products
+.ENDIF	# "$(PRODUCT)"!=""
+
+# Compiler flags for disabling optimizations
+CFLAGSNOOPT=-O0
+# Compiler flags for describing the output path
+CFLAGSOUTOBJ=-o
+
+# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
+CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
+CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
+    -Wno-non-virtual-dtor -Woverloaded-virtual
+CFLAGSWALLCC=$(CFLAGSWARNCC)
+CFLAGSWALLCXX=$(CFLAGSWARNCXX)
+CFLAGSWERRCC=-Werror
+
+COMPILER_WARN_ERRORS=TRUE
+
+# switches for dynamic and static linking
+STATIC		= -Wl,-Bstatic
+DYNAMIC		= -Wl,-Bdynamic
+
+# name of linker
+LINK*=$(CXX)
+LINKC*=$(CC)
+
+# default linker flags
+.IF "$(SYSBASE)"!=""
+LINKFLAGS_SYSBASE:=-Wl,--sysroot=$(SYSBASE)
+.ENDIF          # "$(SYSBASE)"!=""
+#
+# The DT RPATH value is used first, before any other path, specifically before
+# the path defined in the LD_LIBRARY_PATH environment variable. This is
+# problematic since it does not allow the user to overwrite the value.
+# Therefore DT_RPATH is deprecated. The introduction of the new variant,
+# DT_RUNPATH, corrects this oversight by requiring the value is used after the
+# path in LD_LIBRARY_PATH.
+#
+# The linker option --enable-new-dtags must be used to also add DT_RUNPATH
+# entry. This will cause both, DT_RPATH and DT_RUNPATH entries, to be created
+#
+LINKFLAGSDEFS*=-Wl,-z,defs
+LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\',--enable-new-dtags
+LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-dtags
+    #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
+LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags
+LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
+LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\',--enable-new-dtags
+LINKFLAGSRUNPATH_OXT=
+LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\',--enable-new-dtags
+LINKFLAGSRUNPATH_NONE=
+# flag -Wl,-z,noexecstack sets the NX bit on the stack
+LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
+.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
+LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
+.ENDIF
+
+# linker flags for linking applications
+LINKFLAGSAPPGUI= -Wl,-export-dynamic \
+    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib
+LINKFLAGSAPPCUI= -Wl,-export-dynamic \
+    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib
+
+# linker flags for linking shared libraries
+LINKFLAGSSHLGUI= -shared
+LINKFLAGSSHLCUI= -shared
+
+LINKFLAGSTACK=
+LINKFLAGSPROF=
+LINKFLAGSDEBUG=-g
+LINKFLAGSOPT=
+
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
+
+SONAME_SWITCH=-Wl,-h
+
+# Sequence of libs does matter !
+
+STDLIBCPP=-lstdc++
+
+# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
+STDOBJGUI=
+STDSLOGUI=
+STDOBJCUI=
+STDSLOCUI=
+
+.IF "$(ALLOC)" == "TCMALLOC"
+STDLIBGUIMT+=-ltcmalloc
+STDLIBCUIMT+=-ltcmalloc
+STDSHLGUIMT+=-ltcmalloc
+STDSHLCUIMT+=-ltcmalloc
+.ENDIF
+
+.IF "$(ALLOC)" == "JEMALLOC"
+STDLIBGUIMT+=-ljemalloc
+STDLIBCUIMT+=-ljemalloc
+STDSHLGUIMT+=-ljemalloc
+STDSHLCUIMT+=-ljemalloc
+.ENDIF
+
+.IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
+LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
+.ELSE
+LINKFLAGS += -Wl,-zdynsort
+.ENDIF
+
+# libraries for linking applications
+STDLIBGUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+STDLIBCUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+# libraries for linking shared libraries
+STDSHLGUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+STDSHLCUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+
+X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed
+
+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+
+# name of library manager
+LIBMGR*=$(AR)
+LIBFLAGS=-r
+
+# tool for generating import libraries
+IMPLIB=
+IMPLIBFLAGS=
+
+MAPSYM=
+MAPSYMFLAGS=
+
+RC=irc
+RCFLAGS=-fo$@ $(RCFILES)
+RCLINK=
+RCLINKFLAGS=
+RCSETVERSION=
+
+# platform specific identifier for shared libs
+DLLPRE=lib
+DLLPOST=.so
+PCHPOST=.gch
diff --git a/solenv/inc/unxhpgr.mk b/solenv/inc/unxhpgr.mk
deleted file mode 100644
index 9ac0c7e3daf1..000000000000
--- a/solenv/inc/unxhpgr.mk
+++ /dev/null
@@ -1,133 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-# mak file fuer unxhpxr
-ASM=
-AFLAGS=
-
-CDEFS+=-D_PTHREADS -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
-CDEFS+=-DSYSV -D_POSIX_PTHREAD_SEMANTICS  -D_HPUX_SOURCE -DRWSTD_MULTI_THREAD -D_REENTRANT -D__HPACC_NOEH -D__STL_NO_EXCEPTIONS
- #CDEFS+= -D__hppa__
-
-# obernervige Warnungen abschalten
-# 67  = invalid pragma name
-# 251 = An object cannot be deleted using a pointer of type 'void *' since the 
-#		type of the object allocated is unknown.
-# 370 = The friend declaration is not in the correct form for either a function or a class.
-#       (future error)	
-# 600 = Type specifier is omitted; "int" is no longer assumed.
-DISWARN=+W67,251,370,600
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-#CXX=/opt/aCC/bin/aCC
-#CC=/opt/ansic/bin/cc
-CXX=g++
-CC=gcc
-CFLAGSWALL=-Wall
-CFLAGS=-nostdinc -c
-CFLAGSCC=-pipe -fguiding-decls $(ARCH_FLAGS)
-CFLAGSCXX=-pipe -fguiding-decls $(ARCH_FLAGS)
-PICSWITCH:=-fPIC
-CFLAGSOBJGUIMT=
-CFLAGSOBJCUIMT=
-CFLAGSSLOGUIMT=$(PICSWITCH)
-CFLAGSSLOCUIMT=$(PICSWITCH)
-CFLAGSPROF=
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-CFLAGSOPT=-O2
-CFLAGSNOOPT=
-CFLAGSOUTOBJ=-o
-
-
- #THREADLIB=-L/opt/dce/lib -ldce
-# use native aCC to build or link with shared libs, for the sake of
-# global class-instances
-
-STATIC		= -Bstatic
-DYNAMIC		= -Bdynamic
-
-#LINK=$(SOLARENV)/unxhpgr/lib/gcc-lib/hppa1.1-hp-hpux10.20/egcs-2.90.29/ld
-LINK=ld
-LINKFLAGS=-L/nw386/dev/s/solenv/unxhpgr/lib/gcc-lib/hppa1.1-hp-hpux10.20/egcs-2.91.57/threads -L/nw386/dev/s/solenv/unxhpgr/lib/gcc-lib/hppa1.1-hp-hpux10.20/egcs-2.91.57
-LINKFLAGSAPPGUI= /usr/lib/crt0.o
-LINKFLAGSSHLGUI= -b -noinhibit-exec -Bsymbolic -G $(THREADLIB)
-LINKFLAGSAPPCUI= /usr/lib/crt0.o
-LINKFLAGSSHLCUI= -b -noinhibit-exec -warn-once -Bsymbolic -G
-LINKFLAGSTACK=
-APPLINKSTATIC=-Bstatic
-APPLINKSHARED=-Bsymbolic
-APP_LINKTYPE=
-
-# reihenfolge der libs NICHT egal!
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-#STDLIBGUIMT= -lX11 -lXext -lcma -lsec -lcxx -ldld -lc_r -lm
-STDLIBGUIMT= -lX11 -lXext -ldce
-STDLIBCUIMT= -lc_r -lgcc -ldce
-#STDSHLGUIMT= -lX11 -lXext -lcma -lsec -lcxx -ldld -lc_r
-STDSHLGUIMT= -lcma -lsec -ldld -lc_r
-STDSHLCUIMT=
-# -L/opt/dce/lib -ldce -lsec -lcxx
-
-LIBMGR=ar
-LIBFLAGS=-r
-# LIBEXT=.so
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=
-RCFLAGS=
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX=hg
-DLLPRE=lib
-DLLPOST=.sl
-
-LDUMP=c++filt
-
-.IF "$(PRJNAME)"=="uno" || "$(PRJNAME)"=="vos"
-#CFLAGS += -D_PTHREADS  -U_REENTRANT -U_POSIX_PTHREAD_SEMANTICS
-#CFLAGSSLO += -instances=extern -template=wholeclass -ptr$(SLO)
-#CFLAGSOBJ += -instances=global -template=wholeclass -ptr$(SLO)
-#LINKFLAGS+= -temp=/tmp -PIC -instances=extern -ptr$(SLO)
-.ENDIF
-
-#SHLLINKARCONLY=yes
-
diff --git a/solenv/inc/unxhpxr.mk b/solenv/inc/unxhpxr.mk
deleted file mode 100644
index 174d61fc2b4c..000000000000
--- a/solenv/inc/unxhpxr.mk
+++ /dev/null
@@ -1,131 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mak file fuer unxhpxr
-ASM=
-AFLAGS=
-
-CDEFS+=-D_PTHREADS -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -DSYSV -D_POSIX_PTHREAD_SEMANTICS  -D_HPUX_SOURCE -DRWSTD_MULTI_THREAD -D_REENTRANT -D__HPACC_NOEH -D__STL_NO_EXCEPTIONS
-
-# kann c++ was c braucht??
-
-# obernervige Warnungen abschalten
-# 67  = invalid pragma name
-# 251 = An object cannot be deleted using a pointer of type 'void *' since the 
-#		type of the object allocated is unknown.
-# 370 = The friend declaration is not in the correct form for either a function or a class.
-#       (future error)	
-# 600 = Type specifier is omitted; "int" is no longer assumed.
-DISWARN=+W67,251,370,600
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-#CXX=/opt/aCC/bin/aCC
-#CC=/opt/ansic/bin/cc
-CXX=aCC
-CC=cc
-CFLAGS= -c
-CFLAGSCC= -Aa +e +Z $(ARCH_FLAGS)
-CFLAGSCXX=$(DISWARN) +Z $(ARCH_FLAGS)
-CFLAGSOBJGUIMT=
-CFLAGSOBJCUIMT=
-CFLAGSSLOGUIMT=
-CFLAGSSLOCUIMT=
-CFLAGSPROF=
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-CFLAGSOPT=-O
-CFLAGSNOOPT=
-CFLAGSOUTOBJ=-o
-
-
-THREADLIB=-L/opt/dce/lib -ldce
-# use native aCC to build or link with shared libs, for the sake of
-# global class-instances
-LINK=/opt/aCC/bin/aCC
-LINKFLAGS=
-LINKFLAGSAPPGUI=-Wl,+s
-LINKFLAGSSHLGUI=-b -L/usr/solar/lib -L/usr/contrib/X11R6/lib 
-LINKFLAGSAPPCUI=-Wl,+s
-LINKFLAGSSHLCUI=-b -L/usr/contrib/X11R6/lib
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=
-LINKFLAGSOPT=
-
-# reihenfolge der libs NICHT egal!
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-#STDLIBGUIMT= -lX11 -lXext -lcma -lsec -lcxx -ldld -lc_r -lm
-STDLIBGUIMT= -lX11 -lXext -lpthread
-STDLIBCUIMT= -lcma
-#STDSHLGUIMT= -lX11 -lXext -lcma -lsec -lcxx -ldld -lc_r
-STDSHLCUIMT=
-# -L/opt/dce/lib -ldce -lsec -lcxx
-
-LIBMGR=ar
-LIBFLAGS=-r
-# LIBEXT=.so
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=
-RCFLAGS=
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX=hr
-DLLPRE=lib
-DLLPOST=.sl
-
-LDUMP=c++filt
-
-.IF "$(WORK_STAMP)"!="MIX364"
-DLLPOSTFIX=ss
-.ELSE
-DLLPOSTFIX=
-.ENDIF
-
-
-.IF "$(PRJNAME)"=="uno" || "$(PRJNAME)"=="vos"
-#CFLAGS += -D_PTHREADS  -U_REENTRANT -U_POSIX_PTHREAD_SEMANTICS
-#CFLAGSSLO += -instances=extern -template=wholeclass -ptr$(SLO)
-#CFLAGSOBJ += -instances=global -template=wholeclass -ptr$(SLO)
-#LINKFLAGS+= -temp=/tmp -PIC -instances=extern -ptr$(SLO)
-.ENDIF
-
-#SHLLINKARCONLY=yes
-
diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
new file mode 100644
index 000000000000..3235026c9846
--- /dev/null
+++ b/solenv/inc/unxiosr.mk
@@ -0,0 +1,76 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# --- Unix Environment for iOS cross-compilation -------------
+
+CFLAGS=-c $(EXTRA_CFLAGS)
+
+LINKC*=$(CC)
+LINK*=$(CXX)
+
+STDLIBCUIMT=-framework CoreFoundation
+STDLIBGUIMT=-framework CoreFoundation
+STDSHLCUIMT=-framework CoreFoundation
+STDSHLGUIMT=-framework CoreFoundation
+
+LIBMGR*=ar
+LIBFLAGS=-r
+
+PROCESSOR_DEFINES=-DARM32
+
+DLLPRE=lib
+DLLPOST=.a
+
+# flags to enable build with symbols
+CFLAGSENABLESYMBOLS=-g
+
+# Flag for including debugging information in object files
+CFLAGSDEBUG=-g
+CFLAGSDBGUTIL=
+
+# Flag to specify output file to compiler/linker
+CFLAGSOUTOBJ=-o
+
+# # Include generic Mac OS X makefile
+# .INCLUDE : unxmacx.mk
+
+# --- general *ix settings ---
+HC=hc
+HCFLAGS=
+PATH_SEPERATOR*=:
+CDEFS+=-D__DMAKE
+
+CDEFS+=-DUNIX
+
+YACC*=yacc
+YACCFLAGS*=-d -t
+
+EXECPOST=
+SCPPOST=.ins
+DLLDEST=$(LB)
+
+OOO_LIBRARY_PATH_VAR = DYLD_LIBRARY_PATH
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index fd9f7832808d..62746cee4f15 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -25,244 +25,8 @@
 #
 #*************************************************************************
 
-# generic mk file for unxlng (unix linux glibc)
-ASM*=
-AFLAGS*=
-SOLAR_JAVA*=
-# default optimization level for product code
-CDEFAULTOPT*=-O2
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-# position independent code switch
-PICSWITCH*:=-fpic
-JAVAFLAGSDEBUG=-g
+CDEFS+=-DGLIBC=2
+PTHREAD_LIBS=-lpthread
+DL_LIB=-ldl
 
-# filter for supressing verbose messages from linker
-#not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
-
-# _PTHREADS is needed for the stl
-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
-
-# enable visibility define in "sal/types.h"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# this is a platform with JAVA support
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF
-
-# name of C++ Compiler
-CXX*=g++
-# name of C Compiler
-CC*=gcc
-.IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=--sysroot=$(SYSBASE)
-CXX+:=$(CFLAGS_SYSBASE)
-CC+:=$(CFLAGS_SYSBASE)
-.ENDIF          # "$(SYSBASE)"!=""
-CFLAGS+=-fmessage-length=0 -c
-
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-
-.ENDIF
-
-# flags for the C++ Compiler
-CFLAGSCC= -pipe $(ARCH_FLAGS)
-# Flags for enabling exception handling
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-# Flags for disabling exception handling
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-# -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe $(ARCH_FLAGS)
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CFLAGSCXX += -fvisibility-inlines-hidden
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
-
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-# Compiler flags for enabling optimizations
-.IF "$(PRODUCT)"!=""
-CFLAGSOPT=$(CDEFAULTOPT) -fno-strict-aliasing		# optimizing for products
-.ELSE 	# "$(PRODUCT)"!=""
-CFLAGSOPT=   							# no optimizing for non products
-.ENDIF	# "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
-    -Wno-non-virtual-dtor
-CFLAGSWALLCC=$(CFLAGSWARNCC)
-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
-
-# Once all modules on this platform compile without warnings, set
-# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
-# settings.mk):
-MODULES_WITH_WARNINGS := \
-    soldep
-
-# switches for dynamic and static linking
-STATIC		= -Wl,-Bstatic
-DYNAMIC		= -Wl,-Bdynamic
-
-# name of linker
-LINK*=$(CXX)
-LINKC*=$(CC)
-
-# default linker flags
-.IF "$(SYSBASE)"!=""
-LINKFLAGS_SYSBASE:=-Wl,--sysroot=$(SYSBASE)
-.ENDIF          # "$(SYSBASE)"!=""
-LINKFLAGSDEFS*=-Wl,-z,defs
-LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
-    #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
-LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
-LINKFLAGSRUNPATH_NONE=
-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
-.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
-LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
-.ENDIF
-
-# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
-    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib
-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
-    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib
-
-# linker flags for linking shared libraries
-LINKFLAGSSHLGUI= -shared
-LINKFLAGSSHLCUI= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-# linker flags for optimization (symbol hashtable)
-# for now, applied to symbol scoped libraries, only
-LINKFLAGSOPTIMIZE*=-Wl,-O1
-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-
-SONAME_SWITCH=-Wl,-h
-
-# Sequence of libs does matter !
-
-STDLIBCPP=-lstdc++
-
-# default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-.IF "$(ALLOC)" == "TCMALLOC"
-STDLIBGUIMT+=-ltcmalloc
-STDLIBCUIMT+=-ltcmalloc
-STDSHLGUIMT+=-ltcmalloc
-STDSHLCUIMT+=-ltcmalloc
-.ENDIF
-
-.IF "$(ALLOC)" == "JEMALLOC"
-STDLIBGUIMT+=-ljemalloc
-STDLIBCUIMT+=-ljemalloc
-STDSHLGUIMT+=-ljemalloc
-STDSHLCUIMT+=-ljemalloc
-.ENDIF
-
-.IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
-LINKFLAGS += -Wl,--hash-style=both
-.ELSE
-LINKFLAGS += -Wl,-zdynsort
-.ENDIF
-
-# libraries for linking applications
-STDLIBGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
-STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
-# libraries for linking shared libraries
-STDSHLGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
-STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
-
-X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed
-
-LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-
-.IF "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlportstlg
-LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-.ENDIF
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-
-# name of library manager
-LIBMGR*=ar
-LIBFLAGS=-r
-
-# tool for generating import libraries
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-# platform specific identifier for shared libs
-DLLPRE=lib
-DLLPOST=.so
-PCHPOST=.gch
+.INCLUDE : unxgcc.mk
diff --git a/solenv/inc/unxlnga.mk b/solenv/inc/unxlnga.mk
index da5d2fcd3d38..e7882f3a905a 100644
--- a/solenv/inc/unxlnga.mk
+++ b/solenv/inc/unxlnga.mk
@@ -29,5 +29,4 @@
 
 .INCLUDE : unxlng.mk
 CFLAGS+=-DIA64
-DLLPOSTFIX=la
 BUILD64=1
diff --git a/solenv/inc/unxlngaxp.mk b/solenv/inc/unxlngaxp.mk
index bf7711a10c5b..fdeb932f2264 100644
--- a/solenv/inc/unxlngaxp.mk
+++ b/solenv/inc/unxlngaxp.mk
@@ -30,5 +30,5 @@
 PICSWITCH:=-fPIC
 .INCLUDE : unxlng.mk
 CFLAGS+=-DAXP
-DLLPOSTFIX=ll
+LINKFLAGS+=-Wl,--no-relax
 BUILD64=1
diff --git a/solenv/inc/unxlnghppa.mk b/solenv/inc/unxlnghppa.mk
index 7ae2d25c332e..41a428e31689 100644
--- a/solenv/inc/unxlnghppa.mk
+++ b/solenv/inc/unxlnghppa.mk
@@ -32,4 +32,3 @@ CDEFS+=-DHPPA
 CFLAGS+=
 CFLAGSCC+=
 CFLAGSCXX+=
-DLLPOSTFIX=lh
diff --git a/solenv/inc/unxlngi.mk b/solenv/inc/unxlngi.mk
index d86aab185d0e..79c255c326a2 100644
--- a/solenv/inc/unxlngi.mk
+++ b/solenv/inc/unxlngi.mk
@@ -27,8 +27,11 @@
 
 # mk file for Unix Linux Intel (X86) using GCC, please make generic modifications to unxlng.mk
 CDEFAULTOPT=-Os
+.IF "$(GCCNUMVER)" >= "000400050000"
+ARCH_FLAGS*=-mtune=atom
+.ELSE
 ARCH_FLAGS*=-mtune=pentiumpro
+.ENDIF
 .INCLUDE : unxlng.mk
 CDEFS+=-DX86
 DLLPOST=.so
-DLLPOSTFIX=li
diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk
index da6ed55d8cfd..b6a018a10a1d 100644
--- a/solenv/inc/unxlngm68k.mk
+++ b/solenv/inc/unxlngm68k.mk
@@ -34,4 +34,3 @@ CDEFS+=-DM68K
 CFLAGS+=-fsigned-char -fno-omit-frame-pointer
 CFLAGSCC+=-fsigned-char
 CFLAGSCXX+=-fsigned-char
-DLLPOSTFIX=lm
diff --git a/solenv/inc/unxlngmips.mk b/solenv/inc/unxlngmips.mk
index 53c927d10b32..783305d6c9d1 100644
--- a/solenv/inc/unxlngmips.mk
+++ b/solenv/inc/unxlngmips.mk
@@ -30,4 +30,3 @@
 CDEFAULTOPT=-Os
 .INCLUDE : unxlng.mk
 CDEFS+=-DMIPS
-DLLPOSTFIX=lm
diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk
index 89b2501bf366..af528d96ee94 100644
--- a/solenv/inc/unxlngppc.mk
+++ b/solenv/inc/unxlngppc.mk
@@ -31,4 +31,3 @@ DEFAULTOPT=-Os
 PICSWITCH:=-fPIC
 .INCLUDE : unxlng.mk
 CDEFS+=-DPOWERPC -DPPC
-DLLPOSTFIX=lp
diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk
index 1bcbb6626219..81ee90ca4f0e 100644
--- a/solenv/inc/unxlngr.mk
+++ b/solenv/inc/unxlngr.mk
@@ -31,4 +31,3 @@ CDEFAULTOPT=-Os
 .INCLUDE : unxlng.mk
 CDEFS+=-DARM32
 CFLAGS+=-fno-omit-frame-pointer
-DLLPOSTFIX=lr
diff --git a/solenv/inc/unxlngs.mk b/solenv/inc/unxlngs.mk
index b4e6f5f58f4d..390244f31d6c 100644
--- a/solenv/inc/unxlngs.mk
+++ b/solenv/inc/unxlngs.mk
@@ -33,4 +33,3 @@ CDEFAULTOPT=-Os
 PICSWITCH:=-fPIC
 .INCLUDE : unxlng.mk
 CDEFS+=-DSPARC
-DLLPOSTFIX=ls
diff --git a/solenv/inc/unxlngs390.mk b/solenv/inc/unxlngs390.mk
index 47e2e37011e8..0eac39af0b9d 100644
--- a/solenv/inc/unxlngs390.mk
+++ b/solenv/inc/unxlngs390.mk
@@ -33,4 +33,3 @@ CDEFS+=-DS390
 CFLAGS+=-fsigned-char -fno-omit-frame-pointer
 CFLAGSCC+=-fsigned-char
 CFLAGSCXX+=-fsigned-char
-DLLPOSTFIX=l3
diff --git a/solenv/inc/unxlngx.mk b/solenv/inc/unxlngx.mk
index 414f15d0dc92..9c89eddefad9 100644
--- a/solenv/inc/unxlngx.mk
+++ b/solenv/inc/unxlngx.mk
@@ -29,5 +29,4 @@
 
 .INCLUDE : unxlng.mk
 CDEFS+=-DX86_64
-DLLPOSTFIX=lx
 BUILD64=1
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index ce049a672d23..c862f948b571 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -29,7 +29,7 @@
 # Platform MAKEFILE for Mac OS X and Darwin on both PowerPC and Intel
 ##########################################################################
 
-# PROCESSOR_DEFINES and DLLPOSTFIX are defined in the particular platform file
+# PROCESSOR_DEFINES is defined in the particular platform file
 
 ASM=
 AFLAGS=
@@ -38,10 +38,7 @@ LINKOUTPUT_FILTER=
 # Definitions that we may need on the compile line.
 # -D_PTHREADS and -D_REENTRANT are needed for STLport, and must be specified when
 #  compiling STLport sources too, either internally or externally.
-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -DSTLPORT_VERSION=$(STLPORT_VER) -D_USE_NAMESPACE=1
-.IF "$(GUIBASE)"=="unx" && "$(USE_SYSTEM_STL)"!="YES"
-CDEFS+=-DX_LOCALE
-.ENDIF
+CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -D_USE_NAMESPACE=1
 .IF "$(GUIBASE)"=="aqua"
 # MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build,
 # build can assume functions/libraries of that version to be available
@@ -166,27 +163,6 @@ CDEFS+=$(EXTRA_CDEFS)
 STDLIBCPP=-lstdc++
 
 # ---------------------------------
-#  STLport library names
-# ---------------------------------
-.IF "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=-lstlportstlg
-LIBSTLPORTST=$(STATIC) -lstlportstlg
-.ELSE
-LIBSTLPORT=-lstlport_gcc_stldebug
-LIBSTLPORTST=$(SOLARVERSION)/$(INPATH)/lib/libstlport_gcc_stldebug.a
-.ENDIF
-.ELSE # "$(USE_STLP_DEBUG" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=-lstlport
-LIBSTLPORTST=$(STATIC) -lstlport
-.ELSE
-LIBSTLPORT=-lstlport_gcc
-LIBSTLPORTST=$(SOLARVERSION)/$(INPATH)/lib/libstlport_gcc.a
-.ENDIF
-.ENDIF # "$(USE_STLP_DEBUG" != ""
-
-# ---------------------------------
 #  Link stage flags
 # ---------------------------------
 # always link with gcc since you may be linking c code and don't want -lstdc++ linked in!
diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk
index 7c7f0a88f4f4..1e620f34407b 100644
--- a/solenv/inc/unxmacxi.mk
+++ b/solenv/inc/unxmacxi.mk
@@ -31,8 +31,6 @@
 
 PROCESSOR_DEFINES=-DX86
 
-DLLPOSTFIX=mxi
-
 # special for SO build environment
 .IF "$(SYSBASE)"!=""
 .IF "$(EXTRA_CFLAGS)"!=""
@@ -42,12 +40,8 @@ CXXCPP*:=g++ -E $(EXTRA_CFLAGS)
 .ENDIF # "$(EXTRA_CFLAGS)"!=""
 .ENDIF # "$(SYSBASE)"!=""
 
-# flags to enable build with symbols; required by crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
+# flags to enable build with symbols
 CFLAGSENABLESYMBOLS=-g
-.ENDIF
 
 # Include generic Mac OS X makefile
 .INCLUDE : unxmacx.mk
diff --git a/solenv/inc/unxmacxp.mk b/solenv/inc/unxmacxp.mk
index 28b2881962de..805563a7fe14 100644
--- a/solenv/inc/unxmacxp.mk
+++ b/solenv/inc/unxmacxp.mk
@@ -31,7 +31,5 @@
 
 PROCESSOR_DEFINES=-DPOWERPC -DPPC
 
-DLLPOSTFIX=mxp
-
 # Include generic Mac OS X makefile
 .INCLUDE : unxmacx.mk
diff --git a/solenv/inc/unxnbsd.mk b/solenv/inc/unxnbsd.mk
new file mode 100644
index 000000000000..b7d5e042e6fd
--- /dev/null
+++ b/solenv/inc/unxnbsd.mk
@@ -0,0 +1,25 @@
+#
+# mk file for NetBSD
+#
+
+# arch specific defines
+.IF "$(CPUNAME)" == "INTEL"
+CDEFS+=-DX86
+.ENDIF
+
+.IF "$(CPUNAME)" == "X86_64"
+CDEFS+=-DX86_64
+BUILD64=1
+.ENDIF
+
+.INCLUDE : unxgcc.mk
+
+# default linker flags
+# NetBSD has no support for using relative paths with $ORIGIN
+LINKFLAGSRUNPATH_UREBIN=
+LINKFLAGSRUNPATH_OOO=
+LINKFLAGSRUNPATH_SDK=
+LINKFLAGSRUNPATH_BRAND=
+
+LINKFLAGSDEFS=-Wl,--ignore-unresolved-symbol,environ
+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
diff --git a/Module_ooo.mk b/solenv/inc/unxobsd.mk
index e8580c89fc22..85fe81a12c52 100644
--- a/Module_ooo.mk
+++ b/solenv/inc/unxobsd.mk
@@ -25,8 +25,9 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Module_Module,ooo))
+# Makefile for OpenBSD
 
+<<<<<<< HEAD
 $(eval $(call gb_Module_add_moduledirs,ooo,\
 	basebmp \
 	basegfx \
@@ -63,5 +64,22 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	xmlreader \
 	xmlscript \
 ))
+=======
+# arch specific defines
+.IF "$(CPUNAME)" == "INTEL"
+CDEFS+=-DX86
+.ENDIF
+.IF "$(CPUNAME)" == "X86_64"
+CDEFS+=-DX86_64
+ARCH_FLAGS*=
+BUILD64=1
+.ENDIF
+>>>>>>> master
 
-# vim: set noet ts=4 sw=4:
+.INCLUDE : unxgcc.mk
+
+# disable exceptions in boost
+CFLAGS_NO_EXCEPTIONS+=-DBOOST_NO_EXCEPTIONS
+
+# default linker flags
+LINKFLAGSDEFS:=
diff --git a/solenv/inc/unxscoi.mk b/solenv/inc/unxscoi.mk
deleted file mode 100644
index 901fe7b2cb22..000000000000
--- a/solenv/inc/unxscoi.mk
+++ /dev/null
@@ -1,140 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-# mak file fuer wnticci
-ASM=
-AFLAGS=
-
-CDEFS+=-D_PTHREADS -D_REENTRANT 
-CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -DX86 -DNEW_SOLAR
-# kann c++ was c braucht??
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=-mpentium
-
-CXX*=/nw386/dev/s/solenv/unxscoi/bin/g++
-CC*=/nw386/dev/s/solenv/unxscoi/bin/gcc
-CFLAGS=-c
-CFLAGSCC=$(ARCH_FLAGS)
-CFLAGSEXCEPTIONS=-fexceptions
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-CFLAGSCXX=-fguiding-decls -frtti $(ARCH_FLAGS)
-PICSWITCH:=-fPIC
-CFLAGSOBJGUIMT=$(PICSWITCH)
-CFLAGSOBJCUIMT=$(PICSWITCH)
-CFLAGSSLOGUIMT=$(PICSWITCH)
-CFLAGSSLOCUIMT=$(PICSWITCH)
-CFLAGSPROF=
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-CFLAGSOPT=-O2
-CFLAGSNOOPT=-O
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
-CFLAGSWERRCC=-Werror
-
-STATIC		= -Wl,-Bstatic
-DYNAMIC		= -Wl,-Bdynamic
-
-THREADLIB=
-LINK=/nw386/dev/s/solenv/unxscoi/bin/gcc
-LINKFLAGS=
-# SCO hat grosse Probleme mit fork/exec und einigen shared libraries
-# rsc2 muss daher statisch gelinkt werden
-.IF "$(PRJNAME)"=="rsc"
-LINKFLAGSAPPGUI=-L/nw386/dev/s/solenv/unxscoi/lib $(STATIC) -lpthread_init $(DYNAMIC)
-LINKFLAGSAPPCUI=-L/nw386/dev/s/solenv/unxscoi/lib $(STATIC) -lpthread_init $(DYNAMIC)
-.ELSE
-LINKFLAGSAPPGUI=-L/nw386/dev/s/solenv/unxscoi/lib -lpthread_init
-LINKFLAGSAPPCUI=-L/nw386/dev/s/solenv/unxscoi/lib -lpthread_init
-.ENDIF
-LINKFLAGSSHLGUI=-G -W,l,-Bsymbolic
-LINKFLAGSSHLCUI=-G -W,l,-Bsymbolic
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-# standard C++ Library
-#
-# das statische dazulinken der libstdc++ macht jede shared library um 50k
-# (ungestrippt) oder so groesser, auch wenn sie ueberhaupt nicht gebraucht
-# wird. Da muessen wir uns was besseres ueberlegen.
-STDLIBCPP=-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
-
-# reihenfolge der libs NICHT egal!
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-.IF "$(PRJNAME)"=="rsc"
-STDLIBGUIMT=-lXext -lX11 $(STATIC) -lpthread $(DYNAMIC) -ldl -lsocket -lm
-STDLIBCUIMT=$(STATIC) -lpthread $(DYNAMIC) -ldl -lsocket -lm 
-.ELSE
-STDLIBGUIMT=-lXext -lX11 -lpthread -ldl -lsocket -lm
-STDLIBCUIMT=-lpthread -ldl -lsocket -lm 
-.ENDIF
-#STDSHLGUIMT=-lXext -lX11 -lpthread -ldl -lsocket -lm
-#STDSHLCUIMT=-lpthread -ldl -lsocket -lm 
-
-STDLIBCPP= -lstdc++
-SHLLINKARCONLY=yes
-
-LIBMGR=ar
-LIBFLAGS=-r
-# LIBEXT=.so
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX=ci
-DLLPRE=lib
-DLLPOST=.so
-
-LDUMP=cppfilt /b /n /o /p
-
-.IF "$(WORK_STAMP)"!="MIX364"
-DLLPOSTFIX=ci
-.ELSE
-DLLPOSTFIX=
-.ENDIF
diff --git a/solenv/inc/unxsogi.mk b/solenv/inc/unxsogi.mk
index ce82fca29fa9..1991089709f9 100644
--- a/solenv/inc/unxsogi.mk
+++ b/solenv/inc/unxsogi.mk
@@ -33,7 +33,7 @@ SOLAR_JAVA=TRUE
 JAVAFLAGSDEBUG=-g
 
 # _PTHREADS is needed for the stl
-CDEFS+=-D_PTHREADS -D_REENTRANT -DSYSV -DSUN -DSUN4 -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER) -D_USE_NAMESPACE=1 
+CDEFS+=-D_PTHREADS -D_REENTRANT -DSYSV -DSUN -DSUN4 -D_POSIX_PTHREAD_SEMANTICS -D_USE_NAMESPACE=1 
 
 
 .IF "$(SOLAR_JAVA)"!=""
@@ -112,14 +112,6 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread -lthread -lm
 
 STDLIBGUIMT+=-lX11
 
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF
-
 LIBMGR=ar
 LIBFLAGS=-r
 # LIBEXT=.so
@@ -136,6 +128,5 @@ RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=
 
-DLLPOSTFIX=sogi
 DLLPRE=lib
 DLLPOST=.so
diff --git a/solenv/inc/unxsogs.mk b/solenv/inc/unxsogs.mk
index dd0fb53272f8..5400be270e9b 100644
--- a/solenv/inc/unxsogs.mk
+++ b/solenv/inc/unxsogs.mk
@@ -33,7 +33,7 @@ SOLAR_JAVA=TRUE
 JAVAFLAGSDEBUG=-g
 
 # _PTHREADS is needed for the stl
-CDEFS+=-D_PTHREADS -D_REENTRANT -DSYSV -DSUN -DSUN4 -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER) -D_USE_NAMESPACE=1 
+CDEFS+=-D_PTHREADS -D_REENTRANT -DSYSV -DSUN -DSUN4 -D_POSIX_PTHREAD_SEMANTICS -D_USE_NAMESPACE=1 
 
 
 .IF "$(SOLAR_JAVA)"!=""
@@ -111,14 +111,6 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread -lthread -lm
 
 STDLIBGUIMT+=-lX11
 
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF
-
 LIBMGR=ar
 LIBFLAGS=-r
 # LIBEXT=.so
@@ -135,6 +127,5 @@ RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=
 
-DLLPOSTFIX=sogs
 DLLPRE=lib
 DLLPOST=.so
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index b1778a0edfde..a14da5da1a26 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -29,7 +29,7 @@
 ASM=/usr/ccs/bin/as
 AFLAGS=-P
 
-CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER)
+CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
 
 SOLAR_JAVA*=TRUE
 .IF "$(SOLAR_JAVA)"!=""
@@ -87,7 +87,7 @@ CFLAGSOUTOBJ=-o
 #   (this_type(p).swap(*this))
 # - truncwarn: "conversion of 64 bit type value to smaller type causes
 #   truncation" at least with CC 5.8 is reported only at the end of a
-#   compilation unit that uses std::hash_map<sal_Int64, sal_Int64> (see
+#   compilation unit that uses boost::unordered_map<sal_Int64, sal_Int64> (see
 #   sfx2/source/toolbox/imgmgr.cxx:1.27) and thus unfortunately needs to be
 #   disabled globally
 # - wnoretvalue: warning about the last statement of a function not
@@ -106,8 +106,7 @@ CFLAGSWERRCXX=-xwe
 # Once all modules on this platform compile without warnings, set
 # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
 # settings.mk):
-MODULES_WITH_WARNINGS := \
-    soldep
+MODULES_WITH_WARNINGS :=
 
 STDOBJVCL=$(L)/salmain.o
 
@@ -201,14 +200,6 @@ X11LINK_DYNAMIC = -lXext -lX11
 # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
 LIBSALCPPRT=
 
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro_debug
-LIBSTLPORTST=$(STATIC) -lstlport_sunpro_debug $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro
-LIBSTLPORTST=$(STATIC) -lstlport_sunpro $(DYNAMIC)
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
 LIBMGR=CC
 LIBFLAGS=-xar -o
 
@@ -225,8 +216,6 @@ RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=
 
-DLLPOSTFIX=si
-
 DLLPRE=lib
 DLLPOST=.so
 
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index 4febb67d446a..11b6f15473aa 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -30,7 +30,7 @@ ASM=/usr/ccs/bin/as
 # needs -D__sparcv8plus because it's not defined by the assembler with -xarch=v8plus
 AFLAGS=-P -xarch=v8plus -D__sparcv8plus
 
-CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER)
+CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
 
 SOLAR_JAVA*=TRUE
 .IF "$(SOLAR_JAVA)"!=""
@@ -93,7 +93,7 @@ CFLAGSOUTOBJ=-o
 #   (this_type(p).swap(*this))
 # - truncwarn: "conversion of 64 bit type value to smaller type causes
 #   truncation" at least with CC 5.8 is reported only at the end of a
-#   compilation unit that uses std::hash_map<sal_Int64, sal_Int64> (see
+#   compilation unit that uses boost::unordered_map<sal_Int64, sal_Int64> (see
 #   sfx2/source/toolbox/imgmgr.cxx:1.27) and thus unfortunately needs to be
 #   disabled globally
 # - wnoretvalue: warning about the last statement of a function not 
@@ -112,8 +112,7 @@ CFLAGSWERRCXX=-xwe
 # Once all modules on this platform compile without warnings, set
 # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
 # settings.mk):
-MODULES_WITH_WARNINGS := \
-    soldep
+MODULES_WITH_WARNINGS :=
 
 STDOBJVCL=$(L)/salmain.o
 
@@ -207,14 +206,6 @@ X11LINK_DYNAMIC = -lXext -lX11
 # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
 LIBSALCPPRT=
 
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro_debug
-LIBSTLPORTST=$(STATIC) -lstlport_sunpro_debug $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro
-LIBSTLPORTST=$(STATIC) -lstlport_sunpro $(DYNAMIC)
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
 LIBMGR=CC
 LIBFLAGS=-xar -o
 
@@ -231,8 +222,6 @@ RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=
 
-DLLPOSTFIX=ss
-
 DLLPRE=lib
 DLLPOST=.so
 
diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk
index c73d6fc37283..76da3103880a 100644
--- a/solenv/inc/unxsolu4.mk
+++ b/solenv/inc/unxsolu4.mk
@@ -55,7 +55,7 @@ CC*=cc
 
 CFLAGS=$(PREENVCFLAGS) -c -temp=/tmp
 CFLAGSCC=-xCC $(ARCH_FLAGS)
-CFLAGSCXX= -features=no%altspell -library=stlport4 $(ARCH_FLAGS)
+CFLAGSCXX= -features=no%altspell $(ARCH_FLAGS)
 
 # flags to enable build with symbols; required for crashdump feature
 CFLAGSENABLESYMBOLS=-g0 -xs # was temporarily commented out, reenabled before Beta
@@ -92,7 +92,7 @@ CFLAGSOUTOBJ=-o
 #   (this_type(p).swap(*this))
 # - truncwarn: "conversion of 64 bit type value to smaller type causes
 #   truncation" at least with CC 5.8 is reported only at the end of a
-#   compilation unit that uses std::hash_map<sal_Int64, sal_Int64> (see
+#   compilation unit that uses boost::unordered_map<sal_Int64, sal_Int64> (see
 #   sfx2/source/toolbox/imgmgr.cxx:1.27) and thus unfortunately needs to be
 #   disabled globally
 # - wnoretvalue: "The last statement should return a value." 
@@ -111,8 +111,7 @@ CFLAGSWERRCXX=-xwe
 # Once all modules on this platform compile without warnings, set
 # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
 # settings.mk):
-MODULES_WITH_WARNINGS := \
-    soldep
+MODULES_WITH_WARNINGS :=
 
 STDOBJVCL=$(L)/salmain.o
 
@@ -139,7 +138,7 @@ LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\'
 LINKFLAGSRUNPATH_NONE=
-LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=stlport4
+LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath
 LINKCFLAGS=-m64 -w -mt -z combreloc -norunpath
 
 # -z text force fatal error if non PIC code is linked into shared library. Such code
@@ -200,14 +199,6 @@ STDSHLGUIMT+=-lX11 -ldl
 # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
 LIBSALCPPRT=
 
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro_debug
-LIBSTLPORTST=$(STATIC) -lstlport_sunpro_debug $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro
-LIBSTLPORTST=$(STATIC) -lstlport_sunpro $(DYNAMIC)
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
 LIBMGR=CC
 LIBFLAGS=-xar -o
 
@@ -224,8 +215,6 @@ RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=
 
-DLLPOSTFIX=su
-
 DLLPRE=lib
 DLLPOST=.so
 
diff --git a/solenv/inc/verinfo.hrc b/solenv/inc/verinfo.hrc
index d0a585af90ee..66f0ec6f8327 100644
--- a/solenv/inc/verinfo.hrc
+++ b/solenv/inc/verinfo.hrc
@@ -54,11 +54,7 @@
 
 // define order of date parts --------------------------------------------
 
-#if defined(LG_D)
-  #define VER_DMY
-#else
-  #define VER_YMD
-#endif
+#define VER_YMD
 
 // set VERVARIANT to 0 if not defined ------------------------------------
 
@@ -158,19 +154,11 @@
 #elif VER_MONTH==2
   #define VER2 Feb
 #elif VER_MONTH==3
-  #ifdef LG_D
-    #define VER2 M\344r
-  #else
-    #define VER2 Mar
-  #endif
+  #define VER2 Mar
 #elif VER_MONTH==4
   #define VER2 Apr
 #elif VER_MONTH==5
-  #ifdef LG_D
-    #define VER2 Mai
-  #else
-    #define VER2 May
-  #endif
+  #define VER2 May
 #elif VER_MONTH==6
   #define VER2 Jun
 #elif VER_MONTH==7
@@ -180,26 +168,14 @@
 #elif VER_MONTH==9
   #define VER2 Sep
 #elif VER_MONTH==10
-  #ifdef LG_D
-    #define VER2 Okt
-  #else
-    #define VER2 Oct
-  #endif
+  #define VER2 Oct
 #elif VER_MONTH==11
   #define VER2 Nov
 #elif VER_MONTH==12
-  #ifdef LG_D
-    #define VER2 Dez
-  #else
-    #define VER2 Dec
-  #endif
+  #define VER2 Dec
 #endif
 
-#ifdef LG_D
-  #define VERC3(a, b, c) a.b.c
-#else
-  #define VERC3(a, b, c) c-b-a
-#endif
+#define VERC3(a, b, c) c-b-a
 #define VERC4(a, b, c) VERC3(a, b, c)
 #define VER_DATE VERC4(VER5, VER2, VER_YEAR)
 
@@ -219,11 +195,7 @@
 
 #define S_CRIGHT PPS(VERC6(VER_YEARRANGE))
 
-#ifdef LG_D
-#define S_VERSION PPS(Version VER_LEVEL vom VER_DATE)
-#else
 #define S_VERSION PPS(Version VER_LEVEL of VER_DATE)
-#endif
 
 #endif  // _VERINFO_HRC
 
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
index 0a0d0d103ac3..74dd722dc848 100755
--- a/solenv/inc/version.hrc
+++ b/solenv/inc/version.hrc
@@ -49,13 +49,8 @@
 
 RCD_LANGUAGE rcdata
 {
-#ifdef LG_D
-    "040704B0",     // Germany -> Unicode
-    "040704E4",     // Germany -> Windows, Multilingual
-#else
-    "040904B0",     // Germany -> Unicode
+    "040904B0",     // USA -> Unicode
     "040904E4",     // USA -> Windows, Multilingual
-#endif
     "04090000",     // USA -> 7-Bit-ASCII
     0               // end of table
 }
@@ -66,5 +61,4 @@ VS_VERSION_INFO rcdata
 {
     0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
     VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-};
-
+}
diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc
index 383f3530ccbf..2e4db98a2925 100755
--- a/solenv/inc/version_so.hrc
+++ b/solenv/inc/version_so.hrc
@@ -49,13 +49,8 @@
 
 RCD_LANGUAGE rcdata
 {
-#ifdef LG_D
-    "040704B0",     // Germany -> Unicode
-    "040704E4",     // Germany -> Windows, Multilingual
-#else
-    "040904B0",     // Germany -> Unicode
+    "040904B0",     // USA -> Unicode
     "040904E4",     // USA -> Windows, Multilingual
-#endif
     "04090000",     // USA -> 7-Bit-ASCII
     0               // end of table
 }
diff --git a/soldep/source/hashobj.cxx b/solenv/inc/win32/jni_md.h
index 944a3801fc59..b7aab253b350 100644
--- a/soldep/source/hashobj.cxx
+++ b/solenv/inc/win32/jni_md.h
@@ -1,5 +1,5 @@
-/*************************************************************************
- *
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -22,16 +22,21 @@
  * version 3 along with OpenOffice.org.  If not, see
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ */
+
+/* Fake jni_md.h for use when cross-compiling to Windows */
+
+#ifndef JNI_MD_H_INCLUDED
+#define JNI_MD_H_INCLUDED
 
-#include <soldep/hashobj.hxx>
+#define JNIEXPORT __declspec (dllexport)
+#define JNIIMPORT __declspec (dllimport)
+#define JNICALL   __stdcall
 
-class ObjectWin;
+typedef long jint;
+typedef __int64 jlong;
+typedef char jbyte;
 
+#endif /* JNI_MD_H_INCLUDED */
 
-MyHashObject::MyHashObject( sal_uIntPtr nId, ObjectWin* pWin )
-{
-    mnId = nId;
-    mpWin = pWin;
-};
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk
index f369bd15ad30..8b65c5f393e3 100644
--- a/solenv/inc/wnt.mk
+++ b/solenv/inc/wnt.mk
@@ -30,14 +30,11 @@
 
 # --- Compiler ---
 
-.IF "$(OS)$(COM)$(CPU)" == "WNTMSCI"
-.IF "$(COMEX)" == "10"
-.INCLUDE : wntmsci10.mk
-.ELSE
-# for wntmsci11 (.Net 2005) and wntmsci12 (.Net 2008)
-.INCLUDE : wntmsci11.mk
-.ENDIF # "$(COMEX)" == "10"
-.ENDIF # "$(OS)$(COM)$(CPU)" == "WNTMSCI"
+.IF "$(OS)$(COM)" == "WNTMSC"
+# for wntmsci12, wntmscx12, wntmsci13 and wntmscx13
+# (MSVC 2008 and MSVC 2010, 32- and 64-bit)
+.INCLUDE : wntmsc.mk
+.ENDIF # "$(OS)$(COM)" == "WNTMSC"
 
 .IF "$(COM)$(OS)$(CPU)" == "GCCWNTI"
 .INCLUDE : wntgcci.mk
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index 5951538458a4..2622ca6b1927 100755..100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -27,8 +27,7 @@
 
 # mk file for Window Intel using GCC
 
-SOLAR_JAVA*=TRUE
-FULL_DESK=TRUE
+SOLAR_JAVA*=
 JAVAFLAGSDEBUG=-g
 
 # SOLAR JAva Unterstuetzung nur fuer wntmsci
@@ -40,14 +39,11 @@ AFLAGS=/c /Cp /coff
 # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
 ARCH_FLAGS*=-march=pentium
 
-CXX*=gcc
-### Der gcc vertraegt kein Semikolon im Include-Pfad         RT
-# old:
-#CFLAGS=-c -Wall -I$(INCLUDE) $(OLE2DEF)
-# new:
-#CYGINC=$(INCLUDE:s/-I /-I/:+"  ":s/;/ -I/:s/-I  //:s/   / /)
-CFLAGS=-fmessage-length=0 -c -nostdinc $(OLE2DEF)
-###
+CC*=i686-w64-mingw32-gcc
+CXX*=i686-w64-mingw32-g++
+
+CFLAGS+=-fmessage-length=0 -c
+
 CFLAGSCC=-pipe $(ARCH_FLAGS)
 CFLAGSCXX=-pipe $(ARCH_FLAGS)
 CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
@@ -77,7 +73,7 @@ CFLAGSNOOPT=-O0
 # Compiler flags for describing the output path
 CFLAGSOUTOBJ=-o
 #plattform hart setzen
-CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_WINNT=0x500 -D_WIN32_IE=0x500 -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED -D_MSC_EXTENSIONS -D_FORCENAMELESSUNION
+CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_WINNT=0x500 -D_WIN32_IE=0x500 -D_M_IX86 -D_NATIVE_WCHAR_T_DEFINED -D_MSC_EXTENSIONS -D_FORCENAMELESSUNION
 .IF  "$(DYNAMIC_CRT)"!=""
 CDEFS+=-D_DLL
 .ENDIF
@@ -98,7 +94,6 @@ MODULES_WITH_WARNINGS := \
     extensions \
     lingu \
     r_tools \
-    soldep \
     starmath \
     sw \
     xmlsecurity
@@ -110,18 +105,18 @@ LINK*=$(CXX)
 LINKC*=$(CC)
 
 CYGLIB=$(LIB:s/;/ -L/)
-LINKFLAGS=-nostdlib -Wl,--enable-stdcall-fixup,--enable-runtime-pseudo-reloc-v2 -L$(CYGLIB)
+LINKFLAGS= -Wl,--enable-stdcall-fixup,--enable-runtime-pseudo-reloc-v2 -L$(CYGLIB)
 .IF "$(USE_MINGW)"=="cygwin"
 MINGWLIBDIR=$(COMPATH)$/lib$/mingw
 .ELSE
 MINGWLIBDIR=$(COMPATH)$/lib
 .ENDIF
-MINGWSSTDOBJ=$(MINGW_CLIB_DIR)$/crtbegin.o
-MINGWSSTDENDOBJ=$(MINGW_CLIB_DIR)$/crtend.o
-LINKFLAGSAPPGUI=-mwindows $(MINGWLIBDIR)$/crt2.o
-LINKFLAGSSHLGUI=--warn-once -mwindows -shared $(MINGWLIBDIR)$/dllcrt2.o
-LINKFLAGSAPPCUI=-mconsole $(MINGWLIBDIR)$/crt2.o
-LINKFLAGSSHLCUI=--warn-once -mconsole -shared $(MINGWLIBDIR)$/dllcrt2.o
+MINGWSSTDOBJ=
+MINGWSSTDENDOBJ=
+LINKFLAGSAPPGUI=-mwindows 
+LINKFLAGSSHLGUI=-Wl,--warn-once -mwindows -shared 
+LINKFLAGSAPPCUI=-mconsole 
+LINKFLAGSSHLCUI=-Wl,--warn-once -mconsole -shared
 LINKFLAGSTACK=
 LINKFLAGSPROF=
 LINKFLAGSDEBUG=-g
@@ -164,25 +159,19 @@ STDLIBCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -l
 STDSHLGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
 STDSHLCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
 
-LIBSTLPORT=-lstlport_gcc
-LIBSTLPORTST=-lstlport_gcc_static $(STDLIBCPP)
-
-LIBMGR=ar
+LIBMGR=$(AR)
 LIBFLAGS=-rsu
 
-IMPLIB=ld
-IMPLIBFLAGS=
-
-MAPSYM=tmapsym
+MAPSYM=
 MAPSYMFLAGS=
 
-RC=rc
-RCFLAGS=-D__MINGW32__ -DWIN32 -D_WIN32_IE=0x400 -fo$@ $(RCFILES)
+RC=$(WINDRES)
+RCFLAGS=-D__MINGW32__ -DWIN32 -D_WIN32_IE=0x400 $(RCFILES)
+RCFLAGSOUTRES=
 RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=
 
-DLLPOSTFIX=gi
 PCHPOST=.gch
 
 ADVAPI32LIB=-ladvapi32
@@ -190,12 +179,11 @@ SHELL32LIB=-lshell32
 GDI32LIB=-lgdi32
 OLE32LIB=-lole32
 OLEAUT32LIB=-loleaut32
-UUIDLIB=$(PSDK_HOME)$/lib$/uuid.lib
+UUIDLIB=-luuid
 WINSPOOLLIB=-lwinspool
 IMM32LIB=-limm32
 VERSIONLIB=-lversion
 WINMMLIB=-lwinmm
-WSOCK32LIB=-lwsock32
 MPRLIB=-lmpr
 WS2_32LIB=-lws2_32
 KERNEL32LIB=-lkernel32
@@ -203,15 +191,26 @@ USER32LIB=-luser32
 LIBCMT=-lmsvcrt
 COMDLG32LIB=-lcomdlg32
 COMCTL32LIB=-lcomctl32
-CRYPT32LIB=$(PSDK_HOME)$/lib$/crypt32.lib
-GDIPLUSLIB=$(PSDK_HOME)$/lib$/gdiplus.lib
-DBGHELPLIB=$(PSDK_HOME)$/lib$/dbghelp.lib
-MSILIB=$(PSDK_HOME)$/lib$/msi.lib
-DDRAWLIB=$(DIRECTXSDK_LIB)/ddraw.lib
-SHLWAPILIB=$(PSDK_HOME)$/lib$/shlwapi.lib
-URLMONLIB=$(PSDK_HOME)$/lib$/urlmon.lib
-UNICOWSLIB=$(PSDK_HOME)$/lib$/unicows.lib
+CRYPT32LIB=-lcrypt32
+DDRAWLIB=-lddraw
+SHLWAPILIB=-lshlwapi
 WININETLIB=-lwininet
 OLDNAMESLIB=-lmoldname
-MSIMG32LIB=$(PSDK_HOME)$/lib$/msimg32.lib
+MSIMG32LIB=-lmsimg32
 PROPSYSLIB=-lpropsys
+
+# Libraries that neither mingw.org or mingw-w64 have.
+# Thus have to use the Windows SDK ones.
+GDIPLUSLIB=$(WINDOWS_SDK_HOME)$/lib$/gdiplus.lib
+MSILIB=$(WINDOWS_SDK_HOME)$/lib$/msi.lib
+URLMONLIB=$(WINDOWS_SDK_HOME)$/lib$/urlmon.lib
+
+# Libraries that mingw-w64 has but mingw.org doesn't. At least the OBS MinGW
+# cross-compiler is based on mingw-w64. When using MinGW natively on Windows
+# (which as such I don't think we want to support) let's use the Windows SDK
+# libraries.
+.IF "$(CROSS_COMPILING)"=="YES"
+DBGHELPLIB=-ldbghelp
+.ELSE
+DBGHELPLIB=$(WINDOWS_SDK_HOME)$/lib$/dbghelp.lib
+.ENDIF
diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsc.mk
index d70fb134f056..9aca574b0873 100755..100644
--- a/solenv/inc/wntmsci11.mk
+++ b/solenv/inc/wntmsc.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -25,16 +25,17 @@
 #
 #*************************************************************************
 
-# mk file for $(OS)$(COM)$(CPU)$(COMEX) == WNTMSCI11 and WNTMSCI12
+# mk file for $(OS)$(COM)$(CPU)$(COMEX) == WNTMSC[IX]{12,13}
 
-SOLAR_JAVA*=TRUE
-FULL_DESK=TRUE
 JAVAFLAGSDEBUG=-g
 
-# SOLAR JAva Unterstuetzung nur fuer wntmsci
-
+.IF "$(CL_X64)" == ""
 ASM=ml
 AFLAGS=/c /Cp /coff /safeseh
+.ELSE
+ASM=ml64
+AFLAGS=/c /Cp
+.ENDIF
 
 # architecture dependent flags for the C and C++ compiler that can be changed by
 # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
@@ -88,18 +89,16 @@ CFLAGS+=-GS
 
 CFLAGS+=-c -nologo -Gs $(NOLOGO)
 
-CDEFS+= -D_X86_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
+.IF "$(CL_X64)" == ""
+CDEFS+= -D_X86_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS -D_SCL_SECURE_NO_WARNINGS
+.ELSE
+CDEFS+= -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS -D_SCL_SECURE_NO_WARNINGS
+.ENDIF
 
 .IF "$(product)" != ""
 CFLAGS+= -Gy
 .ENDIF # "$(product)" != ""
 
-.IF "$(bndchk)" == ""
-.IF "$(VC_STANDARD)"==""
-CFLAGS+= -Ob1
-.ENDIF	# "$(VC_STANDARD)"==""
-.ENDIF
-
 # flags to enable build with symbols; required for crashdump feature
 #CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)/_ooo_st_$(TARGET).PDB
 CFLAGSENABLESYMBOLS=-Z7 -Yd
@@ -116,16 +115,13 @@ CFLAGS+= -Z7
 .ENDIF
 .ENDIF
 
-.IF "$(FULL_DESK)"!=""
-CDEFS+=-DFULL_DESK
-RSCDEFS+=-DFULL_DESK
-.ENDIF
-
 CFLAGSEXCEPTIONS=-EHa
 CFLAGS_NO_EXCEPTIONS=
 
+.IF "$(CL_X64)" == ""
 # enable boost support for __cdecl (SAL_CALL) C++-UNO interface methods
 CDEFS+=-DBOOST_MEM_FN_ENABLE_CDECL
+.ENDIF
 
 # with the current debug switches PCH won't work
 # anyway. so keep the existing .pch intact and don't
@@ -220,17 +216,20 @@ CFLAGSWERRCC=-WX
 # Once all modules on this platform compile without warnings, set
 # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
 # settings.mk):
-MODULES_WITH_WARNINGS := \
-    soldep
+MODULES_WITH_WARNINGS :=
 
-CDEFS+=-DSTLPORT_VERSION=400 -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
+CDEFS+=-D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
 .IF "$(COMEX)" == "11"
 _VC_MANIFEST_BASENAME=__VC80
 .ELSE
 _VC_MANIFEST_BASENAME=__VC90
 .ENDIF
 
+.IF "$(CL_X64)" == ""
 LINK=link /MACHINE:IX86 /IGNORE:4102 /IGNORE:4197
+.ELSE
+LINK=link /MACHINE:X64
+.ENDIF
     # do *not* add $(NOLOGO) to LINK or LINKFLAGS. Strangely, the wntmsci12 linker links fine then, but exits with
     # a return value 1, which makes dmake think it failed
 .IF "$(PRODUCT)"!="full"
@@ -239,7 +238,9 @@ LINKFLAGS=/MAP /OPT:NOREF
 .ENDIF
 
 # excetion handling protection
+.IF "$(CL_X64)" == ""
 LINKFLAGS+=-safeseh
+.ENDIF
 
 # enable DEP
 LINKFLAGS+=-nxcompat
@@ -288,18 +289,22 @@ LINKFLAGSOPT=
 
 UWINAPILIB*=uwinapi.lib
 .IF "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
+.IF "$(USE_DEBUG_RUNTIME)" != ""
 LIBCMT=msvcrtd.lib
-.ELSE  # "$(USE_STLP_DEBUG)" != ""
+LIBCPMT=msvcprtd.lib
+.ELSE  # "$(USE_DEBUG_RUNTIME)" != ""
 LIBCMT=msvcrt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
+LIBCPMT=msvcprt.lib
+.ENDIF # "$(USE_DEBUG_RUNTIME)" != ""
 .ELSE # "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
+.IF "$(USE_DEBUG_RUNTIME)" != ""
 LIBCMT=libcmtd.lib
+LIBCPMT=libcpmtd.lib
 CDEFS+=-D_DEBUG
-.ELSE  # "$(USE_STLP_DEBUG)" != ""
+.ELSE  # "$(USE_DEBUG_RUNTIME)" != ""
 LIBCMT=libcmt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
+LIBCPMT=libcpmt.lib
+.ENDIF # "$(USE_DEBUG_RUNTIME)" != ""
 .ENDIF # "$(DYNAMIC_CRT)"!=""
 
 STDOBJVCL=$(L)/salmain.obj
@@ -308,42 +313,27 @@ STDSLOGUI=
 STDOBJCUI=
 STDSLOCUI=
 
-STDLIBGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-STDLIBCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-STDSHLGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=stlport_vc71_stldebug.lib
-LIBSTLPORTST=stlport_vc71_stldebug_static.lib
-.ELSE
-LIBSTLPORT=stlport_vc71.lib
-LIBSTLPORTST=stlport_vc71_static.lib
-.ENDIF
-
-.IF "$(PROF_EDITION)" == ""
-ATL_INCLUDE*=$(COMPATH)/PlatformSDK/include/atl
-ATL_LIB*=$(COMPATH)/atlmfc/lib
-MFC_INCLUDE*=$(COMPATH)/PlatformSDK/include/mfc
-MFC_LIB*=$(COMPATH)/atlmfc/lib
-.ELSE
-ATL_INCLUDE*=$(COMPATH)/atlmfc/include
-ATL_LIB*=$(COMPATH)/atlmfc/lib
-MFC_INCLUDE*=$(COMPATH)/atlmfc/include
-MFC_LIB*=$(COMPATH)/atlmfc/lib
-.ENDIF
+STDLIBGUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+STDLIBCUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+STDSHLGUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+STDSHLCUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
 
 LIBMGR=lib $(NOLOGO)
 IMPLIB=lib
 LIBFLAGS=
 
+.IF "$(CL_X64)" == ""
 IMPLIBFLAGS=-machine:IX86
+.ELSE
+IMPLIBFLAGS=-machine:X64
+.ENDIF
 
 MAPSYM=
 MAPSYMFLAGS=
 
 RC=rc
-RCFLAGS=-r -DWIN32 -fo$@ $(RCFILES)
+RCFLAGS=-r -DWIN32 $(RCFILES)
+RCFLAGSOUTRES=-fo
 RCLINK=rc
 RCLINKFLAGS=
 RCSETVERSION=
@@ -352,7 +342,6 @@ MT=mt.exe
 MTFLAGS=$(NOLOGO)
 
 
-DLLPOSTFIX=mi
 PCHPOST=.pch
 
 CSC*=$(FLIPCMD) csc
@@ -368,7 +357,6 @@ WINSPOOLLIB=winspool.lib
 IMM32LIB=imm32.lib
 VERSIONLIB=version.lib
 WINMMLIB=winmm.lib
-WSOCK32LIB=wsock32.lib
 MPRLIB=mpr.lib
 WS2_32LIB=ws2_32.lib
 KERNEL32LIB=kernel32.lib
@@ -382,9 +370,7 @@ MSILIB=msi.lib
 DDRAWLIB=ddraw.lib
 SHLWAPILIB=shlwapi.lib
 URLMONLIB=urlmon.lib
-UNICOWSLIB=unicows.lib
 WININETLIB=wininet.lib
 OLDNAMESLIB=oldnames.lib
 MSIMG32LIB=msimg32.lib
 PROPSYSLIB=propsys.lib
-
diff --git a/solenv/inc/wntmsci10.mk b/solenv/inc/wntmsci10.mk
deleted file mode 100644
index 5c959f7d0e3c..000000000000
--- a/solenv/inc/wntmsci10.mk
+++ /dev/null
@@ -1,343 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for $(OS)$(COM)$(CPU)$(COMEX) == WNTMSCI10
-
-SOLAR_JAVA*=TRUE
-FULL_DESK=TRUE
-JAVAFLAGSDEBUG=-g
-
-# SOLAR JAva Unterstuetzung nur fuer wntmsci
-
-ASM=ml
-AFLAGS=/c /Cp /coff /safeseh
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-CC*:=cl
-.IF "$(bndchk)" != ""
-CXX*=nmcl
-.ELSE
-.IF "$(truetime)" != ""
-CXX*=nmcl /NMttOn
-.ELSE
-CXX*:=cl
-.ENDIF
-.ENDIF # "$(bndchk)" != ""
-
-.IF "$(stoponerror)" != ""
-CXX+= /NMstoponerror
-.ENDIF
-
-.IF "$(nmpass)" != ""
-CXX+= /NMpass
-.ENDIF
-
-.IF "$(ttinlines)" != ""
-CXX+= /NMttInlines
-.ENDIF
-
-.IF "$(ttnolines)" != ""
-CXX+= /NMttNoLines
-.ENDIF
-
-# Flags for COMEX == 10
-
-CFLAGS+=-Zm500 -Zc:forScope -GR
-CFLAGS+=-c -nologo -Gs $(NOLOGO)
-
-CDEFS+= -D_X86_=1
-
-.IF "$(product)" != ""
-CFLAGS+= -Gy
-.ENDIF # "$(product)" != ""
-
-.IF "$(bndchk)" == ""
-.IF "$(VC_STANDARD)"==""
-CFLAGS+= -Ob1
-.ENDIF	# "$(VC_STANDARD)"==""
-.ENDIF
-
-# flags to enable build with symbols; required for crashdump feature
-#CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)/_ooo_st_$(TARGET).PDB
-# full debug for RE builds only due to size concerns
-.IF "$(UPDATER)"!=""
-CFLAGSENABLESYMBOLS=-Z7 -Yd
-.ELSE				# "$(UPDATER)"!=""
-# -Zd got higher priority and overrides debug switches
-.IF "$(debug)"==""
-CFLAGSENABLESYMBOLS=-Zd
-.ENDIF			# "$(debug)"==""
-.ENDIF				# "$(UPDATER)"!=""
-
-.IF "$(bndchk)" != ""
-.IF "$(debug)" == ""
-CFLAGS+= -Z7
-.ENDIF
-.ENDIF
-
-.IF "$(truetime)" != ""
-.IF "$(debug)" == ""
-CFLAGS+= -Z7
-.ENDIF
-.ENDIF
-
-.IF "$(FULL_DESK)"!=""
-CDEFS+=-DFULL_DESK
-RSCDEFS+=-DFULL_DESK
-.ENDIF
-
-CFLAGSEXCEPTIONS=-GX
-CFLAGS_NO_EXCEPTIONS=
-
-CFLAGS_CREATE_PCH=-I$(INCPCH) -Fo$(SLO)/pchname.obj -Ycprecompiled_$(PRJNAME).hxx -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
-.IF "$(CALL_CDECL)"=="TRUE"
-CFLAGSCALL=-Gd
-.ELSE			# "$(CALL_CDECL)"=="TRUE"
-CFLAGSCALL=-Gz
-.ENDIF			# "$(CALL_CDECL)"=="TRUE"
-
-CFLAGSCC=$(ARCH_FLAGS)
-.IF "$(DYNAMIC_CRT)"!=""
-CDEFSSLOMT+=-DWIN32 -D_MT -D_DLL
-CDEFSSLOMT+=-DWIN32 -D_MT -D_DLL
-.IF "$(NO_DYNAMIC_OBJ)"==""
-CDEFSOBJMT+=-DWIN32 -D_MT -D_DLL
-CDEFSOBJMT+=-DWIN32 -D_MT -D_DLL
-.ELSE
-CDEFSOBJMT+=-DWIN32 -D_MT
-CDEFSOBJMT+=-DWIN32 -D_MT
-.ENDIF
-.ELSE
-CDEFSSLOMT+=-DWIN32 -D_MT
-CDEFSSLOMT+=-DWIN32 -D_MT
-CDEFSOBJMT+=-DWIN32 -D_MT
-CDEFSOBJMT+=-DWIN32 -D_MT
-.ENDIF
-CFLAGSPROF=-Gh -Fd$(MISC)/$(@:b).pdb
-CFLAGSDEBUG=-Zi -Fd$(MISC)\_ooo_st_$(TARGET).PDB
-CFLAGSDBGUTIL=
-.IF "$(VC_STANDARD)"==""
-CFLAGSOPT=-Oxs -Oy-
-CFLAGSNOOPT=-Od
-.ELSE			#  "$(VC_STANDARD)"==""
-CFLAGSOPT=
-CFLAGSNOOPT=
-.ENDIF			#  "$(VC_STANDARD)"==""
-CFLAGSOUTOBJ=-Fo
-
-# For C and C++, certain warnings are disabled globally, as they result in
-# spurious warnings and are hard or impossible to workaround:
-# - "warning C4061: enumerate in switch of enum is not explicitly handled by a
-#   case label",
-# - "warning C4063: case 'identifier' is not a valid value for switch of enum
-#   'enumeration'",
-# - "warning C4127: conditional expression is constant",
-# - "warning C4191: unsafe conversion from function type to function type",
-# - "warning C4217: member template functions cannot be used for copy-assignment
-#   or copy-construction",
-# - "warning C4250: 'class1' : inherits 'class2::member' via dominance",
-# - "warning C4292: compiler limit : terminating debug information emission",
-# - "warning C4344: behavior change: use of explicit template arguments results
-#   in call to 'function",
-# - "warning C4347: behavior change: 'overload A' is called instead of
-#   'overload B'",
-# - "warning C4355: 'this' used in base member initializer list",
-# - "warning C4503: 'identifier': decorated name length exceeded, name was
-#   truncated" (http://msdn2.microsoft.com/en-us/library/074af4b6.aspx),
-# - "warning C4511: copy constructor could not be generated",
-# - "warning C4512: assignment operator could not be generated",
-# - "warning C4514: unreferenced inline function has been removed",
-# - "warning C4611: interaction between '_setjmp' and C++ object destruction is
-#   non-portable",
-# - "warning C4619: warning Cnnnn unknown",
-# - "warning C4625: copy constructor could not be generated because a base class
-#   copy constructor is inaccessible",
-# - "warning C4626: assignment operator could not be generated because a base
-#   class assignment operator is inaccessible",
-# - "warning C4675: resolved overload was found by argument-dependent lookup",
-# - "warning C4686: possible change in behavior, change in UDT return calling
-#   convention",
-# - "warning C4710: function not inlined",
-# - "warning C4711: function selected for automatic inline expansion",
-# - "warning C4820: padding added after member".
-# For C, certain warnings from system headers (stdlib.h etc.) have to be
-# disabled globally (for C++, this is not necessary, as the system headers are
-# wrapped by STLport):
-# - "warning C4255: no function prototype given: converting '()' to '(void)'".
-CFLAGSWARNCXX=-Wall -wd4061 -wd4063 -wd4127 -wd4191 -wd4217 -wd4250 -wd4251 \
-    -wd4275 -wd4290 -wd4292 -wd4294 -wd4344 -wd4347 -wd4355 -wd4503 -wd4511 \
-    -wd4512 -wd4514 -wd4611 -wd4619 -wd4625 -wd4626 -wd4640 -wd4675 -wd4686 \
-    -wd4710 -wd4711 -wd4786 -wd4800 -wd4820
-CFLAGSWARNCC=$(CFLAGSWARNCXX) -wd4255
-CFLAGSWALLCC=$(CFLAGSWARNCC)
-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-WX
-
-# Once all modules on this platform compile without warnings, set
-# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
-# settings.mk):
-MODULES_WITH_WARNINGS := \
-    lingucomponent \
-    soldep
-
-CDEFS+=-DSTLPORT_VERSION=$(STLPORT_VER) -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
-
-COMMENTFLAG=/COMMENT:"$(PRJNAME)_$(UPD)_$(VCSID)_"
-
-LINK=link $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86
-LINKOUTPUTFILTER= $(PIPEERROR) $(GREP) -v "LNK4197:"
-.IF "$(PRODUCT)"!="full"
-.ELSE
-LINKFLAGS=/MAP /OPT:NOREF
-.ENDIF
-
-.IF "$(linkinc)" != ""
-LINKFLAGS=-NODEFAULTLIB -DEBUG:full -DEBUGTYPE:cv -INCREMENTAL:YES
-MAPFILE=
-.ELSE # "$(linkinc)" != ""
-.IF "$(PRODUCT)"!="full"
-LINKFLAGS+= -NODEFAULTLIB -DEBUG:full -DEBUGTYPE:cv
-.ELSE # "$(PRODUCT)"!="full"
-LINKFLAGS+= -NODEFAULTLIB -RELEASE -DEBUG:full
-.ENDIF # "$(PRODUCT)"!="full"
-MAPFILE=-out:$$@
-.ENDIF # "$(linkinc)" != ""
-
-.IF "$(bndchk)" != ""
-LINK=nmlink $(COMMENTFLAG) $(NOLOGO) -MACHINE:IX86
-LINKFLAGS=-NODEFAULTLIB -DEBUG:full -DEBUGTYPE:cv
-.ENDIF
-
-.IF "$(truetime)" != ""
-LINK=nmlink /NMttOn $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86
-LINKFLAGS=/NODEFAULTLIB /DEBUG:full /DEBUGTYPE:cv
-.ENDIF
-
-LINKFLAGSAPPGUI=/SUBSYSTEM:WINDOWS,4.0
-LINKFLAGSSHLGUI=/SUBSYSTEM:WINDOWS,4.0 /DLL
-LINKFLAGSAPPCUI=/SUBSYSTEM:CONSOLE /BASE:0x1b000000
-LINKFLAGSSHLCUI=/SUBSYSTEM:CONSOLE /DLL
-LINKFLAGSTACK=/STACK:
-LINKFLAGSPROF=-DEBUG:mapped,partial -DEBUGTYPE:coff cap.lib
-LINKFLAGSWST=-DEBUG:mapped,partial -DEBUGTYPE:coff wst.lib -NODEFAULTLIB
-LINKFLAGSDEBUG=-DEBUG:full -DEBUGTYPE:cv
-LINKFLAGSOPT=
-
-UWINAPILIB*=uwinapi.lib
-.IF "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT=msvcrtd.lib
-.ELSE  # "$(USE_STLP_DEBUG)" != ""
-LIBCMT=msvcrt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-.ELSE			# "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT=libcmtd.lib
-.ELSE  # "$(USE_STLP_DEBUG)" != ""
-LIBCMT=libcmt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-.ENDIF			# "$(DYNAMIC_CRT)"!=""
-
-STDOBJVCL=$(L)/salmain.obj
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-STDLIBGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib psapi.lib
-STDLIBCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib psapi.lib
-STDSHLGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib psapi.lib
-STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib psapi.lib
-
-.IF "$(USE_STLP_DEBUG)" != ""
-CFLAGS+=-MTd
-LIBSTLPORT=stlport_vc71_stldebug.lib
-LIBSTLPORTST=stlport_vc71_stldebug_static.lib
-.ELSE
-LIBSTLPORT=stlport_vc71.lib
-LIBSTLPORTST=stlport_vc71_static.lib
-.ENDIF
-
-ATL_INCLUDE*=$(COMPATH)/atlmfc/include
-ATL_LIB*=$(COMPATH)/atlmfc/lib
-
-LIBMGR=lib $(NOLOGO)
-IMPLIB=lib
-LIBFLAGS=
-
-IMPLIBFLAGS=-machine:IX86
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=rc
-RCFLAGS=-r -DWIN32 -fo$@ $(RCFILES)
-RCLINK=rc
-RCLINKFLAGS=
-RCSETVERSION=
-
-
-DLLPOSTFIX=mi
-PCHPOST=.pch
-
-CSC*=$(FLIPCMD) csc
-VBC*=vbc
-
-ADVAPI32LIB=advapi32.lib
-SHELL32LIB=shell32.lib
-GDI32LIB=gdi32.lib
-OLE32LIB=ole32.lib
-OLEAUT32LIB=oleaut32.lib
-UUIDLIB=uuid.lib
-WINSPOOLLIB=winspool.lib
-IMM32LIB=imm32.lib
-VERSIONLIB=version.lib
-WINMMLIB=winmm.lib
-WSOCK32LIB=wsock32.lib
-MPRLIB=mpr.lib
-WS2_32LIB=ws2_32.lib
-KERNEL32LIB=kernel32.lib
-USER32LIB=user32.lib
-COMDLG32LIB=comdlg32.lib
-COMCTL32LIB=comctl32.lib
-CRYPT32LIB=crypt32.lib
-GDIPLUSLIB=gdiplus.lib
-DBGHELPLIB=dbghelp.lib
-MSILIB=msi.lib
-DDRAWLIB=ddraw.lib
-SHLWAPILIB=shlwapi.lib
-URLMONLIB=urlmon.lib
-UNICOWSLIB=unicows.lib
-WININETLIB=wininet.lib
-OLDNAMESLIB=oldnames.lib
-MSIMG32LIB=msimg32.lib
-
diff --git a/solenv/prj/d.lst b/solenv/prj/d.lst
index 05ceea226515..9972651fb090 100755
--- a/solenv/prj/d.lst
+++ b/solenv/prj/d.lst
@@ -1,4 +1,4 @@
-mkdir: %_DEST%\bin%_EXT%
-mkdir: %_DEST%\inc%_EXT%
-..\inc\version.lst %_DEST%\bin%_EXT%\version.lst
-..\%__SRC%\inc\versionlist.hrc %_DEST%\inc%_EXT%\versionlist.hrc
+mkdir: %_DEST%\bin
+mkdir: %_DEST%\inc
+..\inc\version.lst %_DEST%\bin\version.lst
+..\%__SRC%\inc\versionlist.hrc %_DEST%\inc\versionlist.hrc
diff --git a/solenv/src/version.c b/solenv/src/version.c
index b06b1510f300..f39f29872262 100644
--- a/solenv/src/version.c
+++ b/solenv/src/version.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,11 +51,11 @@ static const struct VersionInfo g_aVersionInfo =
     _INPATH
 };
 
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
 __declspec(dllexport) const struct VersionInfo* GetVersionInfo(void);
 #endif
 
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
 __declspec(dllexport) const struct VersionInfo* GetVersionInfo(void)
 #else
 const struct VersionInfo *GetVersionInfo(void)
@@ -63,17 +64,4 @@ const struct VersionInfo *GetVersionInfo(void)
     return &g_aVersionInfo;
 }
 
-#if 0
-#include <stdio.h>
-
-int main( int argc, char **argv )
-{
-    const VersionInfo *pInfo = GetVersionInfo();
-    fprintf( stderr, "Date : %s\n", pInfo->pDate);
-    fprintf( stderr, "Time : %s\n", pInfo->pTime);
-    fprintf( stderr, "UPD : %s\n", pInfo->pUpd);
-    delete pInfo;
-    return 0;
-}
-#endif
-
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/unxmacxp/inc/poll.h b/solenv/unxmacxp/inc/poll.h
index 761b59dbec1f..00c6cbacf32a 100644
--- a/solenv/unxmacxp/inc/poll.h
+++ b/solenv/unxmacxp/inc/poll.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 // poll.h
 // MacOS X does not implement poll().  Therefore, this replacement
 // is required.  It uses select().
@@ -171,3 +172,5 @@ inline int poll(struct pollfd *pollSet, int pollCount, int pollTimeout)
 #undef FD_SETSIZE
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/adjustvisibility/adjustvisibility.cxx b/soltools/adjustvisibility/adjustvisibility.cxx
index e67017018b1a..9e06e8347fd9 100644
--- a/soltools/adjustvisibility/adjustvisibility.cxx
+++ b/soltools/adjustvisibility/adjustvisibility.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -241,11 +242,12 @@ void processObject(const std::string& rFile, bool bPreserve, bool bVerbose)
 
     if ( bPreserve ) {
         if ( fstat(fd, &aStatBuf) == -1) {
-             std::string sMessage("adjustVisibilty() failed: can't stat file ");
-             sMessage += rFile;
-             sMessage += ": ";
-             sMessage += std::strerror(errno);
-             throw std::runtime_error(sMessage);
+            close(fd);
+            std::string sMessage("adjustVisibilty() failed: can't stat file ");
+            sMessage += rFile;
+            sMessage += ": ";
+            sMessage += std::strerror(errno);
+            throw std::runtime_error(sMessage);
         }
     }
 
@@ -309,3 +311,5 @@ int main(int argc, char* argv[])
 
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/checkdll/checkdll.c b/soltools/checkdll/checkdll.c
index 7c5473fb2510..a300e0b69d67 100644
--- a/soltools/checkdll/checkdll.c
+++ b/soltools/checkdll/checkdll.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,7 +51,6 @@ void usage()
 
 int main(int argc, char *argv[])
 {
-    int     rc;
     int     silent=0;
     void    *phandle;
     char    *(*pfun)(void);
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
         ++argv, --argc;
     }
 
-    if ( (rc = access( argv[1], R_OK )) == -1 ) {
+    if ( access( argv[1], R_OK ) == -1 ) {
         fprintf(stderr, "%s: ERROR: %s: %s\n",
                 pprog_name, argv[1], strerror(errno));
         return 2;
@@ -95,3 +95,4 @@ int main(int argc, char *argv[])
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/checkdll/makefile.mk b/soltools/checkdll/makefile.mk
index fc09a566005e..2b7e71be98df 100644
--- a/soltools/checkdll/makefile.mk
+++ b/soltools/checkdll/makefile.mk
@@ -40,18 +40,19 @@ NO_DEFAULT_STL=TRUE
 # --- Files --------------------------------------------------------
 
 
-.IF "$(GUI)"=="UNX"
+.IF "$(GUI)"=="UNX" && "$(CROSS_COMPILING)"!="YES"
 LIBSALCPPRT=$(0)
 APP1TARGET	= 	checkdll
 APP1OBJS	=	$(OBJ)$/checkdll.obj
 DEPOBJFILES	=	$(APP1OBJS) 
-.IF "$(OS)"!="FREEBSD" && "$(OS)"!="MACOSX" && "$(OS)"!="NETBSD"
+.IF "$(OS)"!="FREEBSD" && "$(OS)"!="MACOSX" && "$(OS)"!="NETBSD" \
+	&& "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY"
 STDLIB += -ldl
 .ENDIF
 .IF "$(OS)"=="NETBSD"
 APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
 .ENDIF
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(GUI)"=="UNX" && "$(CROSS_COMPILING)"!="YES"
 
 # --- Targets ------------------------------------------------------
 
diff --git a/soltools/cpp/_cpp.c b/soltools/cpp/_cpp.c
index 134bf0075cf2..c1a2d7f81b40 100644
--- a/soltools/cpp/_cpp.c
+++ b/soltools/cpp/_cpp.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -298,7 +299,7 @@ void
 }
 
 void *
-    domalloc(int size)
+    domalloc(size_t size)
 {
     void *p = malloc(size);
 
@@ -381,3 +382,5 @@ void
         nerrs = 1;
     fflush(stderr);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_eval.c b/soltools/cpp/_eval.c
index a6406faed788..189a15b29562 100644
--- a/soltools/cpp/_eval.c
+++ b/soltools/cpp/_eval.c
@@ -1,8 +1,10 @@
-#include "cpp.h"
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 #include <stdlib.h>
 #include <string.h>
 
+#include "cpp.h"
+
 #define NSTAK   32
 #define SGN 0
 #define UNS 1
@@ -234,7 +236,8 @@ long
 {
     Token *tp;
     Nlist *np;
-    int ntok, rnd;
+    size_t  ntok;
+    int rnd;
 
     trp->tp++;
     if (kw == KIFDEF || kw == KIFNDEF)
@@ -765,3 +768,5 @@ int
                 i = -1;
     return i;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_getopt.c b/soltools/cpp/_getopt.c
index 589638936efb..65c5d5179a20 100644
--- a/soltools/cpp/_getopt.c
+++ b/soltools/cpp/_getopt.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include    <stdio.h>
 #include    <string.h>
 
@@ -69,3 +70,5 @@ int
     }
     return c;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_include.c b/soltools/cpp/_include.c
index da2bf03c8ff4..5daa02a4ffbb 100644
--- a/soltools/cpp/_include.c
+++ b/soltools/cpp/_include.c
@@ -1,4 +1,5 @@
-#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__))
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#if (defined(_WIN32) || defined(__IBMC__))
 #   include <io.h>
 #else
 #   include <unistd.h>
@@ -12,10 +13,6 @@
 #include <string.h>
 #include <fcntl.h>
 
-
-#ifdef __hpux
-#   define _HPUX_SOURCE
-#endif
 #if defined(__IBMC__) || defined(__EMX__)
 #   include <fcntl.h>
 #   define PATH_MAX _MAX_PATH
@@ -233,3 +230,4 @@ void
     }
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_lex.c b/soltools/cpp/_lex.c
index 2236fd9db260..32f8cdfcadf6 100644
--- a/soltools/cpp/_lex.c
+++ b/soltools/cpp/_lex.c
@@ -1,7 +1,8 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__))
+#if (defined(_WIN32) || defined(__IBMC__))
 #include <io.h>
 #else
 #include <unistd.h>
@@ -634,7 +635,7 @@ Source *
     setsource(char *name, int path, int fd, char *str, int wrap)
 {
     Source *s = new(Source);
-    int len;
+    size_t len;
 
     s->line = 1;
     s->lineinc = 0;
@@ -686,3 +687,5 @@ void
     cursource = s->next;
     dofree(s);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c
index fe7d22f82373..294606524864 100644
--- a/soltools/cpp/_macro.c
+++ b/soltools/cpp/_macro.c
@@ -1,12 +1,10 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #ifdef _MSC_VER
 #   define _POSIX_
 #endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef __hpux
-#   define _HPUX_SOURCE
-#endif
 #if defined(__IBMC__) || defined(__EMX__)
 #   define PATH_MAX _MAX_PATH
 #endif
@@ -45,14 +43,13 @@ void
     args = NULL;
     if (tp < trp->lp && tp->type == LP && tp->wslen == 0)
     {
-        /* macro with args */
-        int narg = 0;
-
         tp += 1;
         args = new(Tokenrow);
         maketokenrow(2, args);
         if (tp->type != RP)
         {
+            /* macro with args */
+            size_t narg = 0;
             int err = 0;
 
             for (;;)
@@ -292,9 +289,8 @@ void
 void
     expand(Tokenrow * trp, Nlist * np, MacroValidatorList * pValidators)
 {
-//  Token * pOldNextTp;
     Tokenrow ntr;
-    int ntokc, narg, i;
+    int ntokc, narg;
     Tokenrow *atr[NARG + 1];
 
     if (Mflag == 2)
@@ -310,6 +306,8 @@ void
         ntokc = 1;
     else
     {
+        int i;
+
         ntokc = gatherargs(trp, atr, &narg);
         if (narg < 0)
         {                               /* not actually a call (no '(') */
@@ -341,32 +339,12 @@ void
         }
     }
 
-/* old
-    np->flag |= ISACTIVE;
-*/
-
-/* rh
-*/
     doconcat(&ntr);                     /* execute ## operators */
     ntr.tp = ntr.bp;
     makespace(&ntr, trp->tp);
 
-/* old
-//  expandrow(&ntr, "<expand>");
-//  insertrow(trp, ntokc, &ntr);
-//  dofree(ntr.bp);
-//  np->flag &= ~ISACTIVE;
-*/
-
-/* NP
-        // Replace macro by its value:
-*/
-//  pOldNextTp = trp->tp+ntokc;
     tokenrow_zeroTokenIdentifiers(&ntr);
     insertrow(trp, ntokc, &ntr);
-        /* Reassign old macro validators:
-        */
-//  mvl_move(pValidators, trp->tp - pOldNextTp);
 
         /* add validator for just invalidated macro:
         */
@@ -514,7 +492,7 @@ void
                 error(ERROR, "# not followed by macro parameter");
                 continue;
             }
-            ntok = 1 + (rtr->tp - tp);
+            ntok = 1 + (int)(rtr->tp - tp);
             rtr->tp = tp;
             insertrow(rtr, ntok, stringify(atr[argno]));
             continue;
@@ -552,7 +530,7 @@ void
 {
     Token *ltp, *ntp;
     Tokenrow ntr;
-    int len;
+    size_t len;
 
     for (trp->tp = trp->bp; trp->tp < trp->lp; trp->tp++)
     {
@@ -615,7 +593,7 @@ void
                 doconcat(&ntr);
                 trp->tp = ltp;
                 makespace(&ntr, ltp);
-                insertrow(trp, ntp - ltp, &ntr);
+                insertrow(trp, (int)(ntp - ltp), &ntr);
                 dofree(ntr.bp);
                 trp->tp--;
             }
@@ -637,7 +615,7 @@ int
     for (ap = mac->ap->bp; ap < mac->ap->lp; ap++)
     {
         if (ap->len == tp->len && strncmp((char *) ap->t, (char *) tp->t, ap->len) == 0)
-            return ap - mac->ap->bp;
+            return (int)(ap - mac->ap->bp);
     }
     return -1;
 }
@@ -754,3 +732,4 @@ void
     outptr = op;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_mcrvalid.c b/soltools/cpp/_mcrvalid.c
index 75813837d470..446f86d316d1 100644
--- a/soltools/cpp/_mcrvalid.c
+++ b/soltools/cpp/_mcrvalid.c
@@ -1,16 +1,10 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "cpp.h"
 
-/*
-    Nlist *             pMacro;
-    Token *             pTokenWhereMacroBecomesValid;
-    struct macroValidator *
-                        pNext;
-*/
-
 void
 mvl_init(MacroValidatorList * out_pValidators)
 {
@@ -69,21 +63,6 @@ mvl_add( MacroValidatorList *   inout_pValidators,
     inout_pValidators->pFirst = pNew;
 }
 
-/*
-void
-mvl_move( MacroValidatorList * inout_pValidators,
-          int                  in_nSpace )
-{
-    MacroValidator * pV;
-    for ( pV = inout_pValidators->pFirst;
-          pV != 0;
-          pV = pV->pNext )
-    {
-        pV->pTokenWhereMacroBecomesValid += in_nSpace;
-    }
-}
-*/
-
 void
 mvl_check(  MacroValidatorList * inout_pValidators,
             Token *              inout_pTokenToCheck)
@@ -127,3 +106,4 @@ tokenrow_zeroTokenIdentifiers(Tokenrow* trp)
     }
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_nlist.c b/soltools/cpp/_nlist.c
index a71085bfbbf9..9446b928ca87 100644
--- a/soltools/cpp/_nlist.c
+++ b/soltools/cpp/_nlist.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -115,3 +116,5 @@ Nlist *
     }
     return NULL;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_tokens.c b/soltools/cpp/_tokens.c
index 863de2fbef02..03a4d44d9c08 100644
--- a/soltools/cpp/_tokens.c
+++ b/soltools/cpp/_tokens.c
@@ -1,8 +1,9 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__))
+#if (defined(_WIN32) || defined(__IBMC__))
 #include <io.h>
 #else
 #include <unistd.h>
@@ -193,8 +194,8 @@ void
 Token *
     growtokenrow(Tokenrow * trp)
 {
-    int ncur = trp->tp - trp->bp;
-    int nlast = trp->lp - trp->bp;
+    size_t ncur = trp->tp - trp->bp;
+    size_t nlast = trp->lp - trp->bp;
 
     trp->max = 3 * trp->max / 2 + 1;
     trp->bp = (Token *) realloc(trp->bp, trp->max * sizeof(Token));
@@ -234,7 +235,7 @@ int
 void
     insertrow(Tokenrow * dtr, int ntok, Tokenrow * str)
 {
-    int nrtok = rowlen(str);
+    int nrtok = (int)rowlen(str);
 
     dtr->tp += ntok;
     adjustrow(dtr, nrtok - ntok);
@@ -273,9 +274,8 @@ void
 void
     movetokenrow(Tokenrow * dtr, Tokenrow * str)
 {
-    int nby;
+    size_t nby;
 
-    /* nby = sizeof(Token) * (str->lp - str->bp); */
     nby = (char *) str->lp - (char *) str->bp;
     memmove(dtr->tp, str->bp, nby);
 }
@@ -289,14 +289,13 @@ void
 void
     adjustrow(Tokenrow * trp, int nt)
 {
-    int nby, size;
+    size_t nby, size;
 
     if (nt == 0)
         return;
     size = (trp->lp - trp->bp) + nt;
     while (size > trp->max)
         growtokenrow(trp);
-    /* nby = sizeof(Token) * (trp->lp - trp->tp); */
     nby = (char *) trp->lp - (char *) trp->tp;
     if (nby)
         memmove(trp->tp + nt, trp->tp, nby);
@@ -310,7 +309,7 @@ void
 Tokenrow *
     copytokenrow(Tokenrow * dtr, Tokenrow * str)
 {
-    int len = rowlen(str);
+    int len = (int)rowlen(str);
 
     maketokenrow(len, dtr);
     movetokenrow(dtr, str);
@@ -330,7 +329,7 @@ Tokenrow *
     Tokenrow *ntrp = new(Tokenrow);
     int len;
 
-    len = trp->lp - trp->tp;
+    len = (int)(trp->lp - trp->tp);
     if (len <= 0)
         len = 1;
     maketokenrow(len, ntrp);
@@ -395,7 +394,7 @@ void
     {
         if (tp->type != NL)
         {
-            len = tp->len + tp->wslen;
+            len = (int)(tp->len + tp->wslen);
             p = tp->t - tp->wslen;
 
             /* add parameter check to delete operator? */
@@ -409,7 +408,7 @@ void
                     if( ntp->type == NAME )
                     {
                         uchar* np = ntp->t - ntp->wslen;
-                        int nlen = ntp->len + ntp->wslen;
+                        int nlen = (int)(ntp->len + ntp->wslen);
 
                         memcpy(wbp, "if(", 3 );
                          wbp += 4;
@@ -491,7 +490,7 @@ void
 {
     if (wbp > wbuf)
     {
-        if ( write(1, wbuf, wbp - wbuf) != -1)
+        if ( write(1, wbuf, (int)(wbp - wbuf)) != -1)
             wbp = wbuf;
     else
         exit(1);
@@ -526,10 +525,12 @@ char *
  * Null terminated.
  */
 uchar *
-    newstring(uchar * s, int l, int o)
+    newstring(uchar * s, size_t l, size_t o)
 {
     uchar *ns = (uchar *) domalloc(l + o + 1);
 
     ns[l + o] = '\0';
     return (uchar *) strncpy((char *) ns + o, (char *) s, l) - o;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_unix.c b/soltools/cpp/_unix.c
index 5352f6f1f5f9..5175e48e4ebf 100644
--- a/soltools/cpp/_unix.c
+++ b/soltools/cpp/_unix.c
@@ -1,10 +1,11 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <fcntl.h>
-#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__))
+#if (defined(_WIN32) || defined(__IBMC__))
 #include <io.h>
 #else
 #include <unistd.h>
@@ -12,7 +13,7 @@
 
 #include "cpp.h"
 
-#if defined MACOSX || !defined HAVE_GETOPT
+#if defined MACOSX || defined AIX || !defined HAVE_GETOPT
 extern int stgetopt(int, char *const *, const char *);
 extern char *optarg;
 extern int optind;
@@ -42,7 +43,7 @@ void
     Tokenrow tr;
 
     setup_kwtab();
-#if defined MACOSX || !defined HAVE_GETOPT
+#if defined MACOSX || defined(AIX) || !defined HAVE_GETOPT
     while ((c = stgetopt(argc, argv, "NOPV:I:D:U:F:A:X:u:l:+")) != -1)
 #else
     while ((c = getopt(argc, argv, "NOPV:I:D:U:F:A:X:u:l:+")) != -1)
@@ -134,7 +135,7 @@ void
 
                         case 'w':
                             dp = &optarg[n + 1];
-                            n += strlen(dp);
+                            n += (int)strlen(dp);
                             while (isspace(*dp)) dp++;
 
                             for (i = NINCLUDE - 1; i >= 0; i--)
@@ -172,7 +173,7 @@ void
     {
         if ((fp = strrchr(argv[optind], '/')) != NULL)
         {
-            int len = fp - argv[optind];
+            int len = (int)(fp - argv[optind]);
 
             dp = (char *) newstring((uchar *) argv[optind], len + 1, 0);
             dp[len] = '\0';
@@ -197,38 +198,4 @@ void
 }
 
 
-/* memmove is defined here because some vendors don't provide it at
-   all and others do a terrible job (like calling malloc) */
-
-#if !defined(__IBMC__) && !defined(_WIN32) && !defined(__GLIBC__)
-
-void *
-    memmove(void *dp, const void *sp, size_t n)
-{
-    unsigned char *cdp, *csp;
-
-    if (n <= 0)
-        return 0;
-    cdp = dp;
-    csp = (unsigned char *) sp;
-    if (cdp < csp)
-    {
-        do
-        {
-            *cdp++ = *csp++;
-        } while (--n);
-    }
-    else
-    {
-        cdp += n;
-        csp += n;
-        do
-        {
-            *--cdp = *--csp;
-        } while (--n);
-    }
-    return 0;
-}
-
-#endif
-
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h
index 34e18579c35a..b85d28e0584e 100644
--- a/soltools/cpp/cpp.h
+++ b/soltools/cpp/cpp.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* $Id: cpp.h,v 1.4 2006-06-20 05:07:28 hr Exp $ */
 
 #define INS         32768   /* input buffer                             */
@@ -53,8 +54,8 @@ typedef struct token
 {
     unsigned char type;
     unsigned char flag;
-    unsigned int wslen;
-    unsigned int len;
+    size_t wslen;
+    size_t len;
     uchar *t;
     unsigned int identifier;            /* used from macro processor to identify where a macro becomes valid again. */
 }   Token;
@@ -64,7 +65,7 @@ typedef struct tokenrow
     Token *tp;                          /* current one to scan */
     Token *bp;                          /* base (allocated value) */
     Token *lp;                          /* last+1 token used */
-    int max;                            /* number allocated */
+    size_t max;                         /* number allocated */
 }   Tokenrow;
 
 typedef struct source
@@ -86,7 +87,7 @@ typedef struct nlist
 {
     struct nlist *next;
     uchar *name;
-    int len;
+    size_t len;
     Tokenrow *vp;                       /* value as macro */
     Tokenrow *ap;                       /* list of argument names, if any */
     char val;                           /* value as preprocessor name */
@@ -143,16 +144,7 @@ void        mvl_add(
                                 inout_pValidators,
                 Nlist *         in_pMacro,
                 Token *         in_pTokenWhereMacroBecomesValid);
-/*  Updates all token pointers within the list, when the tokens have
-    moved, by
-        pTokenWhereMacroBecomesValid += in_nNrofTokens;
-    .
 
-void        mvl_move(
-                MacroValidatorList *
-                                inout_pValidators,
-                int             in_nSpace); // in pointer units.
-*/
 /*  Checks if one of the validators within the list points to
     the token in_pTokenToCheck. If so, the macro is set valid and
     the validator is removed.
@@ -173,7 +165,7 @@ Source *setsource(char *, int, int, char *, int);
 void unsetsource(void);
 void puttokens(Tokenrow *);
 void process(Tokenrow *);
-void *domalloc(int);
+void *domalloc(size_t);
 void dofree(void *);
 void error(enum errtype, char *,...);
 void flushout(void);
@@ -210,7 +202,7 @@ void setempty(Tokenrow *);
 void makespace(Tokenrow *, Token *);
 char *outnum(char *, int);
 int digit(int);
-uchar *newstring(uchar *, int, int);
+uchar *newstring(uchar *, size_t, size_t);
 
 #define rowlen(tokrow)  ((tokrow)->lp - (tokrow)->bp)
 
@@ -237,3 +229,4 @@ extern Includelist includelist[NINCLUDE];
 extern Wraplist wraplist[NINCLUDE];
 extern char wd[];
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk
index 533cf9a91ab7..5cada33f9cd4 100644
--- a/soltools/cpp/makefile.mk
+++ b/soltools/cpp/makefile.mk
@@ -37,6 +37,11 @@ NO_DEFAULT_STL=TRUE
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 UWINAPILIB=$(0)
 LIBSALCPPRT=$(0)
 
@@ -55,7 +60,7 @@ OBJFILES= \
 
 # nonstandard cpp options needed for Mac (-isysroot),
 # needs the custom stgetopt defined here :/
-.IF "$(OS)" == "MACOSX" || "$(HAVE_GETOPT)" != "YES"
+.IF "$(OS)" == "MACOSX" || "$(OS)" == "AIX" || "$(HAVE_GETOPT)" != "YES"
 OBJFILES += $(OBJ)$/_getopt.obj
 .ENDIF
 .IF "$(HAVE_GETOPT)" == "YES"
@@ -63,9 +68,7 @@ CDEFS += -DHAVE_GETOPT
 .ENDIF
 
 APP1TARGET	=	$(TARGET)
-.IF "$(GUI)" != "OS2"
 APP1STACK	=	1000000
-.ENDIF
 APP1LIBS	=	$(LB)$/$(TARGET).lib
 APP1DEPN	=   $(LB)$/$(TARGET).lib
 
diff --git a/soltools/giparser/gen_info.cxx b/soltools/giparser/gen_info.cxx
index 838e46287b0c..dd6973a3daef 100644
--- a/soltools/giparser/gen_info.cxx
+++ b/soltools/giparser/gen_info.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -86,3 +87,4 @@ GenericInfo::CreateMyList() const
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/giparser/gi_list.cxx b/soltools/giparser/gi_list.cxx
index 5726a2bf0740..ec03d0a6cd94 100644
--- a/soltools/giparser/gi_list.cxx
+++ b/soltools/giparser/gi_list.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -142,9 +143,9 @@ List_GenericInfo::InsertInfoByPath( GenericInfo *       let_dpInfo,
     {
         Simstr aKey( i_sKeyPath,
                      0,
-                     sNextPathSegment -
+                     (int)(sNextPathSegment -
                         ( *sNextPathSegment == 0 ? 0 : 1)
-                        - i_sKeyPath );
+                           - i_sKeyPath ));
 
         GenericInfo * pNew = new GenericInfo(aKey);
         InsertInfo(pNew,false);
@@ -208,7 +209,7 @@ List_GenericInfo::lower_bound( bool &              o_bExists,
                                KeyPath             i_sKeyPath )
 {
     o_sNextPathSegment = strchr(i_sKeyPath, '/');
-    Simstr sKey( i_sKeyPath, (o_sNextPathSegment == 0 ? strlen(i_sKeyPath) : o_sNextPathSegment++ - i_sKeyPath) );
+    Simstr sKey( i_sKeyPath, (int)(o_sNextPathSegment == 0 ? strlen(i_sKeyPath) : o_sNextPathSegment++ - i_sKeyPath) );
     GenericInfo aSearch(sKey);
 
     unsigned low = 0;
@@ -232,3 +233,4 @@ List_GenericInfo::lower_bound( bool &              o_bExists,
     return &aChildren[low];
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/giparser/gi_parse.cxx b/soltools/giparser/gi_parse.cxx
index ad960e48a1e2..5ee68af64d7b 100644
--- a/soltools/giparser/gi_parse.cxx
+++ b/soltools/giparser/gi_parse.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,7 +69,6 @@ GenericInfo_Parser::GenericInfo_Parser()
         nCurLine(0),
         nLevel(0),
         bGoon(false),
-        // sCurComment,
         eErrorCode(ok),
         nErrorLine(0),
         pResult(0),
@@ -318,18 +318,8 @@ GenericInfo_Parser::WriteList( ostream & o_rFile )
         {
             PushLevel_Write();
 
-/*
-            WriteIndentation();
-            o_rFile.write("{",1);
-            o_rFile.write(C_sLineEnd, C_nLineEndLength);
-*/
             WriteList(o_rFile);
 
-/*
-            WriteIndentation();
-            o_rFile.write("}",1);
-            o_rFile.write(C_sLineEnd, C_nLineEndLength);
-*/
             PopLevel_Write();
         }
     }   // end for
@@ -405,3 +395,4 @@ GenericInfo_Parser::WriteIndentation( ostream &    o_rFile )
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/giparser/makefile.mk b/soltools/giparser/makefile.mk
index bab26d2e7e1b..d7f04dbe82f6 100644
--- a/soltools/giparser/makefile.mk
+++ b/soltools/giparser/makefile.mk
@@ -32,15 +32,16 @@ TARGET=soltools_giparser
 TARGETTYPE=CUI
 ENABLE_EXCEPTIONS=TRUE
 
-.IF "$(GUI)" == "OS2"
-STL_OS2_BUILDING=1
-.ENDIF
-
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 # --- Files --------------------------------------------------------
 
 OBJFILES=\
diff --git a/soltools/giparser/st_gilrw.cxx b/soltools/giparser/st_gilrw.cxx
index d57d8811cb31..bc03cf4cc5f0 100644
--- a/soltools/giparser/st_gilrw.cxx
+++ b/soltools/giparser/st_gilrw.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -106,75 +107,4 @@ ST_InfoListReader::CloseList()
     aListStack.pop_back();
 }
 
-
-#if 0
-ST_InfoListWriter::ST_InfoListWriter()
-{
-
-}
-
-ST_InfoListWriter::~ST_InfoListWriter()
-
-bool
-ST_InfoListWriter::SaveList( const Simstr &      i_sFileName,
-                             List_GenericInfo &  io_rList )
-{
-
-}
-
-E_Error
-ST_InfoListWriter::GetLastError() const
-{
-    return dpParser->GetLastError(o_pErrorLine);
-}
-
-bool
-ST_InfoListWriter::Start_CurList()
-{
-
-}
-
-bool
-ST_InfoListWriter::NextOf_CurList()
-{
-
-}
-
-void
-ST_InfoListWriter::Get_CurKey( char * o_rKey ) const
-{
-
-}
-
-void
-ST_InfoListWriter::Get_CurValue( char * o_rValue ) const
-{
-
-}
-
-void
-ST_InfoListWriter::Get_CurComment( char * o_rComment ) const
-{
-
-}
-
-bool
-ST_InfoListWriter::HasSubList_CurKey() const
-{
-
-}
-
-void
-ST_InfoListWriter::Push_CurList()
-{
-
-}
-
-void
-ST_InfoListWriter::Pop_CurList()
-{
-
-}
-#endif
-
-
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/gen_info.hxx b/soltools/inc/gen_info.hxx
index fae89435bed7..d2a13fa25121 100644
--- a/soltools/inc/gen_info.hxx
+++ b/soltools/inc/gen_info.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -87,3 +88,4 @@ class GenericInfo
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/gi_list.hxx b/soltools/inc/gi_list.hxx
index ad7f8d5e93f8..3444235837a5 100644
--- a/soltools/inc/gi_list.hxx
+++ b/soltools/inc/gi_list.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -213,3 +214,4 @@ List_GenericInfo::End()
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/gi_parse.hxx b/soltools/inc/gi_parse.hxx
index 636e3bffcb9c..a807ed6e2cc0 100644
--- a/soltools/inc/gi_parse.hxx
+++ b/soltools/inc/gi_parse.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -163,3 +164,4 @@ GenericInfo_Parser::GetLastError( UINT32 * o_pErrorLine ) const
 #endif
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/gilacces.hxx b/soltools/inc/gilacces.hxx
index f9dd4c21f4e3..e0702daa93cc 100644
--- a/soltools/inc/gilacces.hxx
+++ b/soltools/inc/gilacces.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -102,3 +103,4 @@ class GenericInfoList_Browser
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/pch/precompiled_soltools.cxx b/soltools/inc/pch/precompiled_soltools.cxx
index 186dcaba7488..9acdfcf875d8 100644
--- a/soltools/inc/pch/precompiled_soltools.cxx
+++ b/soltools/inc/pch/precompiled_soltools.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
 
 #include "precompiled_soltools.hxx"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/pch/precompiled_soltools.hxx b/soltools/inc/pch/precompiled_soltools.hxx
index ef1d1b1f0a1b..3fe93eb8c9fc 100644
--- a/soltools/inc/pch/precompiled_soltools.hxx
+++ b/soltools/inc/pch/precompiled_soltools.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,3 +31,4 @@
 #ifdef PRECOMPILED_HEADERS
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/simstr.hxx b/soltools/inc/simstr.hxx
index 883db0d96bdf..72c99dd93e18 100644
--- a/soltools/inc/simstr.hxx
+++ b/soltools/inc/simstr.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -221,3 +222,4 @@ Simstr::is_empty() const               { return len == 0; }
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/st_gilrw.hxx b/soltools/inc/st_gilrw.hxx
index b70c52e1e75f..7617b503c9ee 100644
--- a/soltools/inc/st_gilrw.hxx
+++ b/soltools/inc/st_gilrw.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -123,3 +124,4 @@ class ST_InfoListWriter : public GenericInfoParseTypes,
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/st_list.hxx b/soltools/inc/st_list.hxx
index adc791f7fdf2..5717e01609f3 100644
--- a/soltools/inc/st_list.hxx
+++ b/soltools/inc/st_list.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,7 +44,7 @@ class ST_List            /// Soltools-List.
                         ST_List();
                         ST_List(
                             const ST_List<XX> & i_rList );
-    virtual             ~ST_List() { }
+    virtual             ~ST_List() { delete[] inhalt; }
 
     // OPERATORS
     ST_List<XX> &       operator=(
@@ -62,7 +63,7 @@ class ST_List            /// Soltools-List.
     void                insert(
                             iterator            i_aPos,
                             const XX &          elem_ )
-                                                { Insert(i_aPos-begin(), elem_); }
+                                                { Insert((unsigned)(i_aPos-begin()), elem_); }
     virtual void        Insert(
                             unsigned            pos,
                             const XX &          elem );
@@ -71,7 +72,7 @@ class ST_List            /// Soltools-List.
                                                 { Insert(size(),elem_); }
     void                remove(
                             iterator            i_aPos )
-                                                { Remove(i_aPos-begin()); }
+                                                { Remove((int)(i_aPos-begin())); }
     virtual void        Remove(
                             unsigned            pos );
     void                pop_back()              { Remove(size()-1); }
@@ -328,3 +329,4 @@ DynamicList<XY>::Remove( unsigned pos )
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/st_types.hxx b/soltools/inc/st_types.hxx
index 29eb7396440c..4aa87d6b81d2 100644
--- a/soltools/inc/st_types.hxx
+++ b/soltools/inc/st_types.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,3 +39,4 @@ typedef short           INT16;
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/javadep/javadep.c b/soltools/javadep/javadep.c
index d0517d832f45..351177a76c6c 100644
--- a/soltools/javadep/javadep.c
+++ b/soltools/javadep/javadep.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,7 +39,7 @@
 #include <ctype.h>
 #include <limits.h>
 
-#if defined(UNX) || defined(OS2)
+#if defined(UNX)
 #include <unistd.h>
 #include <netinet/in.h>     /* ntohl(), ntohs() */
 #elif defined(WNT)
@@ -54,10 +55,6 @@
 #define ntohs(x)    ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))
 #endif
 
-#if defined(OS2)
-#define CDECL
-#endif
-
 /* max. length of line in response file */
 #define RES_FILE_BUF    65536
 
@@ -104,10 +101,10 @@ enum { NGROW_INIT = 10, NGROW = 2 };
 
 static char     *pprogname  = "javadep";
 static char     csep        = ';';
-#if defined (UNX) || defined(OS2)
+#if defined (UNX)
 #define CDECL
 static char     cpathsep    = '/';
-#elif defined (WNT) || defined(OS2)
+#elif defined (WNT)
 static char     cpathsep    = '\\';
 #endif
 static FILE     *pfsout     = NULL;
@@ -118,7 +115,7 @@ static char     *pout_file  = NULL;
 uint8   read_uint8(const file_t *pfile);
 uint16  read_uint16(const file_t *pfile);
 uint32  read_uint32(const file_t *pfile);
-void    skip_bytes(const file_t *pfile, const size_t nnum);
+void    skip_bytes(const file_t *pfile, const long nnum);
 char    *escape_slash(const char *pstr);
 int     is_inner(const char *pstr);
 void    print_dependencies(const struct growable *pdep,
@@ -151,7 +148,7 @@ uint8
 read_uint8(const file_t *pfile)
 {
     /* read a byte from classfile */
-    int nread;
+    size_t nread;
     uint8 ndata;
     nread = fread(&ndata, sizeof(uint8), 1, pfile->pfs);
     if ( !nread ) {
@@ -165,7 +162,7 @@ uint16
 read_uint16(const file_t *pfile)
 {
     /* read a short from classfile and convert it to host format */
-    int nread;
+    size_t nread;
     uint16 ndata;
     nread = fread(&ndata, sizeof(uint16), 1, pfile->pfs);
     if ( !nread ) {
@@ -180,7 +177,7 @@ uint32
 read_uint32(const file_t *pfile)
 {
     /* read an int from classfile and convert it to host format */
-    int nread;
+    size_t nread;
     uint32 ndata;
     nread = fread(&ndata, sizeof(uint32), 1, pfile->pfs);
     if ( !nread ) {
@@ -202,7 +199,7 @@ read_utf8(const file_t *pfile)
      */
 
     utf8_t  a_utf8;
-    int     nread;
+    size_t  nread;
 
     a_utf8.pdata = NULL;
 
@@ -254,7 +251,7 @@ char *utf8tolatin1(const utf8_t a_utf8)
 
 
 void
-skip_bytes(const file_t *pfile, const size_t nnumber)
+skip_bytes(const file_t *pfile, const long nnumber)
 {
     /* skip a nnumber of bytes in classfile */
     if ( fseek(pfile->pfs, nnumber, SEEK_CUR) == -1 )
@@ -269,7 +266,7 @@ add_to_dependencies(struct growable *pdep,
 {
     /* create dependencies */
     int i;
-    int nlen_filt, nlen_str, nlen_pdepstr;
+    size_t nlen_filt, nlen_str, nlen_pdepstr;
     char *pstr, *ptrunc;
     char path[PATH_MAX+1];
     char cnp_class_file[PATH_MAX+1];
@@ -301,7 +298,7 @@ add_to_dependencies(struct growable *pdep,
             }
 
             /* get the canonical path */
-#if defined (UNX) || defined(OS2)
+#if defined (UNX)
             if ( !(realpath(pclass_file, cnp_class_file)
                 && realpath(path, cnp_str) ) ) {
                 err_quit("can't get the canonical path");
@@ -344,7 +341,7 @@ escape_slash(const char *pstr)
     const char *pp = pstr;
     char *p, *pnp;
     char *pnew_str;
-    int nlen_pnp, nlen_pp;
+    size_t nlen_pnp, nlen_pp;
     int i = 0;
 
     while ( (p=strchr(pp, cpathsep)) != NULL ) {
@@ -453,9 +450,12 @@ process_class_file(const char *pfilename, const struct growable *pfilt)
     ncnt = read_uint16(&file);
 
 #ifdef DEBUG
-    printf("Magic: %p\n", (void*)nmagic);
+    printf("Magic: %x\n", nmagic);
     printf("Major %d, Minor %d\n", nmajor, nminor);
     printf("Const_pool_count %d\n", ncnt);
+#else
+    (void)nmajor;
+    (void)nminor;
 #endif
 
     /* There can be ncount entries in the constant_pool table
@@ -603,9 +603,11 @@ xcalloc(size_t nmemb, size_t size)
 void *
 xrealloc(void *ptr, size_t size)
 {
-    ptr = realloc(ptr, size);
+    void *newptr = realloc(ptr, size);
 
-    if ( !ptr )
+    if (newptr)
+        ptr = newptr;
+    else
         err_quit("out of memory");
 
     return ptr;
@@ -703,7 +705,8 @@ void
 create_filters(struct growable *pfilt, const struct growable *pinc)
 {
     char *p, *pp, *pstr;
-    int i, nlen, nlen_pstr;
+    int i;
+    size_t nlen, nlen_pstr;
     /* break up includes into filter list */
     for ( i = 0; i < pinc->ncur; i++ ) {
         pp = pinc->parray[i];
@@ -909,3 +912,4 @@ main(int argc, char *argv[])
     exit(0);
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/javadep/makefile.mk b/soltools/javadep/makefile.mk
index 1b3b54de6c06..e6dcf32350f2 100644
--- a/soltools/javadep/makefile.mk
+++ b/soltools/javadep/makefile.mk
@@ -37,6 +37,11 @@ NO_DEFAULT_STL=TRUE
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 UWINAPILIB=$(0)
 LIBSALCPPRT=$(0)
 
diff --git a/soltools/ldump/hashtbl.cxx b/soltools/ldump/hashtbl.cxx
index 27d48926f0df..712357f3a7fe 100644
--- a/soltools/ldump/hashtbl.cxx
+++ b/soltools/ldump/hashtbl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -100,19 +101,6 @@ HashTable::~HashTable()
     // Problem: Virtuelle Funktionen sind im Destructor nicht virtuell!!
     //          Der Code mu� deshalb ins Macro
 
-    /*
-    if (m_bOwner)
-    {
-        for (ULONG i=0; i<GetSize(); i++)
-        {
-            void *pObject = GetObjectAt(i);
-
-            if (pObject != NULL)
-                OnDeleteObject(pObject());
-        }
-    }
-    */
-
     // Speicher f�r HashItems freigeben
     delete [] m_pData;
 }
@@ -456,3 +444,5 @@ void* HashTableIterator::FindValidObject(bool bForward)
 
     return pObject;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/ldump/hashtbl.hxx b/soltools/ldump/hashtbl.hxx
index 62d1f8e9120e..b3aa621dcb21 100644
--- a/soltools/ldump/hashtbl.hxx
+++ b/soltools/ldump/hashtbl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -109,3 +110,4 @@ public:
 
 #endif // _HASHTBL_HXX
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/ldump/ldump.cxx b/soltools/ldump/ldump.cxx
index 8c6e85b62594..d8dab54b2390 100644
--- a/soltools/ldump/ldump.cxx
+++ b/soltools/ldump/ldump.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -164,7 +165,6 @@ bool LibDump::Dump()
                         *pEnd = '\0';
                     strncpy( aBuf, pFound, strlen( pFound));
                     aBuf[ strlen( pFound) ] = '\0';
-//                    fprintf( stderr, "\n--- %s\n", aBuf);
                     break;
                 }
                 else
@@ -175,7 +175,7 @@ bool LibDump::Dump()
             }
         }
 
-        if ((aBuf[0] =='?') || !strncmp(aBuf, "__CT",4))
+        if (aBuf[0] =='?')
         {
             nLen = (int) strlen(aBuf);
             memset( aName, 0, sizeof( aName ) );
@@ -191,7 +191,10 @@ bool LibDump::Dump()
             // und raus damit
             PrintSym( aName, bExportByName );
         }
-        else if ( bAll == true )
+        else if ( bAll == true &&
+                  strncmp(aBuf, "__real@", 7) != 0 &&
+                  strncmp(aBuf, "__CT",4) != 0 &&
+                  strncmp(aBuf, "__TI3?", 6) != 0 )
         {
             int nPreLen = (int) strlen( cAPrefix );
 
@@ -207,11 +210,12 @@ bool LibDump::Dump()
                   nName++;
               }
             }
-            //fprintf( stderr, "Gefundenen Prefix : %s %d \n", aTmpBuf, nPreLen );
             // den ersten _ raus
             nLen = (int) strlen(aName);
+#ifndef _WIN64
             if (aName[0] == '_')
                 strcpy( aBuf , &aName[1] );
+#endif
             strncpy ( aTmpBuf, aBuf, (size_t) nPreLen );
             aTmpBuf[nPreLen] = '\0';
             if ( !strcmp( aTmpBuf, cAPrefix ))
@@ -219,13 +223,13 @@ bool LibDump::Dump()
                 if ( bLdump3 ) {
                     int nChar = '@';
                     char *pNeu = strchr( aBuf, nChar );
-                    int nPos = pNeu - aBuf + 1;
+                    size_t nPos = pNeu - aBuf + 1;
                     if ( nPos > 0 )
                     {
                         char aOldBuf[MAX_MAN];
                         strcpy( aOldBuf, aBuf );
                         char pChar[MAX_MAN];
-                        strncpy( pChar, aBuf, (size_t) (nPos -1) );
+                        strncpy( pChar, aBuf, nPos - 1 );
                         pChar[nPos-1] = '\0';
                         strcpy( aBuf, pChar );
                         strcat( aBuf, "=" );
@@ -538,17 +542,9 @@ bool LibDump::CheckDataBase()
         char *pTmp = "defs\\";
 
         FILE *fp;
-#ifdef OS2
-        _mkdir ("defs", 0777);
-#else
         _mkdir ("defs");
-#endif
         strcpy(cBName,pTmp);
-#ifdef OS2
-        strcat(cBName,"gcc");
-#else
         strcat(cBName,getenv ("COMP_ENV"));
-#endif
 
         fp = fopen (cBName,"r");
         if (fp)
@@ -574,7 +570,6 @@ LibDump::~LibDump()
 {
     delete [] cBName;
     delete [] cAPrefix;
-//  delete [] cLibName;
     delete [] cFilterName;
     delete [] cModName;
 }
@@ -754,5 +749,8 @@ main( int argc, char **argv )
     pDump->PrintDefFile();
     pDump->PrintDataBase();
     delete pDump;
+    delete [] pLibName;
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/ldump/ldump.hxx b/soltools/ldump/ldump.hxx
index c0a1a166b8b2..6f4406463bba 100644
--- a/soltools/ldump/ldump.hxx
+++ b/soltools/ldump/ldump.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,3 +77,4 @@ public:
     static void     DumpError(unsigned long nError);
 };
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/ldump/makefile.mk b/soltools/ldump/makefile.mk
index 51ff42e60772..6d0eda3bf99e 100644
--- a/soltools/ldump/makefile.mk
+++ b/soltools/ldump/makefile.mk
@@ -42,7 +42,7 @@ LIBSALCPPRT=$(0)
 # --- Files --------------------------------------------------------
 
 # ldump only supports windows environment
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(COM)"!="GCC"
 #ldump4 reimplements feature set of ldump2 and ldump3
 APP1TARGET=	ldump4
diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx
index c9308faf0562..884456a382c9 100755..100644
--- a/soltools/mkdepend/collectdircontent.cxx
+++ b/soltools/mkdepend/collectdircontent.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include  "collectdircontent.hxx"
 
 PathFilePair IncludesCollection::split_path(const string& filePath) {
@@ -41,6 +42,7 @@ void IncludesCollection::add_to_collection(const string& dirPath) {
     while ((pent = readdir(pdir))) {
         dirContent.insert(pent->d_name);
     };
+    closedir(pdir);
 #endif // defined( WNT )
     allIncludes.insert(EntriesPair(dirPath, dirContent));
 };
@@ -64,7 +66,6 @@ bool IncludesCollection::exists(string filePath) {
     } else {
         return true;
     };
-    //return false;
 };
 
 extern "C" {
@@ -81,3 +82,5 @@ extern "C" {
         return m->exists(filePath);
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/collectdircontent.hxx b/soltools/mkdepend/collectdircontent.hxx
index 1896df0c8bc7..0c6b42357855 100644
--- a/soltools/mkdepend/collectdircontent.hxx
+++ b/soltools/mkdepend/collectdircontent.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #ifndef COLLECTDIRCONTENT_H
 #define COLLECTDIRCONTENT_H
 
@@ -27,8 +28,6 @@ typedef pair<string, string> PathFilePair;
 struct IncludesCollection {
     private:
     DirMap allIncludes;
-//    bool search(string filePath);
-//    bool add_dir(string dirPath);
     PathFilePair split_path(const string& filePath);
     void add_to_collection(const string& dirPath);
 
@@ -55,4 +54,6 @@ int call_IncludesCollection_exists(struct IncludesCollection* m, const char* fil
 }
 #endif
 
-#endif // COLLECTDIRCONTENT_H
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/cppsetup.c b/soltools/mkdepend/cppsetup.c
index 173798105a3c..6a4d2b8cf68a 100644
--- a/soltools/mkdepend/cppsetup.c
+++ b/soltools/mkdepend/cppsetup.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* $XConsortium: cppsetup.c,v 1.13 94/04/17 20:10:32 gildea Exp $ */
 /*
 
@@ -232,3 +233,4 @@ int cppsetup(line, filep, inc)
 }
 #endif /* CPP */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h
index 4133326ddb70..1ec838231d68 100644
--- a/soltools/mkdepend/def.h
+++ b/soltools/mkdepend/def.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* $XConsortium: def.h,v 1.25 94/04/17 20:10:33 gildea Exp $ */
 /*
 
@@ -60,9 +61,8 @@ in this Software without prior written authorization from the X Consortium.
 #endif
 
 #define MAXDEFINES  512
-#define MAXFILES    ( 1<<16 ) /* Increased from 512. -mcafee */
-                              /* Increased from 1024. -mh */
-                              /* Increased from 2048. -b_michaelsen */
+#define MAXFILES    65536
+
 #define MAXDIRS     64
 #define SYMHASHSEED     131  /* 131 1313 13131 ... */
 #define SYMHASHMEMBERS  64  /* must be 2^x to work right */
@@ -153,13 +153,15 @@ char            *malloc();
 char            *realloc();
 #endif
 
-char            *copy();
-char            *base_name();
-char            *get_line();
-char            *isdefined();
-struct filepointer  *getfile();
-struct inclist      *newinclude();
-struct inclist      *inc_path();
+char            *copy(char *);
+char            *base_name(char *);
+char            *get_line(struct filepointer *);
+char            *isdefined(char *);
+struct filepointer  *getfile(char *);
+struct inclist *newinclude(register char *newfile,
+                           register char *incstring);
+struct inclist      *inc_path(char *, char *, boolean,
+                                  struct IncludesCollection *);
 
 void define( char *def, struct symhash **symbols );
 void hash_define(char *name, char * val, struct symhash **symbols);
@@ -187,3 +189,5 @@ void warning1(char *, ...);
 
 void convert_slashes(char *);
 char *append_slash(char *);
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/ifparser.c b/soltools/mkdepend/ifparser.c
index 3c47de64e2f0..abfb92c9e48a 100644
--- a/soltools/mkdepend/ifparser.c
+++ b/soltools/mkdepend/ifparser.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * $XConsortium: ifparser.c,v 1.8 95/06/03 00:01:41 gildea Exp $
  *
@@ -102,7 +103,10 @@ parse_number (g, cp, valp)
     return CALLFUNC(g, handle_error) (g, cp, "number");
 
 #ifdef WIN32
-    *valp = strtol(cp, &cp, 0);
+    {
+        char *cp2;
+        *valp = strtol(cp, &cp2, 0);
+    }
 #else
     *valp = atoi (cp);
     /* EMPTY */
@@ -171,7 +175,7 @@ parse_value (g, cp, valp)
         cp++;
         }
         DO (cp = parse_variable (g, cp, &var));
-        len = cp - var;
+        len = (int)(cp - var);
         SKIPSPACE (cp);
         if (paren && *cp != ')')
         return CALLFUNC(g, handle_error) (g, cp, ")");
@@ -458,3 +462,4 @@ ParseIfExpression (g, cp, valp)
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/ifparser.h b/soltools/mkdepend/ifparser.h
index d832bfbcb6d7..a5dfbd38bfdd 100644
--- a/soltools/mkdepend/ifparser.h
+++ b/soltools/mkdepend/ifparser.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * $XConsortium: ifparser.h,v 1.1 92/08/22 13:05:39 rws Exp $
  *
@@ -71,5 +72,6 @@ typedef struct _if_parser {
     char *data;
 } IfParser;
 
-const char *ParseIfExpression (/* IfParser *, const char *, int * */);
+const char *ParseIfExpression (IfParser *, const char *, int *);
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/imakemdep.h b/soltools/mkdepend/imakemdep.h
index 67a98929c904..2010f4276df2 100644
--- a/soltools/mkdepend/imakemdep.h
+++ b/soltools/mkdepend/imakemdep.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 /* $XConsortium: imakemdep.h,v 1.83 95/04/07 19:47:46 kaleb Exp $ */
 /* $XFree86: xc/config/imake/imakemdep.h,v 3.12 1995/07/08 10:22:17 dawes Exp $ */
@@ -42,14 +43,6 @@ in this Software without prior written authorization from the X Consortium.
  *     These will be passed to the compile along with the contents of the
  *     make variable BOOTSTRAPCFLAGS.
  */
-#ifdef hpux
-#ifdef hp9000s800
-#define imake_ccflags "-DSYSV"
-#else
-#define imake_ccflags "-Wc,-Nd4000,-Ns3000 -DSYSV"
-#endif
-#endif
-
 #if defined(macII) || defined(_AUX_SOURCE)
 #define imake_ccflags "-DmacII -DSYSV"
 #endif
@@ -137,14 +130,6 @@ in this Software without prior written authorization from the X Consortium.
 #define imake_ccflags "-DSYSV -DUSG -DNOSTDHDRS"
 #endif
 
-#ifdef sequent
-#define imake_ccflags "-DX_NOT_STDC_ENV -DX_NOT_POSIX"
-#endif
-
-#ifdef _SEQUENT_
-#define imake_ccflags "-DSYSV -DUSG"
-#endif
-
 #if defined(SX) || defined(PC_UX)
 #define imake_ccflags "-DSYSV"
 #endif
@@ -174,7 +159,7 @@ in this Software without prior written authorization from the X Consortium.
  *     descriptor onto another, define such a mechanism here (if you don't
  *     already fall under the existing category(ies).
  */
-#if defined(SYSV) && !defined(_CRAY) && !defined(Mips) && !defined(_SEQUENT_)
+#if defined(SYSV) && !defined(_CRAY) && !defined(Mips)
 #define dup2(fd1,fd2)   ((fd1 == fd2) ? fd1 : (close(fd2), \
                            fcntl(fd1, F_DUPFD, fd2)))
 #endif
@@ -207,9 +192,6 @@ in this Software without prior written authorization from the X Consortium.
  *     If use cc -E but want a different compiler, define DEFAULT_CC.
  *     If the cpp you need is not in /lib/cpp, define DEFAULT_CPP.
  */
-#ifdef hpux
-#define USE_CC_E
-#endif
 #ifdef WIN32
 #define USE_CC_E
 #define DEFAULT_CC "cl"
@@ -235,7 +217,7 @@ in this Software without prior written authorization from the X Consortium.
 #ifdef _CRAY
 #define DEFAULT_CPP "/lib/pcpp"
 #endif
-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 #define DEFAULT_CPP "/usr/libexec/cpp"
 #endif
 #ifdef  MACH
@@ -273,7 +255,9 @@ char *cpp_argv[ARGUMENTS] = {
 #ifdef unix
     "-Uunix",   /* remove unix symbol so that filename unix.c okay */
 #endif
-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
+    defined(MACH) || defined(DRAGONFLY)
+/* FIXME: strange list of obsolete systems */
 # ifdef __i386__
     "-D__i386__",
 # endif
@@ -513,6 +497,8 @@ char *cpp_argv[ARGUMENTS] = {
  *     them to the the following table.  The definition of struct symtab is
  *     in util/makedepend/def.h.
  */
+
+/* FIXME: strange list of obsolete systems */
 struct pair predefs[] = {
 #ifdef apollo
     {"apollo", "1", NULL},
@@ -544,18 +530,6 @@ struct pair predefs[] = {
 #ifdef __sparc__
     {"__sparc__", "1", NULL},
 #endif
-#ifdef hpux
-    {"hpux", "1", NULL},
-#endif
-#ifdef __hpux
-    {"__hpux", "1", NULL},
-#endif
-#ifdef __hp9000s800
-    {"__hp9000s800", "1", NULL},
-#endif
-#ifdef __hp9000s700
-    {"__hp9000s700", "1", NULL},
-#endif
 #ifdef vax
     {"vax", "1", NULL},
 #endif
@@ -580,9 +554,6 @@ struct pair predefs[] = {
 #ifdef __mips__
     {"__mips__", "1", NULL},
 #endif
-#ifdef ultrix
-    {"ultrix", "1", NULL},
-#endif
 #ifdef stellar
     {"stellar", "1", NULL},
 #endif
@@ -673,10 +644,6 @@ struct pair predefs[] = {
 #ifdef __sxg__
     {"__sxg__", "1", NULL},
 #endif
-#ifdef _SEQUENT_
-    {"_SEQUENT_", "1", NULL},
-    {"__STDC__", "1", NULL},
-#endif
 #ifdef __bsdi__
     {"__bsdi__", "1", NULL},
 #endif
@@ -719,6 +686,9 @@ struct pair predefs[] = {
 #ifdef __OpenBSD__
     {"__OpenBSD__", "1", NULL},
 #endif
+#ifdef __DragonFly__
+    {"__DragonFly__", "1", NULL},
+#endif
 #ifdef __EMX__
     {"__EMX__", "1", NULL},
 #endif
@@ -728,3 +698,5 @@ struct pair predefs[] = {
 
 #endif /* MAKEDEPEND */
 #endif /* CCIMAKE */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/include.c b/soltools/mkdepend/include.c
index 4446489ba259..ac79e84cc984 100644
--- a/soltools/mkdepend/include.c
+++ b/soltools/mkdepend/include.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* $XConsortium: include.c,v 1.17 94/12/05 19:33:08 gildea Exp $ */
 /*
 
@@ -55,6 +56,7 @@ struct inclist *inc_path(file, include, dot, incCollection)
     register struct inclist *ip;
     struct stat st;
     boolean found = FALSE;
+    (void)dot;
 
     /*
      * Check all previously found include files for a path that
@@ -215,7 +217,7 @@ void remove_dotdot(path)
 int isdot(p)
     register char   *p;
 {
-    if(p && *p++ == '.' && *p++ == '\0')
+    if(p && p[0] == '.' && p[1] == '\0')
         return(TRUE);
     return(FALSE);
 }
@@ -223,7 +225,7 @@ int isdot(p)
 int isdotdot(p)
     register char   *p;
 {
-    if(p && *p++ == '.' && *p++ == '.' && *p++ == '\0')
+    if(p && p[0] == '.' && p[1] == '.' && p[2] == '\0')
         return(TRUE);
     return(FALSE);
 }
@@ -293,7 +295,7 @@ void included_by(ip, newfile)
     else {
         for (i=0; i<ip->i_listlen; i++)
             if (ip->i_list[ i ] == newfile) {
-                i = strlen(newfile->i_file);
+                i = (int)strlen(newfile->i_file);
                 if (!ip->i_included_sym &&
                 !(i > 2 &&
                   newfile->i_file[i-1] == 'c' &&
@@ -327,3 +329,5 @@ void inc_clean ()
         ip->i_marked = FALSE;
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c
index cf5c42c14bdf..6b0fe3df69a9 100644
--- a/soltools/mkdepend/main.c
+++ b/soltools/mkdepend/main.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* $XConsortium: main.c,v 1.84 94/11/30 16:10:44 kaleb Exp $ */
 /* $XFree86: xc/config/makedepend/main.c,v 3.4 1995/07/15 14:53:49 dawes Exp $ */
 /*
@@ -32,6 +33,10 @@ in this Software without prior written authorization from the X Consortium.
 #include <sys/stat.h>
 #endif
 
+#ifdef _WIN32
+#include <io.h>
+#endif
+
 #ifdef _MSC_VER     /* Define ssize_t */
 
 #if !defined(_W64)
@@ -143,7 +148,7 @@ catch (sig)
     fatalerr ("got signal %d\n", sig);
 }
 
-#if defined(USG) || (defined(i386) && defined(SYSV)) || defined(WIN32) || defined(OS2) || defined(Lynx_22)
+#if defined(USG) || (defined(i386) && defined(SYSV)) || defined(WIN32) || defined(Lynx_22)
 #define USGISH
 #endif
 
@@ -346,7 +351,6 @@ int main(argc, argv)
             break;
         default:
             if (endmarker) break;
-    /*      fatalerr("unknown opt = %s\n", argv[0]); */
             warning("ignoring option %s\n", argv[0]);
         }
     }
@@ -687,12 +691,12 @@ void redirect(line, makefile)
         fatalerr("cannot open \"%s\"\n", makefile);
     sprintf(backup, "%s.bak", makefile);
     unlink(backup);
-#if defined(WIN32) || defined(OS2)
+#if defined(WIN32)
     fclose(fdin);
 #endif
     if (rename(makefile, backup) < 0)
         fatalerr("cannot rename %s to %s\n", makefile, backup);
-#if defined(WIN32) || defined(OS2)
+#if defined(WIN32)
     if ((fdin = fopen(backup, "r")) == NULL)
         fatalerr("cannot open \"%s\"\n", backup);
 #endif
@@ -715,7 +719,7 @@ void redirect(line, makefile)
         }
     }
     fflush(fdout);
-#if defined(USGISH) || defined(_SEQUENT_) || defined(USE_CHMOD)
+#if defined(USGISH) || defined(USE_CHMOD)
     chmod(makefile, st.st_mode);
 #else
     fchmod(fileno(fdout), st.st_mode);
@@ -761,7 +765,7 @@ void warning1(char *msg, ...)
 void convert_slashes(path)
     char* path;
 {
-#if defined (WNT) || defined(OS2)
+#if defined (WNT)
     /*
      * Convert backslashes to slashes
      */
@@ -797,3 +801,4 @@ char* append_slash(path)
     return new_string;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk
index 630c688faba2..9c700ff6754e 100644
--- a/soltools/mkdepend/makefile.mk
+++ b/soltools/mkdepend/makefile.mk
@@ -35,19 +35,27 @@ noadjust=TRUE
 nodep=true
 ENABLE_EXCEPTIONS=TRUE
 
-# "mkdepend" is written in K&R style C. Modern compilers will generate
-# lots of warning. There is no point in cleaning this up, so we just
-# ignore warnings
-EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE : settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 LIBSALCPPRT=
 UWINAPILIB=
 
 CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS  
 
+.IF "$(COM)" == "MSC"
+# C4100: unreferenced formal parameter
+# C4131: uses old-style declarator
+# C4242: conversion from 'int' to 'char', possible loss of data
+# C4706: assignment within conditional expression
+CDEFS+=-wd4100 -wd4131 -wd4242 -wd4706
+.ENDIF
+
 OBJFILES=  \
         $(OBJ)$/cppsetup.obj \
         $(OBJ)$/ifparser.obj \
diff --git a/soltools/mkdepend/parse.c b/soltools/mkdepend/parse.c
index 31d48bf2bbc5..a63e481b6cdd 100644
--- a/soltools/mkdepend/parse.c
+++ b/soltools/mkdepend/parse.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* $XConsortium: parse.c,v 1.30 94/04/17 20:10:38 gildea Exp $ */
 /*
 
@@ -346,7 +347,7 @@ int deftype (line, filep, file_red, file, parse_it, symbols)
         /*
          * copy the definition back to the beginning of the line.
          */
-        strcpy (line, p);
+        memmove (line, p, strlen(p));
         break;
     case ELSE:
     case ENDIF:
@@ -419,14 +420,12 @@ static int hash( str )
 {
     /* Hash (Kernighan and Ritchie) */
     register unsigned int hashval = 0;
-    //char *s = str;
 
     for ( ; *str; str++ )
     {
         hashval = ( hashval * SYMHASHSEED ) + ( *str );
     }
 
-    //fprintf( stderr, "hash: %s, %d\n", s, hashval & ( SYMHASHMEMBERS - 1 ) );
     return hashval & ( SYMHASHMEMBERS - 1 );
 }
 
@@ -612,3 +611,5 @@ void hash_undefine( symbol, symbols )
         }
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/pr.c b/soltools/mkdepend/pr.c
index 1319972f99c5..37bf3a2af035 100644
--- a/soltools/mkdepend/pr.c
+++ b/soltools/mkdepend/pr.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* $XConsortium: pr.c,v 1.17 94/04/17 20:10:38 gildea Exp $ */
 /*
 
@@ -110,12 +111,12 @@ void pr(ip, file, base)
     char    buf[ BUFSIZ ];
 
     printed = TRUE;
-    len = strlen(ip->i_file)+1;
+    len = (int)strlen(ip->i_file)+1;
     if (current_len + len > width || file != lastfile) {
         lastfile = file;
         sprintf(buf, "\n%s%s%s: %s", objprefix, base, objsuffix,
             ip->i_file);
-        len = current_len = strlen(buf);
+        len = current_len = (int)strlen(buf);
     }
     else {
         buf[0] = ' ';
@@ -135,3 +136,5 @@ void pr(ip, file, base)
     for (i=0; i<ip->i_listlen; i++)
         printf("\n#\t%s", ip->i_list[ i ]->i_incstring);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/prj/build.lst b/soltools/prj/build.lst
index 578723b0e09d..78eb3fc69fce 100644
--- a/soltools/prj/build.lst
+++ b/soltools/prj/build.lst
@@ -1,7 +1,7 @@
 so  soltools :   solenv SUN:so_prereq NULL
 so	soltools								usr1	-	all	so_usr1 NULL
 so	soltools\inc							get	-	all	so_inc NULL
-so	soltools\ldump							nmake	-	all	so_ldump so_mkdep NULL
+so	soltools\ldump							nmake	-	w	so_ldump so_mkdep NULL
 so	soltools\winunistd						nmake	-	n	so_wunistd NULL
 so	soltools\mkdepend						nmake	-	all	so_mkdep so_wunistd.n NULL
 so	soltools\checkdll						nmake	-	u	so_chkdl so_adjvis.u so_mkdep NULL
diff --git a/soltools/prj/d.lst b/soltools/prj/d.lst
index 970805f5d60c..409b94aa069e 100644
--- a/soltools/prj/d.lst
+++ b/soltools/prj/d.lst
@@ -1,11 +1,11 @@
-..\%__SRC%\bin\ldump4.exe %_DEST%\bin%_EXT%\ldump4.exe
-..\%__SRC%\bin\makedepend.exe %_DEST%\bin%_EXT%\makedepend.exe
-..\%__SRC%\bin\makedepend %_DEST%\bin%_EXT%\makedepend
-..\%__SRC%\bin\adjustvisibility %_DEST%\bin%_EXT%\adjustvisibility
-..\%__SRC%\bin\javadep.exe %_DEST%\bin%_EXT%\javadep.exe
-..\%__SRC%\bin\javadep %_DEST%\bin%_EXT%\javadep
-..\%__SRC%\bin\checkdll %_DEST%\bin%_EXT%\checkdll
-..\%__SRC%\bin\cpp.exe %_DEST%\bin%_EXT%\cpplcc.exe
-..\%__SRC%\bin\cpp %_DEST%\bin%_EXT%\cpp.lcc
-..\%__SRC%\inc\unistd.h %_DEST%\inc%_EXT%\unistd.h
-..\%__SRC%\bin\testhxx* %_DEST%\bin%_EXT%\testhxx*
+..\%__SRC%\bin\ldump4.exe %_DEST%\bin\ldump4.exe
+..\%__SRC%\bin\makedepend.exe %_DEST%\bin\makedepend.exe
+..\%__SRC%\bin\makedepend %_DEST%\bin\makedepend
+..\%__SRC%\bin\adjustvisibility %_DEST%\bin\adjustvisibility
+..\%__SRC%\bin\javadep.exe %_DEST%\bin\javadep.exe
+..\%__SRC%\bin\javadep %_DEST%\bin\javadep
+..\%__SRC%\bin\checkdll %_DEST%\bin\checkdll
+..\%__SRC%\bin\cpp.exe %_DEST%\bin\cpplcc.exe
+..\%__SRC%\bin\cpp %_DEST%\bin\cpp.lcc
+..\%__SRC%\inc\unistd.h %_DEST%\inc\unistd.h
+..\%__SRC%\bin\testhxx* %_DEST%\bin\testhxx*
diff --git a/soltools/support/makefile.mk b/soltools/support/makefile.mk
index d3f1095f6eb2..8628b5234d91 100644
--- a/soltools/support/makefile.mk
+++ b/soltools/support/makefile.mk
@@ -36,7 +36,10 @@ TARGETTYPE=CUI
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk
 
-
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
diff --git a/soltools/support/simstr.cxx b/soltools/support/simstr.cxx
index d2ecf3480677..de9890a4a060 100644
--- a/soltools/support/simstr.cxx
+++ b/soltools/support/simstr.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,7 +50,7 @@ Simstr::Simstr(const char * s_)
       }
    else
       {
-         len = strlen(s_);
+         len = (int)strlen(s_);
          sz = new char[len+1];
          memcpy(sz,s_,len+1);
       }
@@ -96,7 +97,7 @@ Simstr::Simstr( const char *   anybytes,
                 int            firstBytesPos,
                 int            nrOfBytes)
 {
-   unsigned slen = strlen(anybytes);
+   unsigned slen = (unsigned)strlen(anybytes);
    if (anybytes == 0 || slen <= unsigned(firstBytesPos))
       {
          len = 0;
@@ -831,3 +832,4 @@ operator>=(const char * str, const Simstr & S)
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/testSHL/inc/tlog.hxx b/soltools/testSHL/inc/tlog.hxx
index acae18be7e9f..fa38483efd38 100644
--- a/soltools/testSHL/inc/tlog.hxx
+++ b/soltools/testSHL/inc/tlog.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,18 +31,14 @@
 #include    <osl/file.hxx>
 #include <rtl/tres.hxx>
 
-#ifndef _SOLTOOLS_TESTSHL_TUTIL_HXX_
 #include "tutil.hxx"
-#endif
 
 #include <iostream>
 
 using namespace std;
 
-// <namespace_tstutl>
 namespace tstutl {
 
-// <class_tLog>
 class tLog {
 
     // <private_members>
@@ -98,3 +95,5 @@ public:
 } // </namespace_tstutl>
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/testSHL/inc/tstMgr.hxx b/soltools/testSHL/inc/tstMgr.hxx
index 208714322395..cbb8474b68af 100644
--- a/soltools/testSHL/inc/tstMgr.hxx
+++ b/soltools/testSHL/inc/tstMgr.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,7 +50,7 @@ class tstMgr {
     // </private_methods>
 
 public:
-
+    tstMgr() : pImpl(0) {}
     // <dtor>
     ~tstMgr(){
         cleanup();
@@ -71,3 +72,4 @@ public:
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/testSHL/inc/tutil.hxx b/soltools/testSHL/inc/tutil.hxx
index 37398a72381a..76c12b314548 100644
--- a/soltools/testSHL/inc/tutil.hxx
+++ b/soltools/testSHL/inc/tutil.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,3 +48,5 @@ sal_uInt32 ln( const sal_Char* str );
 } // </namespace_tstutl>
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/testSHL/testshl.cxx b/soltools/testSHL/testshl.cxx
index 9642d8761f50..c66a238effa6 100644
--- a/soltools/testSHL/testshl.cxx
+++ b/soltools/testSHL/testshl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,20 +31,16 @@
 
 #include <stdio.h>
 
-#ifndef _SOLTOOLS_TESTSHL_TLOG_HXX_
 #include "inc/tlog.hxx"
-#endif
 
-#ifndef _SOLTOOLS_TESTSHL_TSTMGR_HXX_
 #include "inc/tstMgr.hxx"
-#endif
 
 using namespace tstutl;
 
 void usage();
 void test_shl( vector< sal_Char* > cmdln, sal_Bool boom );
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 int main( int argc, char* argv[] )
 #else
 int _cdecl main( int argc, char* argv[] )
@@ -96,3 +93,4 @@ void usage(){
     exit(0);
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/testSHL/util/tlog.cxx b/soltools/testSHL/util/tlog.cxx
index 48eeafc7908a..65982ae978ec 100644
--- a/soltools/testSHL/util/tlog.cxx
+++ b/soltools/testSHL/util/tlog.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,11 +52,11 @@ void tLog::initialize( const ::rtl::OString& name ) {
             ret = ::osl::File::remove( m_logname );
         }
 
-    if( m_logfile->open( OpenFlag_Write ) == ::osl::FileBase::E_NOENT ) {
-            ret = m_logfile->open( OpenFlag_Write | OpenFlag_Create );
+    if( m_logfile->open( osl_File_OpenFlag_Write ) == ::osl::FileBase::E_NOENT ) {
+            ret = m_logfile->open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
         }
         else  {
-            ret = m_logfile->setPos( Pos_End, 0 );
+            ret = m_logfile->setPos( osl_Pos_End, 0 );
         }
         return ret;
     }
@@ -92,7 +93,6 @@ void tLog::initialize( const ::rtl::OString& name ) {
     }
     sal_uInt64 uBytes=0;
     sal_uInt32 len = ln( buf );
-    const sal_Char* ptr = buf;
 
     if ( v ) {
         fprintf( stderr, "%s", buf );
@@ -106,3 +106,4 @@ void tLog::initialize( const ::rtl::OString& name ) {
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/testSHL/util/tstMgr.cxx b/soltools/testSHL/util/tstMgr.cxx
index 2aad1c758d41..7fa2bd7e40ad 100644
--- a/soltools/testSHL/util/tstMgr.cxx
+++ b/soltools/testSHL/util/tstMgr.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,13 +32,9 @@
 #include <osl/module.hxx>
 #include <rtl/tres.hxx>
 
-#ifndef _SOLTOOLS_TESTSHL_TLOG_HXX_
 #include "tlog.hxx"
-#endif
 
-#ifndef _SOLTOOLS_TESTSHL_TUTIL_HXX_
 #include "tutil.hxx"
-#endif
 
 using namespace rtl;
 
@@ -83,7 +80,7 @@ sal_Bool tstMgr::test_Entries( vector< sal_Char* > entries,
                     bOK &= oRes.getState();
                     log.writeRes( oRes );
                 }
-                iter++;
+                ++iter;
             }
         log.close();
     }
@@ -117,7 +114,7 @@ sal_Bool tstMgr::test_EntriesFromFile( sal_Char* fName, sal_Char* logName ) {
             if ( *iter ) {
                 delete [] *iter;
             }
-            iter++;
+            ++iter;
         }
     }
     else  {
@@ -162,3 +159,5 @@ void test_Entry_Impl( ::osl::Module& oMod, ::rtl::TestResult* oRes ) {
 } // </function_test_Entry_Impl>
 
 } // </namespace_tstutl>
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/testSHL/util/tutil.cxx b/soltools/testSHL/util/tutil.cxx
index 60c5f6deba02..81d068917101 100644
--- a/soltools/testSHL/util/tutil.cxx
+++ b/soltools/testSHL/util/tutil.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -74,7 +75,7 @@ sal_uInt32 getEntriesFromFile( sal_Char* fName,
                                             vector< sal_Char* >& entries ) {
 
     ::osl::File inFile( cnvrtPth( fName ) );
-    if ( inFile.open( OpenFlag_Read ) == ::osl::FileBase::E_None) {
+    if ( inFile.open( osl_File_OpenFlag_Read ) == ::osl::FileBase::E_None) {
         ::rtl::ByteSequence byteSeq;
         inFile.readLine( byteSeq );
         while ( byteSeq.getLength() ) {
@@ -145,3 +146,4 @@ sal_uInt32 ln( const sal_Char* str ) {
 
 } // </namespace_tstutl>
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/testhxx/makefile.mk b/soltools/testhxx/makefile.mk
index 7a1ab97273e3..e71d8f116e23 100644
--- a/soltools/testhxx/makefile.mk
+++ b/soltools/testhxx/makefile.mk
@@ -36,6 +36,11 @@ CAPTURE_OUTPUT = > $(MISC)$/testhxx.output && $(TOUCH) $(SLO)$/testhxx.obj
 .INCLUDE: $(PRJ)$/util$/makefile.pmk
 .INCLUDE: settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 SLOFILES = $(SLO)$/testhxx.obj
 
 .INCLUDE: target.mk
diff --git a/soltools/testhxx/testhxx.cxx b/soltools/testhxx/testhxx.cxx
index 63b15276d523..be365044b861 100644
--- a/soltools/testhxx/testhxx.cxx
+++ b/soltools/testhxx/testhxx.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,3 +31,5 @@
 //#include "precompiled_soltools.hxx"
 
 // This is just a dummy file; see the makefile.mk for the real work.
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk
index bf51cf851b4c..003cf1c203c2 100755
--- a/soltools/util/makefile.pmk
+++ b/soltools/util/makefile.pmk
@@ -31,14 +31,6 @@ MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(BIN)$/makedepend
 # find 'adjustvisibility' in own output tree
 ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility
 
-# avoid STLPort
-NO_DEFAULT_STL=TRUE
-SOLARINC!:=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(SOLARINC))
-.IF "$(STLPORT4)" != ""
-SOLARINC!:=$(subst,$(STLPORT4)/include/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC))
-SOLARINC!:=$(subst,$(STLPORT4)/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC))
-.ENDIF
-
 .IF "$(OS)"=="SOLARIS"
 # hack due to #i53089#
 .IF "$(COMPATH:+"x")" != "$(COMPATH:+"x":s/binx//)"
@@ -46,7 +38,5 @@ HELP_COMPATH:=$(subst,/binx, $(COMPATH:+"x"))
 .ELSE			# "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
 HELP_COMPATH:=$(COMPATH)
 .ENDIF			# "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
-#SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/stlport4
-#SOLARLIB+=-L$(HELP_COMPATH)/prod/lib/stlport4
 SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/Cstd
 .ENDIF
diff --git a/soltools/winunistd/unistd.h b/soltools/winunistd/unistd.h
index 372e40050187..72c253e0af41 100644
--- a/soltools/winunistd/unistd.h
+++ b/soltools/winunistd/unistd.h
@@ -1,4 +1,6 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* Dummy unistd.h for the wntmsci3 environment. Required because flex
  * generates a lexical scanner which includes <unistd.h>
  */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/splitbuild/common.lst b/splitbuild/common.lst
index a82dc37f0270..2b92492afa3d 100644
--- a/splitbuild/common.lst
+++ b/splitbuild/common.lst
@@ -1 +1 @@
-basebmp basegfx bean comphelper configmgr connectivity embeddedobj embedserv eventattacher fileaccess i18npool i18nutil linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb ucbhelper unotools unoxml vos xmlhelp xmloff xmlscript wizards
+basebmp basegfx bean comphelper configmgr connectivity embeddedobj embedserv eventattacher fileaccess i18npool i18nutil linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb ucbhelper unotools unoxml xmlhelp xmloff xmlscript wizards
diff --git a/splitbuild/extern.lst b/splitbuild/extern.lst
index a3e85950337c..9876dd7348d7 100644
--- a/splitbuild/extern.lst
+++ b/splitbuild/extern.lst
@@ -1 +1 @@
-afms agg apache-commons apple_remote beanshell berkeleydb boost cairo cppunit curl epm expat external graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD more_fonts moz mythes neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib 
+afms agg apache-commons apple_remote beanshell berkeleydb boost cairo cppunit curl epm expat external graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD more_fonts moz mythes neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib 
diff --git a/stlport/STLport-4.0.patch b/stlport/STLport-4.0.patch
index 0d262b5455cf..ea21ff93105a 100644
--- a/stlport/STLport-4.0.patch
+++ b/stlport/STLport-4.0.patch
@@ -3321,6 +3321,23 @@
   inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }  
   inline char* _FILE_I_end(const FILE& __f)
 ***************
+*** 92,98 ****
+  typedef  unsigned char* _File_ptr_type;
+  #endif
+
+! inline int   _FILE_fd(const FILE& __f) { return __f._file; }
+  inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._base; }
+  inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
+  inline char* _FILE_I_end(const FILE& __f)
+--- 92,98 ----
+  typedef  unsigned char* _File_ptr_type;
+  #endif
+
+! inline int   _FILE_fd(const FILE& __f) { return fileno(__CONST_CAST(FILE*,&__f)); }
+  inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._base; }
+  inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
+  inline char* _FILE_I_end(const FILE& __f)
+***************
 *** 377,382 ****
 --- 380,388 ----
   # endif
diff --git a/stlport/STLport-4.5-0119.patch b/stlport/STLport-4.5-0119.patch
index db2c62b22ad3..bb17a11a6bdb 100644
--- a/stlport/STLport-4.5-0119.patch
+++ b/stlport/STLport-4.5-0119.patch
@@ -38,7 +38,7 @@
  
  MKDIR=-mkdir
  LINK_OUT=/out:
-@@ -51,7 +51,7 @@
+@@ -51,15 +51,15 @@
  #
  
  # FLAGS_COMMON =/nologo /c /W3 /GR /GX /D "WIN32" /D "_WINDOWS" /I "$(STLPORT_DIR)" $(EXTRA_COMMON_FLAGS)
@@ -47,6 +47,15 @@
  FLAGS_COMMON_static = $(FLAGS_COMMON) /FD  /D "_STLP_NO_FORCE_INSTANTIATE"
  FLAGS_COMMON_dynamic = $(FLAGS_COMMON)
  
+ FLAGS_DEBUG=/Gm /Od /D_DEBUG $(EXTRA_DEBUG_FLAGS)
+ # FLAGS_DEBUG=/Zi /Gm /Od /D_DEBUG $(EXTRA_DEBUG_FLAGS)
+ FLAGS_NDEBUG=/O2 /DNDEBUG  $(EXTRA_NDEBUG_FLAGS)
+ 
+-LDFLAGS_COMMON=/nologo /machine:I386 /debugtype:cv
++LDFLAGS_COMMON=/nologo
+ LDFLAGS_DEBUG=/debug
+ LDFLAGS_RELEASE=/opt:ref
+ 
 --- misc/STLport-4.5-0119/stlport/config/_epilog.h	Thu Sep  6 00:11:36 2001
 +++ misc/build/STLport-4.5-0119/stlport/config/_epilog.h	Mon Jun  2 10:32:02 2008
 @@ -4,6 +4,7 @@
@@ -1326,3 +1335,14 @@
  
    explicit _DBG_vector(size_type __n)
      : _STLP_DBG_VECTOR_BASE(__n), _M_iter_list((const _Base*)this) {}
+--- misc/build/STLport-4.5-0119/stlport/stl/_threads.h
++++ misc/build/STLport-4.5-0119/stlport/stl/_threads.h
+@@ -99,7 +99,7 @@
+ #   else 
+ // This section serves as a replacement for windows.h header for Visual C++
+ extern "C" {
+-#   if (defined(_M_MRX000) || defined(_M_ALPHA) \
++#   if (defined(_M_MRX000) || defined(_M_ALPHA) ||  defined(_M_AMD64) \
+        || (defined(_M_PPC) && (_MSC_VER >= 1000))) && !defined(RC_INVOKED)
+ #    define InterlockedIncrement       _InterlockedIncrement
+ #    define InterlockedDecrement       _InterlockedDecrement
diff --git a/stlport/STLport-4.5-cxx0x.patch b/stlport/STLport-4.5-cxx0x.patch
new file mode 100644
index 000000000000..88d96d0df6e6
--- /dev/null
+++ b/stlport/STLport-4.5-cxx0x.patch
@@ -0,0 +1,17 @@
+--- misc/STLport-4.5/stlport/config/stl_gcc.h
++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h
+@@ -239,10 +239,10 @@
+ 
+ 
+ /* strict ANSI prohibits "long long" ( gcc) */
+-#  if defined ( __STRICT_ANSI__ )
+-#    undef _STLP_LONG_LONG
+-// #    define _STLP_STRICT_ANSI 1
+-#  endif
++//#  if defined ( __STRICT_ANSI__ )
++//#    undef _STLP_LONG_LONG
++//// #    define _STLP_STRICT_ANSI 1
++//#  endif
+ 
+ //# if !defined (__STRICT_ANSI__) || defined (__BUILDING_STLPORT)
+ //#    define _STLP_USE_TEMPLATE_EXPORT
diff --git a/stlport/STLport-4.5.patch b/stlport/STLport-4.5.patch
index 27ff2efb8008..0a0027594ad3 100644
--- a/stlport/STLport-4.5.patch
+++ b/stlport/STLport-4.5.patch
@@ -137,7 +137,7 @@
 +#
 +#
 +LINK=ar cr
-+DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
++DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} -fexceptions -shared -o
 +
 +OBJEXT=o
 +DYNEXT=so
@@ -163,8 +163,8 @@
 +CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
 +CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
 +
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
 +
 +CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
 +CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
@@ -172,8 +172,8 @@
 +CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
 +CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
 +
-+CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
 +
 +include common_percent_rules.mak
 +include common_rules.mak
@@ -210,7 +210,7 @@
 +#
 +#
 +LINK=ar crv
-+DYN_LINK=$(CXX) --fexceptions -shared -o
++DYN_LINK=$(CXX) -fexceptions -shared -o
 +
 +OBJEXT=o
 +DYNEXT=dll
@@ -255,8 +255,8 @@
 +CXXFLAGS_DEBUG_static =  $(CXXFLAGS_COMMON) -g
 +CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -shared -g -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
 +
-+CXXFLAGS_STLDEBUG_static =  $(CXXFLAGS_DEBUG_static)  -D_STLP_DEBUG
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_static =  $(CXXFLAGS_DEBUG_static)  -D_DEBUG_RUNTIME
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
 +
 +CFLAGS_RELEASE_static =  $(CFLAGS_COMMON) -O2
 +CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -shared -O2 -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
@@ -264,8 +264,8 @@
 +CFLAGS_DEBUG_static =  $(CFLAGS_COMMON) -g
 +CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -shared -g -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
 +
-+CFLAGS_STLDEBUG_static =  $(CFLAGS_DEBUG_static)  -D_STLP_DEBUG
-+CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CFLAGS_STLDEBUG_static =  $(CFLAGS_DEBUG_static)  -D_DEBUG_RUNTIME
++CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
 +
 +LDLIBS_RELEASE_dynamic = ${LDLIBS_COMMON_dynamic}
 +LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic} ${LDFLAGS_COMMON_dynamic} -Wl,-Map,${OUTDIR}/${RELEASE_NAME}.map -Wl,--out-implib,${OUTDIR}/${RELEASE_NAME}.a
@@ -399,8 +399,8 @@
 +CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
 +CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g
 +
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
 +
 +CFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
 +CFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
@@ -408,8 +408,8 @@
 +CFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
 +CFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g
 +
-+CFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
 +
 +include common_percent_rules.mak
 +include common_rules.mak
@@ -449,7 +449,7 @@
 +#
 +#
 +LINK=ar cr
-+DYN_LINK=$(CXX) -Wl,-rpath,'$$ORIGIN' --fexceptions -shared -o
++DYN_LINK=$(CXX) -Wl,-rpath,'$$ORIGIN' -fexceptions -shared -o
 +
 +OBJEXT=o
 +DYNEXT=so
@@ -475,8 +475,8 @@
 +CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
 +CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
 +
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
 +
 +CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
 +CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
@@ -484,8 +484,8 @@
 +CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
 +CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
 +
-+CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
 +
 +include common_percent_rules.mak
 +include common_rules.mak
diff --git a/stlport/makefile.mk b/stlport/makefile.mk
index 907c0935cbe8..9211a5e117fd 100644
--- a/stlport/makefile.mk
+++ b/stlport/makefile.mk
@@ -34,46 +34,26 @@ TARGET=so_stlport
 
 .INCLUDE :	settings.mk
 
-.IF "$(USE_SYSTEM_STL)"=="YES"
+.IF "$(WITH_STLPORT)"!="YES"
 
-.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
-# System STL when building with SunStudio is just a version of STLport
-# which comes with the compiler
 all:
     @echo "Nothing to do"
-.ELSE #"$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
-#
-# If you choose to build without stlport, some headers will be used to bring the
-# sgi extensions into the std namespace:
-$(INCCOM)$/stlport$/functional \
-$(INCCOM)$/stlport$/hash_map \
-$(INCCOM)$/stlport$/hash_set \
-$(INCCOM)$/stlport$/numeric \
-$(INCCOM)$/stlport$/slist \
-$(INCCOM)$/stlport$/rope \
-$(INCCOM)$/stlport$/vector: systemstl$/$$(@:f)
-    $(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-.ENDIF #"$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
-
-.ELSE # "$(USE_SYSTEM_STL)"
+
+.ELSE # "$(WITH_STLPORT)"!="YES"
 
 # --- Files --------------------------------------------------------
 .EXPORT : CC CXX
 .IF "$(COMID)"=="gcc3"
     TARFILE_NAME=STLport-4.5
     TARFILE_MD5=18f577b374d60b3c760a3a3350407632
-    PATCH_FILES=STLport-4.5.patch STLport-4.5-gcc43_warnings.patch
+    PATCH_FILES=\
+                STLport-4.5.patch \
+                STLport-4.5-gcc43_warnings.patch \
+                STLport-4.5-cxx0x.patch
 .ELIF "$(GUI)"=="WNT"
-    .IF "$(CCNUMVER)"<="001300000000"
-        TARFILE_NAME=STLport-4.0
-        TARFILE_MD5=c441926f3a552ed3e5b274b62e86af16
-        PATCH_FILES=STLport-4.0.patch
-    .ELSE
-        TARFILE_NAME=STLport-4.5-0119
-        TARFILE_MD5=7376930b0d3f3d77a685d94c4a3acda8
-        PATCH_FILES=STLport-4.5-0119.patch
-    .ENDIF
+    TARFILE_NAME=STLport-4.5-0119
+    TARFILE_MD5=7376930b0d3f3d77a685d94c4a3acda8
+    PATCH_FILES=STLport-4.5-0119.patch
 .ELSE
     TARFILE_NAME=STLport-4.0
     TARFILE_MD5=c441926f3a552ed3e5b274b62e86af16
@@ -113,11 +93,7 @@ BUILD_DIR=src
 
 .IF "$(COM)"=="MSC"
 BUILD_ACTION=nmake
-.IF "$(CCNUMVER)"<="001400000000"
-BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHsc"
-.ELSE			# "$(CCNUMVER)"<="001400000000"
 BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc:wchar_t-" CCNUMVER=$(CCNUMVER)
-.ENDIF			# "$(CCNUMVER)"<="001400000000"
 .ENDIF
 
 .IF "$(COM)"=="GCC"
@@ -125,8 +101,6 @@ BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc:wchar_t-" CCNUMVER=$(CCNUMVER)
         # FreeBSD needs a special makefile
         .IF "$(OS)"=="FREEBSD"
             BUILD_FLAGS=-f gcc-3.0-freebsd.mak
-        .ELIF "$(OS)"=="OS2"
-            BUILD_FLAGS=-f gcc-3.0-os2.mak
         .ELIF "$(GUI)"=="WNT"
             BUILD_FLAGS=-f gcc-3.0-mingw.mak
         .ELSE
@@ -144,7 +118,7 @@ BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc:wchar_t-" CCNUMVER=$(CCNUMVER)
     BUILD_FLAGS+= -j$(MAXPROCESS)
 .ENDIF
 .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
-CXX+= -Wl,--hash-style=both
+CXX+= -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
 .ENDIF
 
 .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
@@ -188,11 +162,6 @@ OUT2BIN= \
 
 .ENDIF # "$(COM)"=="GCC"
 
-.ELIF "$(GUI)"=="OS2"
-
-OUT2LIB= lib$/*.lib
-OUT2BIN= lib$/*.dll
-
 .ELSE          # "$(GUI)"=="WNT"
 
 OUT2LIB= \
@@ -202,45 +171,8 @@ OUT2LIB= \
 
 # --- Targets ------------------------------------------------------
 
-.IF "$(STLPORT4)"!="NO_STLPORT4"
-all :
-       @echo "         An already available installation of STLport has been chosen in the configure process."
-       @echo "         Therefore the version provided here does not need to be built in addition."
-.ELIF "$(OS)"=="MACOSX"
-all:
-    @echo '--with-stlport=yes is not supported on Mac OS X'
-    false
-.ENDIF
-
 .INCLUDE : 	set_ext.mk
 .INCLUDE :	target.mk
 .INCLUDE :	tg_ext.mk
 
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-.IF "$(CCNUMVER)"<="001300000000"
-
-$(MISC)$/$(TARFILE_ROOTDIR) : avoid_win32_patches
-avoid_win32_patches :
-    @$(ECHONL)
-    @echo ERROR! this module can't use automated patch creation
-    @echo on windows.
-    @$(ECHONL)
-    force_dmake_to_error
-
-$(PACKAGE_DIR)$/so_custom_patch :  $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE)
-    win32_custom.bat $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@
-
-$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_custom_patch
-
-.IF "$(USE_NEW_SDK)"!=""
-$(PACKAGE_DIR)$/win32_sdk_patch :  $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE)
-    win32_sdk.bat $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@
-
-$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/win32_sdk_patch
-.ENDIF			# "$(USE_NEW_SDK)"!=""
-.ENDIF			# COMVER<=001300000000
-.ENDIF "$(COM)"=="GCC"
-.ENDIF          # "$(GUI)"=="WNT"
-
-.ENDIF # "$(USE_SYSTEM_STL)"
+.ENDIF # "$(WITH_STLPORT)"!="YES"
diff --git a/stlport/prj/build.lst b/stlport/prj/build.lst
index 259feec2f6bc..2a6ec0dda681 100644
--- a/stlport/prj/build.lst
+++ b/stlport/prj/build.lst
@@ -1,2 +1,2 @@
-sl	stlport	:   SO:so_prereq solenv NULL
+sl	stlport	:   solenv NULL
 sl	stlport						nmake	-	all	sl_mkout NULL
diff --git a/stlport/prj/d.lst b/stlport/prj/d.lst
index 29848a6475e3..88478cef74b9 100644
--- a/stlport/prj/d.lst
+++ b/stlport/prj/d.lst
@@ -1,25 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\stl
-mkdir: %_DEST%\inc%_EXT%\stl\stl
-mkdir: %_DEST%\inc%_EXT%\stl\stl\debug
-mkdir: %_DEST%\inc%_EXT%\stl\stl\wrappers
-mkdir: %_DEST%\inc%_EXT%\stl\config
-mkdir: %_DEST%\inc%_EXT%\stl\using
-mkdir: %_DEST%\inc%_EXT%\stl\using\h
-mkdir: %_DEST%\inc%_EXT%\stl\wrap_std
-mkdir: %_DEST%\inc%_EXT%\stl\wrap_std\h
-..\%__SRC%\inc\*.SUNWCCH %_DEST%\inc%_EXT%\stl\*
-..\%__SRC%\inc\stlport\* %_DEST%\inc%_EXT%\stl\*
-..\%__SRC%\inc\stlport\stl\* %_DEST%\inc%_EXT%\stl\stl\*
-..\%__SRC%\inc\stlport\stl\debug\* %_DEST%\inc%_EXT%\stl\stl\debug\*
-..\%__SRC%\inc\stlport\stl\wrappers\* %_DEST%\inc%_EXT%\stl\stl\wrappers\*
-..\%__SRC%\inc\stlport\config\* %_DEST%\inc%_EXT%\stl\config\*
-..\%__SRC%\inc\stlport\using\* %_DEST%\inc%_EXT%\stl\using\*
-..\%__SRC%\inc\stlport\using\h\* %_DEST%\inc%_EXT%\stl\using\h\*
-..\%__SRC%\inc\stlport\wrap_std\* %_DEST%\inc%_EXT%\stl\wrap_std\*
-..\%__SRC%\inc\stlport\wrap_std\h\* %_DEST%\inc%_EXT%\stl\wrap_std\h\*
-..\systemstlguards\*.h %_DEST%\inc%_EXT%\stl\*.h
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
+..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
 
diff --git a/stlport/systemstl/functional b/stlport/systemstl/functional
deleted file mode 100644
index 59b61f95f250..000000000000
--- a/stlport/systemstl/functional
+++ /dev/null
@@ -1,62 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SYSTEM_STL_FUNCTIONAL
-#define SYSTEM_STL_FUNCTIONAL
-
-#ifdef GCC
-# ifdef __MINGW32__
-#  define _SYSTEM_STL_MAKE_HEADER(path,header) <path/header>
-#  include _SYSTEM_STL_MAKE_HEADER(GXX_INCLUDE_PATH,functional)
-# else
-#  include <ext/../functional>
-# endif
-#  include <ext/functional>
-
-namespace std
-{
-	using __gnu_cxx::project1st;
-	using __gnu_cxx::project2nd;
-	using __gnu_cxx::select1st;
-	using __gnu_cxx::select2nd;
-	using __gnu_cxx::compose1;
-	using __gnu_cxx::compose2;
-	using __gnu_cxx::unary_compose;
-	using __gnu_cxx::binary_compose;
-# ifndef __GXX_EXPERIMENTAL_CXX0X__
-	using __gnu_cxx::identity;
-	using __gnu_cxx::mem_fun1;
-	using __gnu_cxx::mem_fun1_ref;
-# endif
-}
-
-#else
-# error UNSUPPORTED COMPILER
-#endif
-
-#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map
deleted file mode 100644
index 415e39f77926..000000000000
--- a/stlport/systemstl/hash_map
+++ /dev/null
@@ -1,81 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SYSTEM_STL_HASHMAP
-#define SYSTEM_STL_HASHMAP
-
-#ifdef GCC
-
-# include <functional>
-
-# define _BACKWARD_BACKWARD_WARNING_H 1
-# include <ext/hash_map>
-# undef _BACKWARD_BACKWARD_WARNING_H
-
-namespace __gnu_cxx
-{
-    template<> struct hash < std::string >
-    {
-        size_t operator()(const std::string & x) const
-        {
-            return hash< const char* >()(x.c_str());
-        }
-    };
-
-    template<> struct hash< long long int >
-    { 
-        size_t operator()(long long int __x) const 
-        { 
-            return __x; 
-        } 
-    };
-
-    template<> struct hash< unsigned long long int >
-    { 
-        size_t operator()(unsigned long long int __x) const 
-        { 
-            return __x; 
-        } 
-    };
-}
-
-namespace std
-{
-# ifndef __GXX_EXPERIMENTAL_CXX0X__
-	using __gnu_cxx::hash;
-# endif
-	using __gnu_cxx::hash_map;
-	using __gnu_cxx::hash_multimap;
-}
-
-#else
-# error UNSUPPORTED COMPILER
-#endif
-
-
-#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/stlport/systemstl/numeric b/stlport/systemstl/numeric
deleted file mode 100644
index 3510ccb5bf57..000000000000
--- a/stlport/systemstl/numeric
+++ /dev/null
@@ -1,53 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SYSTEM_STL_NUMERIC
-#define SYSTEM_STL_NUMERIC
-
-#ifdef GCC
-# include <functional>
-# ifdef __MINGW32__
-#  define _SYSTEM_STL_MAKE_HEADER(path,header) <path/header>
-#  include _SYSTEM_STL_MAKE_HEADER(GXX_INCLUDE_PATH,numeric)
-# else
-#  include <ext/../numeric>
-# endif
-# include <ext/numeric>
-
-# ifndef __GXX_EXPERIMENTAL_CXX0X__
-namespace std
-{
-	using __gnu_cxx::iota;
-}
-# endif
-
-#else
-# error UNSUPPORTED COMPILER
-#endif
-
-#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/stlport/systemstlguards/preextstl.h b/stlport/systemstlguards/preextstl.h
deleted file mode 100644
index 763f0dfa79f3..000000000000
--- a/stlport/systemstlguards/preextstl.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-//1. Force inclusion of a std:: using header to ensure the stlport define
-//of std as "stlport"
-#include <algorithm>
-#if defined(ADAPT_EXT_STL)
-//2. Force inclusion of stlport headers to get their stlport:: definitions
-#   include <ostream>
-#   include <istream>
-#   include <fstream>
-#   include <iostream>
-#   include <sstream>
-#   include <vector>
-#   include <deque>
-#   include <set>
-#   include <list>
-#   include <map>
-//3. Now force inclusion of native headers to get their std:: definitions
-#   if defined(std)
-#       define std_was_redefined_as_stlport std
-#       undef std
-#       define _STLP_OUTERMOST_HEADER_ID 0xdeadbeaf
-#       if defined(_GNUC__)
-#           pragma GCC visibility push(default)
-#       endif
-#       include _STLP_NATIVE_HEADER(exception_defines.h)
-#       include _STLP_NATIVE_HEADER(limits)
-#       include _STLP_NATIVE_HEADER(memory)
-#       include _STLP_NATIVE_HEADER(exception)
-#       include _STLP_NATIVE_HEADER(iosfwd)
-#       include _STLP_NATIVE_HEADER(algorithm)
-#       include _STLP_NATIVE_HEADER(string)
-#       include _STLP_NATIVE_HEADER(streambuf)
-#       include _STLP_NATIVE_HEADER(ios)
-#       include _STLP_NATIVE_HEADER(locale)
-#       include _STLP_NATIVE_HEADER(stdexcept)
-#       include _STLP_NATIVE_HEADER(ostream)
-#       include _STLP_NATIVE_HEADER(istream)
-#       include _STLP_NATIVE_HEADER(iostream)
-#       include _STLP_NATIVE_HEADER(sstream)
-#       include _STLP_NATIVE_HEADER(vector)
-#       include _STLP_NATIVE_HEADER(deque)
-#       include _STLP_NATIVE_HEADER(set)
-#       include _STLP_NATIVE_HEADER(list)
-#       include _STLP_NATIVE_HEADER(map)
-#       if defined(_GNUC__)
-#           pragma GCC visibility pop
-#       endif
-#   endif
-#endif
-//ext_std resolves to the std that external c++ libs, e.g. Graphite were built
-//against regardless of whether that is stlport or system stl
-namespace ext_std = std;
diff --git a/GNUmakefile b/tail_build/Makefile
index 9c2d78df9ac5..4773523fe957 100644
--- a/GNUmakefile
+++ b/tail_build/Makefile
@@ -38,7 +38,7 @@ else # SOLARENV
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
 
-$(foreach repo,$(gb_REPOS),$(eval $(call gb_Module_make_global_targets,$(wildcard $(repo)/Module_*.mk))))
+$(eval $(call gb_Module_make_global_targets,$(SRC_ROOT)/Module_tail_build.mk))
 
 endif # SOLARENV
 
diff --git a/tail_build/README b/tail_build/README
new file mode 100644
index 000000000000..4e29fb139ffb
--- /dev/null
+++ b/tail_build/README
@@ -0,0 +1,17 @@
+This module exist only to take advantage of the ability of gbuild to build
+multiple modules in one single Makefile.
+
+A few module that normally get built at the end of the build process
+are already converted. this 'pseudo-module' build them all as one.
+
+As module get converted to gbuild they can be added to this module
+if they fix the neceesary pre-requisite. that is:
+
+To qualify a module must not be the dependant of any other module,
+except postprocess or if the other module itself is under tail_build
+
+To migrate a module <foo> under tail_build, one should:
+* merge the dependencies declared in <foo>/prj/build.lst into tail_build/prj/build.lst
+* remove the module <foo> from postprocess/prj/build.lst dependencies
+* remove the module <foo> from tail_build/prj/build.lst dependencies
+* add the module name in Module_tail_build.mk at the root of bootstrap
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
new file mode 100644
index 000000000000..65eda027916d
--- /dev/null
+++ b/tail_build/prj/build.lst
@@ -0,0 +1,2 @@
+tb      tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt MDDS:mdds MESA:Mesa REDLAND:redland TRANSLATIONS:translations animations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter offapi offuh oovbaapi oox package qadevOOo rdbmaker sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure uui vbahelper vcl writerperfect xmlscript  NULL
+tb tail_build\prj nmake - all tb_prj   NULL
diff --git a/tail_build/prj/d.lst b/tail_build/prj/d.lst
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/tail_build/prj/d.lst
diff --git a/solenv/inc/scpre.mk b/tail_build/prj/makefile.mk
index 1b9b7a7dacac..e312a7ccab65 100644
--- a/solenv/inc/scpre.mk
+++ b/tail_build/prj/makefile.mk
@@ -25,26 +25,16 @@
 #
 #*************************************************************************
 
+PRJ=..
+TARGET=prj
 
+.INCLUDE : settings.mk
 
-#======================================================================
-# standardmaessig mit Optimierung, muss explizit mit nopt=t ausgeschaltet
-# werden, wenn nicht gewuenscht
-#----------------------------------------------------------------------
-
-#.IF defined(nopt) || defined(NOPT)
-#nopt=true
-#NOPT=TRUE
-#!undef optimize
-#!undef OPTIMIZE
-#.ELSE
-#.IF !(defined(debug) || defined(DEBUG))
-#optimize=true
-#OPTIMIZE=TRUE
-#.ENDIF
-#.ENDIF
-
-# falls dependencies auf s:\solver\... erstellt werden sollen
-# MKDEPENDSOLVER=YES
-
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog