Bug 1256988 - Move --with-gl-provider to moz.configure. r=chmanchester

build/moz.configure/old.configure

@@ -331,7 +331,6 @@ def old_configure_options(*options):
     '--with-doc-output-dir',
     '--with-float-abi',
     '--with-fpu',
-    '--with-gl-provider',
     '--with-gonk-toolchain-prefix',
     '--with-google-api-keyfile',
     '--with-google-oauth-api-keyfile',

old-configure.in

@@ -6063,24 +6063,6 @@ MOZ_ARG_DISABLE_BOOL(zipwriter,
     MOZ_ZIPWRITER=1 )
 AC_SUBST(MOZ_ZIPWRITER)
 
-dnl ========================================================
-dnl GL provider
-dnl ========================================================
-MOZ_GL_PROVIDER=
-MOZ_ARG_WITH_STRING(gl-provider,
-[  --with-gl-provider=ID
-                          Set GL provider backend type],
-[ val=`echo $withval`
-    MOZ_GL_PROVIDER="$val"])
-
-if test -n "$MOZ_GL_PROVIDER"; then
-MOZ_GL_DEFAULT_PROVIDER=$MOZ_GL_PROVIDER
-AC_SUBST(MOZ_GL_PROVIDER)
-AC_DEFINE_UNQUOTED(MOZ_GL_PROVIDER, GLContextProvider$MOZ_GL_PROVIDER)
-fi
-AC_SUBST(MOZ_GL_DEFAULT_PROVIDER)
-AC_DEFINE_UNQUOTED(GL_PROVIDER_$MOZ_GL_DEFAULT_PROVIDER)
-
 dnl ========================================================
 dnl = faststripe theme
 dnl ========================================================

toolkit/moz.configure

@@ -89,6 +89,22 @@ def x11(value, toolkit):
         set_config('MOZ_X11', '1')
         set_define('MOZ_X11', '1')
         add_old_configure_assignment('MOZ_X11', '1')
-        add_old_configure_assignment('MOZ_GL_DEFAULT_PROVIDER', 'GLX')
 
     return value and toolkit in x11_toolkits
+
+
+# GL Provider
+# ==============================================================
+option('--with-gl-provider', nargs=1, help='Set GL provider backend type')
+
+@depends('--with-gl-provider', x11)
+def gl_provider(value, x11):
+    if value:
+        provider = value[0]
+        set_config('MOZ_GL_PROVIDER', provider)
+        set_define('MOZ_GL_PROVIDER', 'GLContextProvider%s' % provider)
+        set_config('MOZ_GL_DEFAULT_PROVIDER', provider)
+        set_define('GL_PROVIDER_%s' % provider, '1')
+    elif x11:
+        set_config('MOZ_GL_DEFAULT_PROVIDER', 'GLX')
+        set_define('GL_PROVIDER_GLX', '1')