Signed-off-by: Thorsten Behrens <tbehrens@novell.com>

Signed off by Caolán McNamara <caolanm@redhat.com>

libreoffice fails to build with --with-lightproof unless --with-extension-integration is also specified
https://bugs.freedesktop.org/show_bug.cgi?id=31186

All extension integration require --with-extension-integration switch

https://bugs.freedesktop.org/show_bug.cgi?id=32226

Conflicts:

	scp2/source/ooo/module_hidden_ooo.scp

DOH, here comes v3, I left a debug output in configure.in in v2, otherwise no change. Sorry

Sebastian

>From 6c379488250f5a3349dfc2d805f70a0f084fe07d Mon Sep 17 00:00:00 2001
From: Sebastian Spaeth <Sebastian@SSpaeth.de>
Date: Thu, 9 Dec 2010 12:23:55 +0100
Subject: [PATCHv3] Introduce an --enable-theme="theme1 theme2..." option

By default, we include all defaults as before, but if given, we can
limit the number of included themes with e.g. --enable-theme="oxygen
tango". This is passed through set_soenv and sets the environment
variable ENABLE_THEMES="...." which can be used by the packimages
makefile in the postprocess repository. It also adds defines in the
form of THEME_OXYGEN that are being used in the scp2 module to decide
if we should install the theme file or not.
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>

extend list of library path using AUGMENT_LIBRARY_PATH_LOCAL instead of
AUGMENT_LIBRARY_PATH
Signed-off-by: Petr Mladek <pmladek@suse.cz>

the berkeley db header is installed as /usr/local/db.h
on debian/ubuntu

on some platforms there are extra libs needed when linking with -lpython,
for example -pthread and -lutil on OpenBSD

try to find all the supported db headers and libs in all
the "standard" directories

Let's try our best to create a good list of langauges in a format
of lang1,lang2.
Also remove the wanted function which is not used since
the baab40f5646b63ff51e7cb9c5aaac873066d46fe commit.

Conflicts:

	solenv/bin/modules/installer/download.pm

 Introduces:
 --enable-extra-gallery  - for additional galleries
 --enable-extra-template - for additional templates
 --enable-extra-sample   - for additional samples
 --enable-extra-font     - for additional fonts
 configure options.

As the hang seems to be causes by the code messing around in extension
help file directories, of which there are lots in a multi-lingual
build for at least the presenter-screen extension, just build en-US
extension help for now.

Why such a change is needed both here and in
sdext/source/presenter/makefile.mk (see commit
c2a7a6c055cf586b627268d38fd85cde2048db3d in the "extensions" repo) I
don't know, but that's how it seemed in my testing.

the gid_Brand_File* definitions broke non-en_US builds

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>