3 files changed, 24 insertions, 7 deletions
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
index 2123bebc9..5f7e9b3ee 100644
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -605,10 +605,21 @@ def include_project_configure(project, external_source_dir, build_env, help):
     if external_source_dir:
         base_dir = os.path.join(base_dir, external_source_dir[0])
 
-    path = os.path.join(base_dir, project[0], 'moz.configure')
-    if not exists(path):
-        die('Cannot find project %s', project[0])
-    return path
+    build_app = project[0]
+
+    # Uncomment when browser becomes application/basilisk
+    #if build_app == 'browser':
+        #die('The project "browser" is no longer valid. Perhaps you meant "basilisk" or "palemoon"?')
+    
+    path_project_src_dir_application = os.path.join(base_dir, 'application/' + build_app, 'moz.configure')
+    path_project_src_dir_root = os.path.join(base_dir, build_app, 'moz.configure')
+    
+    if exists(path_project_src_dir_application):
+        return path_project_src_dir_application
+    elif exists(path_project_src_dir_root):
+        return path_project_src_dir_root
+    else:
+        die('Cannot find project %s', build_app)
 
 @depends('--with-external-source-dir')
 def external_source_dir(value):
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
index b32c3f7b7..b33f18623 100644
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -169,6 +169,9 @@ def old_configure_options(*options):
     '--enable-crashreporter',
     '--enable-dbus',
     '--enable-debug-js-modules',
+    '--enable-jetpack',
+    '--enable-devtools-server',
+    '--enable-devtools',
     '--enable-directshow',
     '--enable-dtrace',
     '--enable-dump-painting',
@@ -201,6 +204,7 @@ def old_configure_options(*options):
     '--enable-nfc',
     '--enable-nspr-build',
     '--enable-official-branding',
+    '--enable-official-vendor',
     '--enable-omx-plugin',
     '--enable-oom-breakpoint',
     '--enable-optimize',
@@ -214,7 +218,6 @@ def old_configure_options(*options):
     '--enable-readline',
     '--enable-reflow-perf',
     '--enable-release',
-    '--enable-require-all-d3dc-versions',
     '--enable-safe-browsing',
     '--enable-sandbox',
     '--enable-signmar',
@@ -301,6 +304,9 @@ def old_configure_options(*options):
     '--enable-mapi',
     '--enable-calendar',
     '--enable-incomplete-external-linkage',
+    
+    # Below are configure flags used by Basilisk
+    '--disable-webextensions',
 )
 @imports(_from='__builtin__', _import='compile')
 @imports(_from='__builtin__', _import='open')
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
index 8b2416152..5e9fcc384 100644
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -686,9 +686,9 @@ def compiler(language, host_or_target, c_compiler=None, other_compiler=None,
         # Check the compiler version here instead of in `compiler_version` so
         # that the `checking` message doesn't pretend the compiler can be used
         # to then bail out one line later.
-        if info.type == 'gcc' and info.version < '4.8.0':
+        if info.type == 'gcc' and info.version < '4.9.0':
             raise FatalCheckError(
-                'Only GCC 4.8 or newer is supported (found version %s).'
+                'Only GCC 4.9 or newer is supported (found version %s).'
                 % info.version)
 
         # If you want to bump the version check here search for