configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e5a8388f04995cafddeee79cd419904b1cecade1 Author: David Tardon <dtar...@redhat.com> Date: Fri May 25 21:57:10 2012 +0200
do not configure activex component on mingw Change-Id: I4aa4be9c29248c75929f6bcd5f09b33cf2a381a0 diff --git a/configure.in b/configure.in index fa47eab..080f1c1 100644 --- a/configure.in +++ b/configure.in @@ -10421,7 +10421,7 @@ AC_SUBST(ENABLE_SILENT_MSI) dnl =================================================================== dnl Test whether to enable ActiveX embedding dnl =================================================================== -if test "$_os" = "WINNT"; then +if test "$_os" = "WINNT" -a "$WITH_MINGW" != yes; then AC_MSG_CHECKING([whether to enable ActiveX embedding of LibreOffice components]) if test "$enable_activex_component" = "yes" -o "$enable_activex_component" = "TRUE" -o "$enable_activex_component" = ""; then ENABLE_ACTIVEX_COMPONENT="TRUE" _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits