Merge pull request tesseract-ocr#62 from jimregan/jimregan-cygwin-2

libicui18n is only called libicuin on mingw, not cygwin
vuthanh86 · Jul 24, 2015 · 4085f91 · 4085f91
2 parents b31a337 + 6368a37
commit 4085f91
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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