[Libreoffice-commits] .: 3 commits - distro-configs/LibreOfficeWin32.conf Makefile.in README.cross

[Tor Lillqvist]

 Makefile.in                          |    3 +--
 README.cross                         |   14 +++++++-------
 distro-configs/LibreOfficeWin32.conf |    1 -
 3 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 1fdbe49869745f616c0d1675f6b6c22e1c6cd01b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jun 13 15:46:26 2011 +0300

    Update my Windows autogen.lastrun

diff --git a/README.cross b/README.cross
index 0926be0..0f21f91 100644
--- a/README.cross
+++ b/README.cross
@@ -108,6 +108,7 @@ CXX_FOR_BUILD=ccache g++
 --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
@@ -116,20 +117,19 @@ CXX_FOR_BUILD=ccache g++
 --with-system-curl
 --with-system-db
 --with-system-expat
+--with-system-gettext
 --with-system-hunspell
 --with-system-icu
---with-system-jpeg
---with-system-lpsolve
---with-system-neon
---with-system-openssl
---with-system-redland
 --with-system-libwpd
---with-system-libwps
 --with-system-libwpg
+--with-system-libwps
 --with-system-libxml
 --with-system-libxslt
+--with-system-lpsolve
 --with-system-mythes
---with-system-python
+--with-system-neon
+--with-system-openssl
+--with-system-redland
 --with-system-zlib
 --with-vendor=no
 
commit fadb8d15d0f6747ccd8a5c957c77f38799c1c427
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jun 13 15:45:58 2011 +0300

    No enable-ext-scripting-python any more

diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index acc6320..c8c993f 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -10,7 +10,6 @@
 --enable-binfilter
 --enable-ext-scripting-beanshell
 --enable-ext-scripting-javascript
---enable-ext-scripting-python
 --enable-ext-wiki-publisher
 --enable-ext-report-builder
 --enable-ext-presenter-minimizer
commit 5cefb3820c3f4264a044936f465c1fcc265ab30b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jun 13 15:45:15 2011 +0300

    Fix comphelper in cross-build-toolset

diff --git a/Makefile.in b/Makefile.in
index 21a7ad7..7c78ee6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -60,7 +60,7 @@ cross-build-toolset:
 	  jvmaccess \
 	  bridges \
 	  ucbhelper \
-	  comphelper \
+	  GBUILD:comphelper \
 	  jvmfwk \
 	  regexp \
 	  sax \
@@ -71,7 +71,6 @@ cross-build-toolset:
 	  dictionaries \
 	  o3tl \
 	  basegfx \
-	  GBUILD:comphelper \
 	  GBUILD:tools \
 	  rsc \
 	  setup_native; do \