Date: prev next · Thread: first prev next last
2012 Archives by date, by thread · List index


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.Ostrovsky@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


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.