mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename "Mozilla headers" to "NPAPI headers" (incl. configure option name)

Browse Source 
...to avoid confusion what that is actually about.  (Especially, it is
completely unrelated to --enable-mozilla.)

ATTENTION:  This renames the configure option --with-system-mozilla-headers to
--with-system-npapi-headers.

Change-Id: I48f3c79d69c4d4f445a94e7ddbeab06ea667becc
This commit is contained in:
Stephan Bergmann 2012-11-15 18:09:55 +01:00
parent fc45189c7a
commit 13ef9dcc20
10 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
RepositoryExternal.mk
View File

@ -51,20 +51,20 @@ endef
endif endif
ifeq ($(SYSTEM_MOZILLA_HEADERS),YES) ifeq ($(SYSTEM_NPAPI_HEADERS),YES)
define gb_LinkTarget__use_mozilla_headers define gb_LinkTarget__use_npapi_headers
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
$(MOZILLA_HEADERS_CFLAGS) \ $(NPAPI_HEADERS_CFLAGS) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
endef endef
else #!SYSTEM_MOZILLA_HEADERS else #!SYSTEM_NPAPI_HEADERS
define gb_LinkTarget__use_mozilla_headers define gb_LinkTarget__use_npapi_headers
$(call gb_LinkTarget_use_package,$(1),mozilla_inc) $(call gb_LinkTarget_use_package,$(1),npapi)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(OUTDIR)/inc/external/npsdk \ -I$(OUTDIR)/inc/external/npsdk \
$$(INCLUDE) \ $$(INCLUDE) \
@ -72,7 +72,7 @@ $(call gb_LinkTarget_set_include,$(1),\
endef endef
endif #SYSTEM_MOZILLA_HEADERS endif #SYSTEM_NPAPI_HEADERS
ifeq ($(SYSTEM_ODBC_HEADERS),YES) ifeq ($(SYSTEM_ODBC_HEADERS),YES)

4
config_host.mk.in
View File

@ -429,7 +429,7 @@ export ML_EXE=@ML_EXE@
export MOC4=@MOC4@ export MOC4=@MOC4@
export MOC=@MOC@ export MOC=@MOC@
export MOZILLABUILD=@MOZILLABUILD@ export MOZILLABUILD=@MOZILLABUILD@
export MOZILLA_HEADERS_CFLAGS=$(gb_SPACE)@MOZILLA_HEADERS_CFLAGS@ export NPAPI_HEADERS_CFLAGS=$(gb_SPACE)@NPAPI_HEADERS_CFLAGS@
export MOZILLA_VERSION=@MOZILLA_VERSION@ export MOZILLA_VERSION=@MOZILLA_VERSION@
export MOZ_FLAVOUR=@MOZ_FLAVOUR@ export MOZ_FLAVOUR=@MOZ_FLAVOUR@
export MOZ_INC=@MOZ_INC@ export MOZ_INC=@MOZ_INC@
@ -618,7 +618,7 @@ export SYSTEM_LPSOLVE=@SYSTEM_LPSOLVE@
export SYSTEM_MDDS=@SYSTEM_MDDS@ export SYSTEM_MDDS=@SYSTEM_MDDS@
export SYSTEM_MESA_HEADERS=@SYSTEM_MESA_HEADERS@ export SYSTEM_MESA_HEADERS=@SYSTEM_MESA_HEADERS@
export SYSTEM_MOZILLA=@SYSTEM_MOZILLA@ export SYSTEM_MOZILLA=@SYSTEM_MOZILLA@
export SYSTEM_MOZILLA_HEADERS=@SYSTEM_MOZILLA_HEADERS@ export SYSTEM_NPAPI_HEADERS=@SYSTEM_NPAPI_HEADERS@
export SYSTEM_MYSQL=@SYSTEM_MYSQL@ export SYSTEM_MYSQL=@SYSTEM_MYSQL@
export SYSTEM_MYSQL_CPPCONN=@SYSTEM_MYSQL_CPPCONN@ export SYSTEM_MYSQL_CPPCONN=@SYSTEM_MYSQL_CPPCONN@
export SYSTEM_MYTHES=@SYSTEM_MYTHES@ export SYSTEM_MYTHES=@SYSTEM_MYTHES@

36
configure.ac
View File

@ -1676,11 +1676,11 @@ AC_ARG_WITH(system-mozilla,
WITH_SYSTEM_MOZILLA=$withval , WITH_SYSTEM_MOZILLA=$withval ,
WITH_SYSTEM_MOZILLA=no) WITH_SYSTEM_MOZILLA=no)
AC_ARG_WITH(system-mozilla-headers, AC_ARG_WITH(system-npapi-headers,
AS_HELP_STRING([--with-system-mozilla-headers], AS_HELP_STRING([--with-system-npapi-headers],
[Use mozilla headers provided by system instead of bundled ones. Used in [Use NPAPI headers provided by system instead of bundled ones. Used in
nsplugin]),, extensions/source/nsplugin and extensions/source/plugin]),,
[with_system_mozilla_headers="$with_system_headers"] [with_system_npapi_headers="$with_system_headers"]
) )
AC_ARG_WITH(system-libpng, AC_ARG_WITH(system-libpng,
@ -8336,19 +8336,19 @@ dnl ===================================================================
dnl Check for system mozilla headers dnl Check for system mozilla headers
dnl =================================================================== dnl ===================================================================
HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION= HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=
AC_MSG_CHECKING([which Mozilla headers to use]) AC_MSG_CHECKING([which NPAPI headers to use])
if test "$with_system_mozilla_headers" = "yes"; then if test "$with_system_npapi_headers" = "yes"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_MOZILLA_HEADERS=YES SYSTEM_NPAPI_HEADERS=YES
# First try npapi-sdk: # First try npapi-sdk:
PKG_CHECK_MODULES(MOZILLA_HEADERS, npapi-sdk, [LOCATED=yes], [LOCATED=no]) PKG_CHECK_MODULES(NPAPI_HEADERS, npapi-sdk, [LOCATED=yes], [LOCATED=no])
# Then go with libxul: # Then go with libxul:
if test "x$LOCATED" != "xyes"; then if test "x$LOCATED" != "xyes"; then
PKG_CHECK_MODULES(MOZILLA_HEADERS, libxul, [LOCATED=yes], [LOCATED=no]) PKG_CHECK_MODULES(NPAPI_HEADERS, libxul, [LOCATED=yes], [LOCATED=no])
fi fi
if test "x$LOCATED" != "xyes"; then if test "x$LOCATED" != "xyes"; then
PKG_CHECK_MODULES(MOZILLA_HEADERS, mozilla-plugin, [LOCATED=yes], [LOCATED=no]) PKG_CHECK_MODULES(NPAPI_HEADERS, mozilla-plugin, [LOCATED=yes], [LOCATED=no])
fi fi
# if still not found bail out # if still not found bail out
if test "x$LOCATED" != "xyes"; then if test "x$LOCATED" != "xyes"; then
@ -8357,7 +8357,7 @@ if test "$with_system_mozilla_headers" = "yes"; then
AC_LANG_PUSH([C]) AC_LANG_PUSH([C])
save_CFLAGS=$CFLAGS save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $MOZILLA_HEADERS_CFLAGS" CFLAGS="$CFLAGS $NPAPI_HEADERS_CFLAGS"
AC_MSG_CHECKING([for NPP_GetMIMEDescription return type]) AC_MSG_CHECKING([for NPP_GetMIMEDescription return type])
AC_COMPILE_IFELSE( AC_COMPILE_IFELSE(
[AC_LANG_SOURCE([[ [AC_LANG_SOURCE([[
@ -8373,15 +8373,13 @@ if test "$with_system_mozilla_headers" = "yes"; then
CFLAGS=$save_CFLAGS CFLAGS=$save_CFLAGS
AC_LANG_POP([C]) AC_LANG_POP([C])
else else
if test "$enable_mozilla" = "no"; then
AC_MSG_RESULT([none])
else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
fi dnl ...but will not be built/used unless ENABLE_NSPLUGIN or WITH_MOZILLA
SYSTEM_MOZILLA_HEADERS=NO dnl is YES
SYSTEM_NPAPI_HEADERS=NO
fi fi
AC_SUBST(MOZILLA_HEADERS_CFLAGS) AC_SUBST(NPAPI_HEADERS_CFLAGS)
AC_SUBST(SYSTEM_MOZILLA_HEADERS) AC_SUBST(SYSTEM_NPAPI_HEADERS)
AC_SUBST(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION) AC_SUBST(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION)
dnl =================================================================== dnl ===================================================================

2
extensions/Executable_pluginapp.bin.mk
View File

@ -32,7 +32,7 @@ $(eval $(call gb_Executable_Executable,pluginapp.bin))
$(eval $(call gb_Executable_use_package,pluginapp.bin,np_sdk_inc)) $(eval $(call gb_Executable_use_package,pluginapp.bin,np_sdk_inc))
$(eval $(call gb_Executable_use_external,pluginapp.bin,mozilla_headers)) $(eval $(call gb_Executable_use_external,pluginapp.bin,npapi_headers))
$(eval $(call gb_Executable_set_include,pluginapp.bin,\ $(eval $(call gb_Executable_set_include,pluginapp.bin,\
$$(INCLUDE) \ $$(INCLUDE) \

2
extensions/Library_npsoplugin.mk
View File

@ -35,7 +35,7 @@ $(eval $(call gb_Library_use_packages,npsoplugin,\
np_sdk_inc \ np_sdk_inc \
)) ))
$(eval $(call gb_Library_use_external,npsoplugin,mozilla_headers)) $(eval $(call gb_Library_use_external,npsoplugin,npapi_headers))
$(eval $(call gb_Library_use_static_libraries,npsoplugin,\ $(eval $(call gb_Library_use_static_libraries,npsoplugin,\
npsoenv \ npsoenv \

2
extensions/Library_pl.mk
View File

@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_componentfile,pl,extensions/source/plugin/pl))
$(eval $(call gb_Library_use_package,pl,np_sdk_inc)) $(eval $(call gb_Library_use_package,pl,np_sdk_inc))
$(eval $(call gb_Library_use_external,pl,mozilla_headers)) $(eval $(call gb_Library_use_external,pl,npapi_headers))
$(eval $(call gb_Library_set_include,pl,\ $(eval $(call gb_Library_set_include,pl,\
$$(INCLUDE) \ $$(INCLUDE) \

2
extensions/StaticLibrary_plugcon.mk
View File

@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,plugcon))
$(eval $(call gb_StaticLibrary_use_package,plugcon,np_sdk_inc)) $(eval $(call gb_StaticLibrary_use_package,plugcon,np_sdk_inc))
$(eval $(call gb_StaticLibrary_use_external,plugcon,mozilla_headers)) $(eval $(call gb_StaticLibrary_use_external,plugcon,npapi_headers))
$(eval $(call gb_StaticLibrary_set_include,plugcon,\ $(eval $(call gb_StaticLibrary_set_include,plugcon,\
$$(INCLUDE) \ $$(INCLUDE) \

4
np_sdk/Module_np_sdk.mk
View File

@ -33,9 +33,9 @@ $(eval $(call gb_Module_add_targets,np_sdk,\
Package_inc \ Package_inc \
)) ))
ifeq ($(SYSTEM_MOZILLA_HEADERS),NO) ifeq ($(SYSTEM_NPAPI_HEADERS),NO)
$(eval $(call gb_Module_add_targets,np_sdk,\ $(eval $(call gb_Module_add_targets,np_sdk,\
Package_mozilla_inc \ Package_npapi \
)) ))
endif endif

10
np_sdk/Package_mozilla_inc.mk → np_sdk/Package_npapi.mk
View File

@ -25,11 +25,11 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above. # instead of those above.
$(eval $(call gb_Package_Package,mozilla_inc,$(SRCDIR)/np_sdk)) $(eval $(call gb_Package_Package,npapi,$(SRCDIR)/np_sdk))
$(eval $(call gb_Package_add_file,mozilla_inc,inc/external/npsdk/npapi.h,inc/npapi.h)) $(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/npapi.h,inc/npapi.h))
$(eval $(call gb_Package_add_file,mozilla_inc,inc/external/npsdk/npfunctions.h,inc/npfunctions.h)) $(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/npfunctions.h,inc/npfunctions.h))
$(eval $(call gb_Package_add_file,mozilla_inc,inc/external/npsdk/npruntime.h,inc/npruntime.h)) $(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/npruntime.h,inc/npruntime.h))
$(eval $(call gb_Package_add_file,mozilla_inc,inc/external/npsdk/nptypes.h,inc/nptypes.h)) $(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/nptypes.h,inc/nptypes.h))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

2
np_sdk/StaticLibrary_nputils.mk
View File

@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_use_packages,nputils,\
)) ))
$(eval $(call gb_StaticLibrary_use_externals,nputils,\ $(eval $(call gb_StaticLibrary_use_externals,nputils,\
mozilla_headers \ npapi_headers \
)) ))
ifeq ($(GUIBASE),aqua) ifeq ($(GUIBASE),aqua)