Skip to content

Commit

Permalink
[Template merge] uconv and ignores
Browse files Browse the repository at this point in the history
  • Loading branch information
flammie committed Feb 21, 2023
1 parent 3d81e0b commit d3a3627
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@
/src/fst/generated_files/*.lexc
/src/fst/lexicon*
/src/fst/url.lexc
/src/orthography/spellrelax-nfc2nfd.regex
/src/orthography/spellrelax-nfc2nfd.regex.sigma.nfc
/src/orthography/spellrelax-nfc2nfd.regex.sigma.nfd
/src/phonetics/tests/*.sh
/test/run-morph-tester.sh
/test/run-yaml-testcases.sh
Expand All @@ -69,6 +72,15 @@
/test/src/morphology/generate-*-lemmas.sh
/test/src/morphology/generated*.txt
/test/src/morphology/missing_*.txt
/src/orthography/spellrelax-nfc2nfd.regex
/src/orthography/spellrelax-nfc2nfd.regex.sigma.nfc
/src/orthography/spellrelax-nfc2nfd.regex.sigma.nfd
/src/orthography/spellrelax-nfd2nfc.regex
/src/orthography/spellrelax-nfd2nfc.regex.sigma.nfc
/src/orthography/spellrelax-nfd2nfc.regex.sigma.nfd
/src/orthography/spellrestrict-nfd2nfc.regex
/src/orthography/spellrestrict-nfd2nfc.regex.sigma.nfc
/src/orthography/spellrestrict-nfd2nfc.regex.sigma.nfd
/test/src/phonology/negative-*.txt
/test/src/phonology/pair-*.txt
/test/src/phonology/pair-test-*.sh
Expand Down
12 changes: 11 additions & 1 deletion m4/giella-macros.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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.18.1
_giella_core_min_version=0.18.2
# 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])
Expand Down Expand Up @@ -181,6 +181,16 @@ AC_CACHE_CHECK([for sed that supports newlines and pipes], [ac_cv_path_SED],
[AC_MSG_ERROR([could not find sed that supports newlines - please install GNU sed. Hint: sudo port install gsed./c])])])
AC_SUBST([SED], [$ac_cv_path_SED])
# Check for uconv for some automated unicode recoding
AC_PATH_PROG([UCONV], [uconv], [false])
AS_IF([test x$UCONV = xfalse],
[AC_MSG_ERROR([needs uconv for unicode support
uconv is a part of ICU
on debian/ubuntu: apt install icu-devtools
on macports: port install icu
on macbrew: brew install icu4c (and follow instructions)
])])
# Check for Forrest:
AC_ARG_WITH([forrest],
[AS_HELP_STRING([--with-forrest=DIRECTORY],
Expand Down

0 comments on commit d3a3627

Please sign in to comment.