[Libreoffice-commits] .: configure.ac extensions/Module_extensions.mk np_sdk/Module_np_sdk.mk postprocess/packcomponents Repository.mk scp2/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Nov 19 08:44:44 PST 2012
Repository.mk | 14 ++++----------
configure.ac | 7 ++++---
extensions/Module_extensions.mk | 11 +++--------
np_sdk/Module_np_sdk.mk | 9 ++-------
postprocess/packcomponents/makefile.mk | 2 +-
scp2/source/ooo/file_library_ooo.scp | 2 +-
scp2/source/ooo/file_ooo.scp | 22 +++++++++++-----------
7 files changed, 26 insertions(+), 41 deletions(-)
New commits:
commit f9059d4eee8e53c0a6b531fff16e1fade58cb8b0
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Nov 19 17:41:01 2012 +0100
Key all browser plugin features to --enable-nsplugin
...instead of having them spread across --enable-nsplugin (plug LO into browser
windows) and --enable-mozilla (plug browser plugins into LO documents). The
ultimate goal is to clean up the various configure options mentioning "mozilla"
and WITH_MOZILLA.
Change-Id: I6f4b1c3a5701424f586cc1e303af90c9d59a91b6
diff --git a/Repository.mk b/Repository.mk
index 754fc20..82aac94 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -190,21 +190,15 @@ endif
ifeq ($(ENABLE_NSPLUGIN),YES)
$(eval $(call gb_Helper_register_executables,OOO,\
nsplugin \
-))
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- npsoplugin \
-))
-endif
-
-ifeq ($(WITH_MOZILLA),YES)
-$(eval $(call gb_Helper_register_executables,OOO,\
pluginapp.bin \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
pl \
))
-endif # WITH_MOZILLA
-
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ npsoplugin \
+))
+endif
ifeq ($(OS),MACOSX)
diff --git a/configure.ac b/configure.ac
index c85e0e0..101ea03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1015,7 +1015,9 @@ AC_ARG_ENABLE(zenity,
AC_ARG_ENABLE(nsplugin,
AS_HELP_STRING([--disable-nsplugin],
- [Do not build nsplugin extension for browser embedding.])
+ [Do not build NPAPI-based plugin features (allowing to plug LibreOffice
+ into browser windows, and to plug browser plugins into LibreOffice
+ documents.])
)
AC_ARG_ENABLE(cups,
@@ -8387,8 +8389,7 @@ if test "$with_system_npapi_headers" = "yes"; then
AC_LANG_POP([C])
else
AC_MSG_RESULT([internal])
- dnl ...but will not be built/used unless ENABLE_NSPLUGIN or WITH_MOZILLA
- dnl is YES
+ dnl ...but will not be built/used unless ENABLE_NSPLUGIN is YES
SYSTEM_NPAPI_HEADERS=NO
fi
AC_SUBST(NPAPI_HEADERS_CFLAGS)
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 67133d0..99ec13f 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -104,19 +104,14 @@ endif # DISABLE_ATL
endif # WNT
ifeq ($(ENABLE_NSPLUGIN),YES)
+
$(eval $(call gb_Module_add_targets,extensions,\
Executable_nsplugin \
Library_npsoplugin \
+ Library_pl \
StaticLibrary_npsoenv \
WinResTarget_npsoplugin \
))
-endif
-
-ifeq ($(WITH_MOZILLA),YES)
-
-$(eval $(call gb_Module_add_targets,extensions,\
- Library_pl \
-))
ifeq ($(GUI),UNX)
ifneq ($(GUIBASE),aqua)
@@ -127,7 +122,7 @@ $(eval $(call gb_Module_add_targets,extensions,\
endif
endif
-endif # WITH_MOZILLA=YES
+endif # ENABLE_PLUGIN=YES
ifeq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,extensions,\
diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk
index 6ebba87..81c3742 100644
--- a/np_sdk/Module_np_sdk.mk
+++ b/np_sdk/Module_np_sdk.mk
@@ -27,10 +27,11 @@
$(eval $(call gb_Module_Module,np_sdk))
-ifneq (,$(filter YES,$(ENABLE_NSPLUGIN) $(WITH_MOZILLA)))
+ifeq ($(ENABLE_NSPLUGIN),YES)
$(eval $(call gb_Module_add_targets,np_sdk,\
Package_inc \
+ StaticLibrary_nputils \
))
ifeq ($(SYSTEM_NPAPI_HEADERS),NO)
@@ -39,12 +40,6 @@ $(eval $(call gb_Module_add_targets,np_sdk,\
))
endif
-ifeq ($(ENABLE_NSPLUGIN),YES)
-$(eval $(call gb_Module_add_targets,np_sdk,\
- StaticLibrary_nputils \
-))
-endif
-
endif
# vim: set noet sw=4 ts=4:
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 47c6c2b..d8d6edd 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -298,7 +298,7 @@ my_components += \
component/wizards/com/sun/star/wizards/web/web
.END
-.IF "$(WITH_MOZILLA)" != "NO"
+.IF "$(ENABLE_NSPLUGIN)" == "YES"
my_components += component/extensions/source/plugin/pl
.END
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index b4bb392..1e038f8 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -934,7 +934,7 @@ SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui)
STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
-#ifndef WITHOUT_MOZILLA
+#if defined ENABLE_NSPLUGIN
STD_LIB_FILE( gid_File_Lib_Pl , pl)
#endif
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index eaf9294..b732248 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -103,6 +103,7 @@ File gid_File_Basic_Tutorials
End
#ifdef ENABLE_NSPLUGIN
+
File gid_File_Exe_Nsplugin
BIN_FILE_BODY;
Styles = (PACKED);
@@ -113,8 +114,18 @@ File gid_File_Exe_Nsplugin
Name = "nsplugin.exe";
#endif
End
+
+#if defined(UNX) && !defined(QUARTZ)
+File gid_File_Bin_Pluginapp
+ BIN_FILE_BODY;
+ Dir = gid_Brand_Dir_Program;
+ Name = "pluginapp.bin";
+ Styles = (PACKED);
+End
#endif
+#endif // ENABLE_NSPLUGIN
+
File gid_File_Bin_Gengal
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
@@ -148,17 +159,6 @@ End
#endif
-#if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ)
-
-File gid_File_Bin_Pluginapp
- BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "pluginapp.bin";
- Styles = (PACKED);
-End
-
-#endif
-
#ifdef UNX
File gid_File_Bin_Open_Url
More information about the Libreoffice-commits
mailing list