[Libreoffice-commits] .: Branch 'feature/kill-set_soenv' - 3 commits - configure.in distro-configs/DevLean.conf distro-configs/LibreOfficeLinux.conf

[Bjoern Michaelsen]

 configure.in                         |    4 ++++
 distro-configs/DevLean.conf          |    4 ++++
 distro-configs/LibreOfficeLinux.conf |    1 -
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 5d206f1c7fd779c13939a457a0345e9b8112296d
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Sep 19 19:08:19 2011 +0200

    --enable-cairo is unknown to ./configure

diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 4fe3325..eac3b4a 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -38,7 +38,6 @@
 --enable-ext-scripting-javascript
 --enable-ext-nlpsolver
 --enable-epm
---enable-cairo
 --enable-binfilter
 --enable-python=internal
 --disable-xrender-link
commit fa281546f620cac1af5f20ac67281abdeeba5b5d
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Sep 19 19:07:31 2011 +0200

    add distro DevLean buildable from core alone

diff --git a/distro-configs/DevLean.conf b/distro-configs/DevLean.conf
new file mode 100644
index 0000000..cf6dd4d
--- /dev/null
+++ b/distro-configs/DevLean.conf
@@ -0,0 +1,4 @@
+--disable-mozilla
+--disable-binfilter
+--without-help
+--without-myspell-dicts
commit 9dffe55d3fc24dad0b5ceb9be513999e81cdfe32
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Sep 19 18:56:50 2011 +0200

    fix build with internal beanshell

diff --git a/configure.in b/configure.in
index f0d3018..d21f906 100755
--- a/configure.in
+++ b/configure.in
@@ -9604,6 +9604,10 @@ if [[ "$SYSTEM_LIBXSLT" != "YES" ]]
 then
     XSLTPROC="$SOLARVER/$INPATH/bin/xsltproc"
 fi
+if [[ "$SYSTEM_BSH" != "YES" ]]
+then
+    BSH_JAR="$SOLARVER/$INPATH/bin/bsh.jar"
+fi
 
 AC_SUBST(BUILD_PLATFORM)
 AC_SUBST(CLASSPATH)