remove WITH_ACTIVEX_COMPONENT

Change-Id: I3320b3ce3307598a479dfac5b120e85441c670dc

configure.ac

@@ -3065,7 +3065,6 @@ if test "$_os" = "WINNT" -a "$WITH_MINGW" != yes; then
     AC_MSG_CHECKING([whether to use ActiveX])
     if test "$enable_activex" = "yes" -o "$enable_activex" = ""; then
         DISABLE_ACTIVEX=""
-        SCPDEFS="$SCPDEFS -DWITH_ACTIVEX_COMPONENT"
         AC_MSG_RESULT([yes])
     else
         DISABLE_ACTIVEX="TRUE"

scp2/InstallScript_setup_osl.mk

@@ -26,7 +26,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
 	scp2/writer \
 	scp2/xsltfilter \
 	$(if $(filter WNT,$(OS)),\
-		scp2/activex \
+		$(if $(DISABLE_ACTIVEX),,scp2/activex) \
 		scp2/quickstart \
 		scp2/windows \
 		$(if $(filter MSC,$(COM)),\

scp2/Module_scp2.mk

@@ -37,7 +37,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
 		InstallScript_sdkoo \
 	) \
 	$(if $(filter WNT,$(OS)),\
-		InstallModule_activex \
+		$(if $(DISABLE_ACTIVEX),,InstallModule_activex) \
 		InstallModule_quickstart \
 		InstallModule_windows \
 		$(if $(filter MSC,$(COM)),\

scp2/source/activex/file_activex.scp

@@ -18,8 +18,6 @@
 
 #include "macros.inc"
 
-#ifdef WITH_ACTIVEX_COMPONENT
-
 File gid_File_Lib_Soactivex
     LIB_FILE_BODY;
     Styles = (PACKED);
@@ -36,5 +34,3 @@ End
 		ComponentCondition = "VersionNT64";
 	End
 #endif
-
-#endif // WITH_ACTIVEX_COMPONENT

scp2/source/activex/module_activex.scp

@@ -19,8 +19,6 @@
 #include "macros.inc"
 #include "AutoInstall/activexbinarytable"
 
-#ifdef WITH_ACTIVEX_COMPONENT
-
 Module gid_Module_Optional_Activexcontrol
     PackageInfo = "packinfo_office.txt";
     MOD_NAME_DESC ( MODULE_OPTIONAL_ACTIVEXCONTROL );
@@ -33,5 +31,3 @@ Module gid_Module_Optional_Activexcontrol
         gid_File_Lib_Soactivex64,
         gid_File_Lib_Regpatchactivex_Msi);
 End
-
-#endif // WITH_ACTIVEX_COMPONENT