Bug 888132 - MOZ_GOOGLE_API_KEY_FILE should be an include file. r=khuey
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 28 Jun 2013 13:42:14 +0900
changeset 149282 e07fc1165da94d50dc187cd27808afb160278985
parent 149281 99e03f6249b918e6cff29abe41ae5f5ad1bde998
child 149283 37015ff213ae34370d344234feaf73411e455283
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs888132
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 888132 - MOZ_GOOGLE_API_KEY_FILE should be an include file. r=khuey
configure.in
toolkit/components/urlformatter/Makefile.in
--- a/configure.in
+++ b/configure.in
@@ -4335,17 +4335,17 @@ AC_SUBST(MOZ_UPDATE_CHANNEL)
 # Allow to specify a Google API key file that contains the secret key to be
 # used for various Google API requests.
 MOZ_ARG_WITH_STRING(google-api-keyfile,
 [  --with-google-api-keyfile=file   Use the secret key contained in the given keyfile for Google API requests],
   MOZ_GOOGLE_API_KEY=`cat $withval`)
 if test -z "$MOZ_GOOGLE_API_KEY"; then
     MOZ_GOOGLE_API_KEY=no-google-api-key
 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.
 AC_MSG_CHECKING([if app-specific confvars.sh exists])
 if test -f "${srcdir}/${MOZ_BUILD_APP}/confvars.sh" ; then
   AC_MSG_RESULT([${srcdir}/${MOZ_BUILD_APP}/confvars.sh])
   . "${srcdir}/${MOZ_BUILD_APP}/confvars.sh"
 else
   AC_MSG_RESULT([no])
--- a/toolkit/components/urlformatter/Makefile.in
+++ b/toolkit/components/urlformatter/Makefile.in
@@ -9,9 +9,18 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = \
   nsURLFormatter.manifest \
   $(NULL)
 
+export:: google_api_key
+
+EXTRA_PP_COMPONENTS_FLAGS = -I google_api_key
+
 include $(topsrcdir)/config/rules.mk
+
+google_api_key:
+	@echo "#define MOZ_GOOGLE_API_KEY $(MOZ_GOOGLE_API_KEY)" > $@
+
+GARBAGE += google_api_key