From 6368a37da626a52d209a5f0b1c890154c23c3092 Mon Sep 17 00:00:00 2001 From: Jim O'Regan Date: Fri, 24 Jul 2015 00:16:55 +0100 Subject: [PATCH] libicui18n is only called libicuin on mingw, not cygwin --- configure.ac | 2 ++ training/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 343e2209c9..99a57de7df 100644 --- a/configure.ac +++ b/configure.ac @@ -68,6 +68,7 @@ AM_MAINTAINER_MODE # default conditional AM_CONDITIONAL(T_WIN, false) +AM_CONDITIONAL(MINGW, false) AM_CONDITIONAL(OSX, false) AM_CONDITIONAL(GRAPHICS_DISABLED, false) @@ -83,6 +84,7 @@ case "${host_os}" in mingw32*) AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system]) AM_CONDITIONAL(T_WIN, true) + AM_CONDITIONAL(MINGW, true) AM_CONDITIONAL(ADD_RT, false) AC_SUBST([AM_LDFLAGS], ['-Wl,-no-undefined -Wl,--as-needed']) ;; diff --git a/training/Makefile.am b/training/Makefile.am index 7ea6b6207a..e594955592 100644 --- a/training/Makefile.am +++ b/training/Makefile.am @@ -10,7 +10,7 @@ AM_CPPFLAGS += \ EXTRA_DIST = language-specific.sh tesstrain.sh tesstrain_utils.sh -if T_WIN +if MINGW # try static build #AM_LDFLAGS += -all-static #libic=-lsicuin -licudt -lsicuuc