Bug 888132 - MOZ_GOOGLE_API_KEY_FILE should be an include file. r=khuey

This commit is contained in:
Mike Hommey 2013-06-28 13:42:14 +09:00
parent 9c44286c03
commit cae92d7c43
2 changed files with 10 additions and 1 deletions

View File

@ -4340,7 +4340,7 @@ MOZ_ARG_WITH_STRING(google-api-keyfile,
if test -z "$MOZ_GOOGLE_API_KEY"; then if test -z "$MOZ_GOOGLE_API_KEY"; then
MOZ_GOOGLE_API_KEY=no-google-api-key MOZ_GOOGLE_API_KEY=no-google-api-key
fi fi
AC_DEFINE_UNQUOTED(MOZ_GOOGLE_API_KEY, $MOZ_GOOGLE_API_KEY) AC_SUBST(MOZ_GOOGLE_API_KEY)
# Allow the application to influence configure with a confvars.sh script. # Allow the application to influence configure with a confvars.sh script.
AC_MSG_CHECKING([if app-specific confvars.sh exists]) AC_MSG_CHECKING([if app-specific confvars.sh exists])

View File

@ -14,4 +14,13 @@ DISABLED_EXTRA_COMPONENTS = \
nsURLFormatter.manifest \ nsURLFormatter.manifest \
$(NULL) $(NULL)
export:: google_api_key
EXTRA_PP_COMPONENTS_FLAGS = -I google_api_key
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
google_api_key:
@echo "#define MOZ_GOOGLE_API_KEY $(MOZ_GOOGLE_API_KEY)" > $@
GARBAGE += google_api_key