diff options
| -rw-r--r-- | RepositoryExternal.mk | 14 | ||||
| -rw-r--r-- | config_host.mk.in | 4 | ||||
| -rw-r--r-- | configure.ac | 38 | ||||
| -rw-r--r-- | extensions/Executable_pluginapp.bin.mk | 2 | ||||
| -rw-r--r-- | extensions/Library_npsoplugin.mk | 2 | ||||
| -rw-r--r-- | extensions/Library_pl.mk | 2 | ||||
| -rw-r--r-- | extensions/StaticLibrary_plugcon.mk | 2 | ||||
| -rw-r--r-- | np_sdk/Module_np_sdk.mk | 4 | ||||
| -rw-r--r-- | np_sdk/Package_npapi.mk (renamed from np_sdk/Package_mozilla_inc.mk) | 10 | ||||
| -rw-r--r-- | np_sdk/StaticLibrary_nputils.mk | 2 |
10 files changed, 39 insertions, 41 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d4281c91ec02..20c9ca613174 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -51,20 +51,20 @@ endef 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),\ - $(MOZILLA_HEADERS_CFLAGS) \ + $(NPAPI_HEADERS_CFLAGS) \ $$(INCLUDE) \ ) endef -else #!SYSTEM_MOZILLA_HEADERS +else #!SYSTEM_NPAPI_HEADERS -define gb_LinkTarget__use_mozilla_headers -$(call gb_LinkTarget_use_package,$(1),mozilla_inc) +define gb_LinkTarget__use_npapi_headers +$(call gb_LinkTarget_use_package,$(1),npapi) $(call gb_LinkTarget_set_include,$(1),\ -I$(OUTDIR)/inc/external/npsdk \ $$(INCLUDE) \ @@ -72,7 +72,7 @@ $(call gb_LinkTarget_set_include,$(1),\ endef -endif #SYSTEM_MOZILLA_HEADERS +endif #SYSTEM_NPAPI_HEADERS ifeq ($(SYSTEM_ODBC_HEADERS),YES) diff --git a/config_host.mk.in b/config_host.mk.in index d473422aecb9..d0991604b52c 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -429,7 +429,7 @@ export ML_EXE=@ML_EXE@ export MOC4=@MOC4@ export MOC=@MOC@ 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 MOZ_FLAVOUR=@MOZ_FLAVOUR@ export MOZ_INC=@MOZ_INC@ @@ -618,7 +618,7 @@ export SYSTEM_LPSOLVE=@SYSTEM_LPSOLVE@ export SYSTEM_MDDS=@SYSTEM_MDDS@ export SYSTEM_MESA_HEADERS=@SYSTEM_MESA_HEADERS@ 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_CPPCONN=@SYSTEM_MYSQL_CPPCONN@ export SYSTEM_MYTHES=@SYSTEM_MYTHES@ diff --git a/configure.ac b/configure.ac index 91b151cb806e..01272148ccf6 100644 --- a/configure.ac +++ b/configure.ac @@ -1676,11 +1676,11 @@ AC_ARG_WITH(system-mozilla, WITH_SYSTEM_MOZILLA=$withval , WITH_SYSTEM_MOZILLA=no) -AC_ARG_WITH(system-mozilla-headers, - AS_HELP_STRING([--with-system-mozilla-headers], - [Use mozilla headers provided by system instead of bundled ones. Used in - nsplugin]),, - [with_system_mozilla_headers="$with_system_headers"] +AC_ARG_WITH(system-npapi-headers, + AS_HELP_STRING([--with-system-npapi-headers], + [Use NPAPI headers provided by system instead of bundled ones. Used in + extensions/source/nsplugin and extensions/source/plugin]),, + [with_system_npapi_headers="$with_system_headers"] ) AC_ARG_WITH(system-libpng, @@ -8336,19 +8336,19 @@ dnl =================================================================== dnl Check for system mozilla headers dnl =================================================================== 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]) - SYSTEM_MOZILLA_HEADERS=YES + SYSTEM_NPAPI_HEADERS=YES # 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: 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 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 # if still not found bail out if test "x$LOCATED" != "xyes"; then @@ -8357,7 +8357,7 @@ if test "$with_system_mozilla_headers" = "yes"; then AC_LANG_PUSH([C]) save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $MOZILLA_HEADERS_CFLAGS" + CFLAGS="$CFLAGS $NPAPI_HEADERS_CFLAGS" AC_MSG_CHECKING([for NPP_GetMIMEDescription return type]) AC_COMPILE_IFELSE( [AC_LANG_SOURCE([[ @@ -8373,15 +8373,13 @@ if test "$with_system_mozilla_headers" = "yes"; then CFLAGS=$save_CFLAGS AC_LANG_POP([C]) else - if test "$enable_mozilla" = "no"; then - AC_MSG_RESULT([none]) - else - AC_MSG_RESULT([internal]) - fi - SYSTEM_MOZILLA_HEADERS=NO + AC_MSG_RESULT([internal]) + dnl ...but will not be built/used unless ENABLE_NSPLUGIN or WITH_MOZILLA + dnl is YES + SYSTEM_NPAPI_HEADERS=NO fi -AC_SUBST(MOZILLA_HEADERS_CFLAGS) -AC_SUBST(SYSTEM_MOZILLA_HEADERS) +AC_SUBST(NPAPI_HEADERS_CFLAGS) +AC_SUBST(SYSTEM_NPAPI_HEADERS) AC_SUBST(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION) dnl =================================================================== diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk index ae25c2e98996..43e8ea37ebde 100644 --- a/extensions/Executable_pluginapp.bin.mk +++ b/extensions/Executable_pluginapp.bin.mk @@ -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_external,pluginapp.bin,mozilla_headers)) +$(eval $(call gb_Executable_use_external,pluginapp.bin,npapi_headers)) $(eval $(call gb_Executable_set_include,pluginapp.bin,\ $$(INCLUDE) \ diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 253e2469a3d2..31908f607664 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_use_packages,npsoplugin,\ 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,\ npsoenv \ diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index 8cbbd1baf207..e849cfd38558 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -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_external,pl,mozilla_headers)) +$(eval $(call gb_Library_use_external,pl,npapi_headers)) $(eval $(call gb_Library_set_include,pl,\ $$(INCLUDE) \ diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk index 0ef41afc3c55..663184d35b2a 100644 --- a/extensions/StaticLibrary_plugcon.mk +++ b/extensions/StaticLibrary_plugcon.mk @@ -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_external,plugcon,mozilla_headers)) +$(eval $(call gb_StaticLibrary_use_external,plugcon,npapi_headers)) $(eval $(call gb_StaticLibrary_set_include,plugcon,\ $$(INCLUDE) \ diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk index eabc6f8ad3a5..6ebba871eef6 100644 --- a/np_sdk/Module_np_sdk.mk +++ b/np_sdk/Module_np_sdk.mk @@ -33,9 +33,9 @@ $(eval $(call gb_Module_add_targets,np_sdk,\ Package_inc \ )) -ifeq ($(SYSTEM_MOZILLA_HEADERS),NO) +ifeq ($(SYSTEM_NPAPI_HEADERS),NO) $(eval $(call gb_Module_add_targets,np_sdk,\ - Package_mozilla_inc \ + Package_npapi \ )) endif diff --git a/np_sdk/Package_mozilla_inc.mk b/np_sdk/Package_npapi.mk index 20b94f13de03..5cf24930992c 100644 --- a/np_sdk/Package_mozilla_inc.mk +++ b/np_sdk/Package_npapi.mk @@ -25,11 +25,11 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # 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,mozilla_inc,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,mozilla_inc,inc/external/npsdk/nptypes.h,inc/nptypes.h)) +$(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/npapi.h,inc/npapi.h)) +$(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/npfunctions.h,inc/npfunctions.h)) +$(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/npruntime.h,inc/npruntime.h)) +$(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/nptypes.h,inc/nptypes.h)) # vim: set noet sw=4 ts=4: diff --git a/np_sdk/StaticLibrary_nputils.mk b/np_sdk/StaticLibrary_nputils.mk index 824c268cea82..d9ff1aef77fd 100644 --- a/np_sdk/StaticLibrary_nputils.mk +++ b/np_sdk/StaticLibrary_nputils.mk @@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_use_packages,nputils,\ )) $(eval $(call gb_StaticLibrary_use_externals,nputils,\ - mozilla_headers \ + npapi_headers \ )) ifeq ($(GUIBASE),aqua) |