summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-09-18 18:25:29 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-09-18 18:26:42 +0200
commitfe4c47e41febceb4972d79874ccae4704be9b34b (patch)
tree985b18a19812c8e572824f8a011cf380a54b405a /configure.in
parent64d1fcb11f4915df960ec81bc9168a557199090f (diff)
Some clean-up of mork-related changs
And reverted for now the configure error when --enable-mozilla on non-Windows; it is still used for other features, too. Change-Id: I1ce5ff1a7a3d140a1ab7ba1e905166d91229c926
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in18
1 files changed, 3 insertions, 15 deletions
diff --git a/configure.in b/configure.in
index 7f9ec0119261..061bd2e6b926 100644
--- a/configure.in
+++ b/configure.in
@@ -701,7 +701,7 @@ AC_ARG_ENABLE(pch,
AC_ARG_ENABLE(mozilla,
AS_HELP_STRING([--enable-mozilla],
- [LibreOffice can include a strangely hacked up Mozilla binary on Windows
+ [LibreOffice can include a strangely hacked up Mozilla binary for your
platform, to build with this version, use this option.])
)
@@ -4519,18 +4519,6 @@ if test $_os = Darwin -a "$enable_mozilla" = no; then
fi
dnl ===================================================================
-dnl --enable-mozilla is supported only on Windows
-dnl ===================================================================
-
-if test "$_os" != "WINNT" ; then
- if test "$enable_mozilla" = "yes"; then
- AC_MSG_ERROR([--enable-mozilla is only available on Windows])
- fi
-
-fi
-
-
-dnl ===================================================================
dnl .NET needs special treatment
dnl (does the above comment really mean .NET, or is it misusing
dnl that to mean Visual Studio .NET 2003 ? And does this also
@@ -7900,13 +7888,13 @@ if test "$_os" = "WINNT"; then
elif test "$with_system_mozilla" = "yes"; then
AC_MSG_RESULT([no, not possible with system-mozilla])
else
- AC_MSG_RESULT([yes])
+ AC_MSG_RESULT([yes (old mozab driver)])
fi
else
# on all other platforms Mozilla addressbook connectivity
# is unconditionally built
# new and shiny mork driver
- AC_MSG_RESULT([yes])
+ AC_MSG_RESULT([yes (new mork driver)])
fi
dnl ===================================================================