Bug 1306138 - Include project-specific moz.configure at a later time. r=chmanchester

It is unfortunately not possible to include it last (or close to last,
before old.configure), but at least putting it after toolchain related
includes will be helpful.

--HG--
extra : rebase_source : bd027a87bc350c60dc1ba3308e2cc3b10782b506

build/moz.configure/init.configure

@@ -816,5 +816,3 @@ add_old_configure_assignment('PKG_CONFIG', pkg_config)
 @dependable
 def gonkdir():
     return None
-
-include(include_project_configure)

moz.configure

@@ -102,6 +102,7 @@ include_when('build/moz.configure/headers.configure',
 include_when('build/moz.configure/warnings.configure',
              when='--enable-compile-environment')
 
+include(include_project_configure)
 
 @depends(building_js, '--help')
 def ctypes_default(building_js, _):