[ooo-build-commit] .: configure.in distro-configs/LibreOfficeLinuxDevel.conf.in

Michael Meeks mmeeks at kemper.freedesktop.org
Fri Oct 1 03:20:50 PDT 2010


 configure.in                                 |    2 +-
 distro-configs/LibreOfficeLinuxDevel.conf.in |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 4e795fc1e14b4d3f089347381867d9d0034fc2dd
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Oct 1 11:19:54 2010 +0100

    disable EPM, switch to LibreOfficeLinuxDevel by default, and use system python

diff --git a/configure.in b/configure.in
index 2ec9184..d36526f 100644
--- a/configure.in
+++ b/configure.in
@@ -656,7 +656,7 @@ case "$with_distro" in
     ""|"yes"|"no") distros_list=`ls distro-configs/*.conf.in | sort | sed -e "s|distro-configs/\(.*\).conf.in|\t\1|g"`
         AC_MSG_WARN([A distribution could be selected by the option --with-distro. You can choose one from:
 $distros_list])
-	DISTRO="RAW"
+	DISTRO="LibreOfficeLinuxDevel"
         ;;
     NLD) DISTRO="SUSE"
         ;;
diff --git a/distro-configs/LibreOfficeLinuxDevel.conf.in b/distro-configs/LibreOfficeLinuxDevel.conf.in
index 2a0a079..40edaf6 100644
--- a/distro-configs/LibreOfficeLinuxDevel.conf.in
+++ b/distro-configs/LibreOfficeLinuxDevel.conf.in
@@ -21,7 +21,7 @@
 --without-system-jpeg
 --without-system-libxml
 --without-system-libxslt
---without-system-python
+--with-system-python
 --without-system-zlib
 --without-system-jars
 --without-system-stdlibs
@@ -49,3 +49,4 @@
 --with-external-thes-dir=/usr/share/mythes
 --with-dict=ALL
 --without-system-openssl
+--disable-epm
\ No newline at end of file


More information about the ooo-build-commit mailing list