ooo-build r9121 - in branches/ooo-build-2-1: . distro-configs patches/src680

[tml svn gnome org]

Author: tml
Date: 2007-03-28 18:45:41 +0100 (Wed, 28 Mar 2007)
New Revision: 9121
ViewCVS link: http://svn.gnome.org/viewcvs/ooo-build?rev=9121&view=rev

Modified:
   branches/ooo-build-2-1/ChangeLog
   branches/ooo-build-2-1/distro-configs/CommonWin32.conf.in
   branches/ooo-build-2-1/distro-configs/NovellWin32.conf.in
   branches/ooo-build-2-1/distro-configs/NovellWin32ISO.conf.in
   branches/ooo-build-2-1/patches/src680/win32-activex-disable.diff
Log:
2007-03-28  Tor Lillqvist  <tml novell com>

	Thanks to Robert Vojta for noticing that --disable-activex now in
	2.1 did more than what it used to in 2.0.4.

	* patches/src680/win32-activex-disable.diff: Upstream configury
	now has a --disable-activex switch that does more than what the
	--disable-activex implemented in this patch does. Rename our
	switch to --disable-activex-component. Correspondingly rename the
	feature test macros. The upstream --disable-activex also disables
	the OOo shell extensions. We only want to disable the embedding of
	OOo into IE etc.

	* distro-configs/CommonWin32.conf.in: Drop --disable-activex from
	here, even --disable-activex-component is not something I want to
	force upon other people building for Win32.

	* distro-configs/NovellWin32ISO.conf.in
	* distro-configs/NovellWin32.conf.in: Use
	--disable-activex-component here instead.