From d20e2bc78a7418e35460c2ec65c99294292b20d7 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike.gerwitz@ryansg.com>
Date: Mon, 18 Nov 2019 14:09:12 -0500
Subject: [PATCH] tamer: Integrate into normal build process

Rust is now expected to be installed in the base image.
---
 .gitlab-ci.yml | 13 +------------
 Makefile.am    |  4 ++--
 bootstrap      |  2 +-
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5914f6a1..c4f53e6e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,23 +12,12 @@ build:
         - export SAXON_CP=/usr/share/ant/lib/saxon9/saxon9he.jar
         - autoreconf -fvi
         - ./configure
+        - ( cd tamer && ./bootstrap && ./configure )
         - ( cd progtest && npm install && ./autogen.sh && ./configure )
         - make all check info pdf html
     artifacts:
         paths:
             - doc/
-        expire_in: 30 min
-
-build-rust:
-    stage: build
-    image: rust:1.39
-    script:
-        - cd tamer
-        - ./bootstrap
-        - ./configure
-        - make check
-    artifacts:
-        paths:
             - tamer/target
         expire_in: 30 min
 
diff --git a/Makefile.am b/Makefile.am
index 6337ec1f..aa36cf81 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-SUBDIRS = src/current/src doc progtest
+SUBDIRS = tamer src/current/src doc progtest
 
 path_src  = src
 path_test = test
@@ -50,7 +50,7 @@ applies: $(apply_dest)
 	    "$<" > "$@"
 
 test: check
-check: | applies
+check-am: | applies
 	for test in $(path_aux)/test/test-*; do ./$$test || exit 1; done
 	$(path_test)/runner
 
diff --git a/bootstrap b/bootstrap
index 0bb0932b..31675dc7 100755
--- a/bootstrap
+++ b/bootstrap
@@ -30,7 +30,7 @@ test "${1:-}" = -n || git submodule update --init --recursive
     && { which npm && npm install || true; } \
     && ./autogen.sh && ./configure
 ) \
-  && ( cd tamer && ./bootstrap && ./configure && make check ) \
+  && ( cd tamer && ./bootstrap && ./configure ) \
   && { test -e hoxsl || ln -s ../hoxsl; } \
   && autoreconf -fvi \
   && ./configure \