[gnome-build-meta/abderrahim/config-sub-guess: 1/2] Use config.{sub, guess} from gnu-config instead of automake

[Abderrahim Kitouni <akitouni src gnome org>]

commit ed433d08343f53eb8804b85d06daeac2e121b0a0
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Sat Mar 30 08:35:32 2019 +0100

    Use config.{sub,guess} from gnu-config instead of automake
    
    Also rework avoid duplicating buildstream defaults

 project.conf | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)
---
diff --git a/project.conf b/project.conf
index a41d5f8e..7eb37b3f 100644
--- a/project.conf
+++ b/project.conf
@@ -107,27 +107,16 @@ elements:
           target: --host=arm-unknown-linux-gnueabi
 
       conf-global: --disable-static --disable-Werror %{target}
-
-      # Temporary workaround to avoid regenerating existing
-      # configure scripts when building tarballs.
-      #
-      # We can remove this after addressing the upstream issue:
-      #
-      #    https://gitlab.com/BuildStream/buildstream/issues/256
-      #
-      # XXX: updating config.{sub,guess} would be still useful in that case
-      # to fix compilation on recent architectures such as aarch64.
-      autogen: |
-        export NOCONFIGURE=1
-        if [ -x %{conf-cmd} ]; then cp -f /usr/share/automake*/config.{sub,guess} %{conf-aux}
-        elif [ -x autogen ]; then ./autogen
-        elif [ -x autogen.sh ]; then ./autogen.sh
-        elif [ -x bootstrap ]; then ./bootstrap
-        elif [ -x bootstrap.sh ]; then ./bootstrap.sh
-        else autoreconf -ivf
-        fi
       # the directory where config.sub and config.guess are stored
       conf-aux: .
+      copy-config-sub-guess: |
+        if [ -x %{conf-cmd} ]; then
+          cp -f /usr/share/gnu-config/config.{sub,guess} %{conf-aux}
+        fi
+    config:
+      configure-commands:
+        (<):
+        - '%{copy-config-sub-guess}'
 
   cmake:
     variables: