From fb07ba2766127653b51c88a9fc46a07998753bb7 Mon Sep 17 00:00:00 2001
From: Sjur N Moshagen <sjurnm@mac.com>
Date: Tue, 23 Jan 2024 14:40:06 +0200
Subject: [PATCH] [Template merge] Update Zulip GH Action, minor fixes after
 infra reorg, and require newest giella-core

---
 .github/workflows/zulip.yml    | 2 +-
 m4/giella-macros.m4            | 8 ++++----
 test/src/run-lexc-testcases.sh | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/zulip.yml b/.github/workflows/zulip.yml
index d2ab39399..84e26af8e 100644
--- a/.github/workflows/zulip.yml
+++ b/.github/workflows/zulip.yml
@@ -9,7 +9,7 @@ on:
     branches:
       - '**'
 jobs:
-  build-and-deploy:
+  send-push-info-to-zulip:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
diff --git a/m4/giella-macros.m4 b/m4/giella-macros.m4
index 99092492c..ebe48b2f4 100644
--- a/m4/giella-macros.m4
+++ b/m4/giella-macros.m4
@@ -88,7 +88,7 @@ AC_MSG_RESULT([$GIELLA_CORE])
 ###############################################################
 ### This is the version of the Giella Core that we require. ###
 ### UPDATE AS NEEDED.
-_giella_core_min_version=0.21.0
+_giella_core_min_version=0.21.1
 
 # GIELLA_CORE/GTCORE env. variable, required by the infrastructure to find scripts:
 AC_ARG_VAR([GIELLA_CORE], [directory for the Giella infra core scripts and other required resources])
@@ -790,7 +790,7 @@ AC_ARG_ENABLE([L2],
               [enable_L2=no])
 AS_IF([test x$enable_oahpa = xno], [enable_L2=no],
     [AS_IF([test x$enable_L2 != xno -a \
-      "$(find ${srcdir}/src -name "*-L2.*" | head -n 1)" = "" ],
+      "$(find ${srcdir}/src/fst -name "*-L2.*" | head -n 1)" = "" ],
       [AC_MSG_ERROR([You asked for the L2 analyser, but no L2 files were found])])])
 AM_CONDITIONAL([WANT_L2], [test "x$enable_L2" != xno])
 
@@ -845,9 +845,9 @@ AC_ARG_ENABLE([abbr],
               [enable_abbr=$enableval],
               [enable_abbr=no])
 AS_IF([test x$enable_abbr != xno -a \
-    "$(find ${srcdir}/src/fst/morphology/stems/ -name "abbreviations.lexc" | head -n 1)" = "" ],
+    "$(find ${srcdir}/src/fst/morphology/stems -name "abbreviations.lexc" | head -n 1)" = "" ],
     [AC_MSG_ERROR([You asked for abbr.txt generation, but have no file \
-src/fst/morphoogy/stems/abbreviations.lexc])])
+src/fst/morphology/stems/abbreviations.lexc])])
 AS_IF([test x$enable_abbr = xyes -a x$enable_generators = xno],
     [AC_MSG_ERROR([You need to enable generators to build the abbr file])])
 AM_CONDITIONAL([WANT_ABBR], [test "x$enable_abbr" != xno])
diff --git a/test/src/run-lexc-testcases.sh b/test/src/run-lexc-testcases.sh
index 8ca6ba649..e4d7e74a4 100755
--- a/test/src/run-lexc-testcases.sh
+++ b/test/src/run-lexc-testcases.sh
@@ -25,7 +25,7 @@ while test ! -x $relpath/$testrunner ; do
 done
 
 # Get list of source files:
-source_files="$(find ${srcdir}/$relpath/../src/fst -name '*.lexc' \
+source_files="$(find ${srcdir}/$relpath/../src/fst/morphology -name '*.lexc' \
 				-not -name '$concat_lexc_file')"
 
 # One empty line in the beginning: