[Libreoffice-commits] core.git: 2 commits - configure.ac scp2/InstallScript_setup_osl.mk scp2/Module_scp2.mk scp2/source setup_native/Module_setup_native.mk

[Matúš Kukan]

 configure.ac                           |    1 -
 scp2/InstallScript_setup_osl.mk        |    2 +-
 scp2/Module_scp2.mk                    |    2 +-
 scp2/source/activex/file_activex.scp   |    4 ----
 scp2/source/activex/module_activex.scp |    4 ----
 setup_native/Module_setup_native.mk    |    2 +-
 6 files changed, 3 insertions(+), 12 deletions(-)

New commits:
commit b6fc0ac84ce68586393784713693cc6b658a2785
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Tue Sep 17 20:28:13 2013 +0200

    remove WITH_ACTIVEX_COMPONENT
    
    Change-Id: I3320b3ce3307598a479dfac5b120e85441c670dc

diff --git a/configure.ac b/configure.ac
index bf78f35..fda58df 100644
--- a/configure.ac
+++ b/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"
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
index 72c789d..75f2a8c2 100644
--- a/scp2/InstallScript_setup_osl.mk
+++ b/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)),\
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index bd30477..05911c5 100644
--- a/scp2/Module_scp2.mk
+++ b/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)),\
diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp
index c710aba..e6864b8 100644
--- a/scp2/source/activex/file_activex.scp
+++ b/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
diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp
index 78b8954..e56ced7 100644
--- a/scp2/source/activex/module_activex.scp
+++ b/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
commit f3464f5e0918152d8ff1552ed4932523990b2b79
Author: Korrawit Pruegsanusak <detective.conan.1412 at gmail.com>
Date:   Sun Sep 15 23:02:25 2013 +0700

    no need for Library_regactivex in --disable-activex build
    
    as stated on Repository.mk
    
    Change-Id: Id88c9d1eae27754f10246004ac8d8ae6326ae143

diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk
index b74ac08..3daff3f 100644
--- a/setup_native/Module_setup_native.mk
+++ b/setup_native/Module_setup_native.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_Module_add_targets,setup_native,\
         Library_instooofiltmsi \
 	Library_qslnkmsi \
 	Library_reg4allmsdoc \
-	Library_regactivex \
+	$(if $(DISABLE_ACTIVEX),,Library_regactivex) \
 	Library_regpatchactivex \
 	Library_sdqsmsi \
 	Library_sellangmsi \