[gnome-continuous] Allow forcing autotools for components with mixed builds

[Emmanuele Bassi <ebassi src gnome org>]

commit c5b7de2ccc33ffcf4a64e2abda71aa1f02fbd517
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Wed Nov 29 18:10:57 2017 +0000

    Allow forcing autotools for components with mixed builds
    
    If a component has a mixed Autotools and Meson builds, allow selecting
    the Autotools build, in case the Meson one is still experimental.

 manifest.json                |    5 +++--
 src/ostree-build-compile-one |    4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 5a8f223..9d92b52 100644
--- a/manifest.json
+++ b/manifest.json
@@ -429,8 +429,9 @@
                 "patches": ["xorg-xcb-util-keysyms-autogen.patch"]},
 
                {"src": "fd:xorg/xserver",
-                "config-opts": ["-Dxwayland=true",
-                                "-Dglamor=true"]},
+                 "force-autotools": true,
+                "config-opts": ["--enable-xwayland",
+                                "--enable-glamor"]},
 
                {"src": "fd:xcb/util"},
 
diff --git a/src/ostree-build-compile-one b/src/ostree-build-compile-one
index 5e980a9..7669a59 100755
--- a/src/ostree-build-compile-one
+++ b/src/ostree-build-compile-one
@@ -150,11 +150,13 @@ def main(args):
         if os.path.exists(configure_path):
             os.unlink(configure_path)
 
+    force_autotools = metadata.get('force-autotools', False):
+
     builddir = '_build'
     use_builddir = True
 
     meson_build = False
-    if os.path.exists('meson.build'):
+    if os.path.exists('meson.build') and not force_autotools:
         meson_build = True
     else:
         autogen_script = None