Re: [PATCH] disable mozilla per default on all platforms (was Re: --disable mozilla necessary for Ubuntu)
On 06/08/2012 09:59 PM, David Ostrovsky wrote: On 08.06.2012 12:52, Rene Engelhard wrote: On Thu, Jun 07, 2012 at 09:01:31PM -0700, Joel Madero wrote: It's been a long time since the default install has worked for me on any Ubuntu or Ubuntu based distro. I always have to add --disable-mozilla in Sane option. Anyone serious wants that. :) no, not with this patch any more ;-) I'm not sure we want this patch (see the other branch of this mail thread for fixing the build on Ubuntu instead). But if we do apply it, we should also adapt AC_ARG_ENABLE(mozilla, AS_HELP_STRING([--disable-mozilla], [LibreOffice usually includes a strangely hacked up Mozilla binary for your platform, to build without this version, use this option.]) ) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] disable mozilla per default on all platforms (was Re: --disable mozilla necessary for Ubuntu)
On 11.06.2012 11:44, Stephan Bergmann wrote: On 06/08/2012 09:59 PM, David Ostrovsky wrote: On 08.06.2012 12:52, Rene Engelhard wrote: On Thu, Jun 07, 2012 at 09:01:31PM -0700, Joel Madero wrote: It's been a long time since the default install has worked for me on any Ubuntu or Ubuntu based distro. I always have to add --disable-mozilla in Sane option. Anyone serious wants that. :) no, not with this patch any more ;-) I'm not sure we want this patch (see the other branch of this mail thread for fixing the build on Ubuntu instead). But if we do apply it, we should also adapt It is not (only) about compilation problems: the vast majority of LO folks out there (at least all serious guys, see Rene's comment above ;-) *use* this option anyway. That why the invertion of logic here is more then justified. Not to mention the newbies and seasoned LO hackers, who were spendings hours to find the right option to accelerate the LO build (or even get it done). AC_ARG_ENABLE(mozilla, AS_HELP_STRING([--disable-mozilla], [LibreOffice usually includes a strangely hacked up Mozilla binary for your platform, to build without this version, use this option.]) ) fixed: --enable-mozilla LibreOffice can include a strangely hacked up Mozilla binary for your platform, to build with this version, use this option. Regards David From 0af38a2d4d11a7745f8a3f7f8a4d6fed3267c49d Mon Sep 17 00:00:00 2001 From: David Ostrovsky david.ostrov...@gmx.de Date: Thu, 7 Jun 2012 17:46:31 -0700 Subject: [PATCH] disable mozilla per default on all platforms Change-Id: Ie5e8c7c43d86f060d7733c1787c6382e78c0a463 --- configure.in | 31 ++- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/configure.in b/configure.in index fb4f3df..48bfd38 100644 --- a/configure.in +++ b/configure.in @@ -595,9 +595,9 @@ AC_ARG_ENABLE(pch, ) AC_ARG_ENABLE(mozilla, -AS_HELP_STRING([--disable-mozilla], -[LibreOffice usually includes a strangely hacked up Mozilla binary for your - platform, to build without this version, use this option.]) +AS_HELP_STRING([--enable-mozilla], +[LibreOffice can include a strangely hacked up Mozilla binary for your + platform, to build with this version, use this option.]) ) AC_ARG_ENABLE(epm, @@ -3611,6 +3611,21 @@ AC_SUBST(UPD) AC_SUBST(SOURCEVERSION) dnl === +dnl Set the WITH_MOZILLA variable. +dnl === + +AC_MSG_CHECKING([whether to enable build of Mozilla]) +if test $enable_mozilla = yes; then +AC_MSG_RESULT([yes]) +WITH_MOZILLA=YES +else +AC_MSG_RESULT([no]) +WITH_MOZILLA=NO +enable_mozilla=no +fi +AC_SUBST(WITH_MOZILLA) + +dnl === dnl Set the ENABLE_CRASHDUMP variable. dnl === AC_MSG_CHECKING([whether to enable crashdump feature]) @@ -7425,16 +7440,6 @@ else fi AC_SUBST(SYSTEM_ODBC_HEADERS) -AC_MSG_CHECKING([whether to enable build of Mozilla]) -if test $enable_mozilla = no; then -AC_MSG_RESULT([no]) -WITH_MOZILLA=NO -else -AC_MSG_RESULT([yes]) -WITH_MOZILLA=YES -fi -AC_SUBST(WITH_MOZILLA) - AC_MSG_CHECKING([whether to build Mozilla addressbook connectivity]) if test $enable_mozilla = no; then AC_MSG_RESULT([no]) -- 1.7.5.4 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] disable mozilla per default on all platforms (was Re: --disable mozilla necessary for Ubuntu)
On 08.06.2012 12:52, Rene Engelhard wrote: On Thu, Jun 07, 2012 at 09:01:31PM -0700, Joel Madero wrote: It's been a long time since the default install has worked for me on any Ubuntu or Ubuntu based distro. I always have to add --disable-mozilla in Sane option. Anyone serious wants that. :) no, not with this patch any more ;-) Regards David From 3cb8a6ef37e6862492cb62d2f484a82dfe54d0fd Mon Sep 17 00:00:00 2001 From: David Ostrovsky david.ostrov...@gmx.de Date: Thu, 7 Jun 2012 17:46:31 -0700 Subject: [PATCH] disable mozilla per default on all platforms Change-Id: Ie5e8c7c43d86f060d7733c1787c6382e78c0a463 --- configure.in | 25 +++-- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/configure.in b/configure.in index d52f912..87f3334 100644 --- a/configure.in +++ b/configure.in @@ -3614,6 +3614,21 @@ AC_SUBST(UPD) AC_SUBST(SOURCEVERSION) dnl === +dnl Set the WITH_MOZILLA variable. +dnl === + +AC_MSG_CHECKING([whether to enable build of Mozilla]) +if test $enable_mozilla = yes; then +AC_MSG_RESULT([yes]) +WITH_MOZILLA=YES +else +AC_MSG_RESULT([no]) +WITH_MOZILLA=NO +enable_mozilla=no +fi +AC_SUBST(WITH_MOZILLA) + +dnl === dnl Set the ENABLE_CRASHDUMP variable. dnl === AC_MSG_CHECKING([whether to enable crashdump feature]) @@ -7407,16 +7422,6 @@ else fi AC_SUBST(SYSTEM_ODBC_HEADERS) -AC_MSG_CHECKING([whether to enable build of Mozilla]) -if test $enable_mozilla = no; then -AC_MSG_RESULT([no]) -WITH_MOZILLA=NO -else -AC_MSG_RESULT([yes]) -WITH_MOZILLA=YES -fi -AC_SUBST(WITH_MOZILLA) - AC_MSG_CHECKING([whether to build Mozilla addressbook connectivity]) if test $enable_mozilla = no; then AC_MSG_RESULT([no]) -- 1.7.9.5 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] disable mozilla per default on all platforms (was Re: --disable mozilla necessary for Ubuntu)
This is going to be an incredibly simple question but, how do I apply the patch? As soon as I do I'll compile tonight without the disable mozilla option and then suggest that it gets pushed as soon as possible. Thanks for taking care of this so quickly. Also, I'll update the webpage which currently says something about disabling mozilla if needed. Joel On Fri, Jun 8, 2012 at 12:59 PM, David Ostrovsky david.ostrov...@gmx.dewrote: On 08.06.2012 12:52, Rene Engelhard wrote: On Thu, Jun 07, 2012 at 09:01:31PM -0700, Joel Madero wrote: It's been a long time since the default install has worked for me on any Ubuntu or Ubuntu based distro. I always have to add --disable-mozilla in Sane option. Anyone serious wants that. :) no, not with this patch any more ;-) Regards David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
