[Libreoffice-commits] .: configure.in

[Bjoern Michaelsen]

 configure.in |   31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

New commits:
commit bbdb00c8c57a72f9bc730d3f7aab8a4d4acc6308
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date:   Thu Jun 7 17:46:31 2012 -0700

    disable mozilla per default on all platforms
    
    Change-Id: Ie5e8c7c43d86f060d7733c1787c6382e78c0a463

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])