diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-10-01 11:19:54 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-10-01 11:20:16 +0100 |
| commit | 4e795fc1e14b4d3f089347381867d9d0034fc2dd (patch) | |
| tree | a6b07bd2d82b3011f6f9f30bb14ce960c938a302 | |
| parent | 05b3866035600c567ad7a482b7319fb298662c0b (diff) | |
disable EPM, switch to LibreOfficeLinuxDevel by default, and use system python
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | distro-configs/LibreOfficeLinuxDevel.conf.in | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 2ec91841a..d36526f25 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 2a0a079f5..40edaf611 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 |