Fix build with legacy engine disabled

Instead of defining the DISABLED_LEGACY_ENGINE macro in config_auto.h
(which is not included by all source files), define it as a preprocessor
option for those parts of the code which require it.

Signed-off-by: Stefan Weil <[email protected]>

Author: stweil

configure.ac

@@ -170,9 +170,6 @@ AC_ARG_ENABLE([legacy],
   [enable_legacy=$enableval],
   [enable_legacy="yes"])
 AC_MSG_RESULT([$enable_legacy])
-if test "$enable_legacy" = "no"; then
-  AC_DEFINE([DISABLED_LEGACY_ENGINE], [], [Disable the legacy OCR engine])
-fi
 AM_CONDITIONAL([DISABLED_LEGACY_ENGINE], test "$enable_legacy" = "no")
 
 # check whether to build embedded version

src/api/Makefile.am

@@ -15,6 +15,10 @@ AM_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\" \
 
 AM_CPPFLAGS += $(OPENCL_CPPFLAGS)
 
+if DISABLED_LEGACY_ENGINE
+AM_CPPFLAGS += -DDISABLED_LEGACY_ENGINE
+endif
+
 if VISIBILITY
 AM_CPPFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
 endif

src/ccmain/Makefile.am

@@ -14,6 +14,10 @@ AM_CPPFLAGS += \
 AM_CPPFLAGS += $(OPENCL_CPPFLAGS)
 AM_CPPFLAGS += $(OPENMP_CXXFLAGS)
 
+if DISABLED_LEGACY_ENGINE
+AM_CPPFLAGS += -DDISABLED_LEGACY_ENGINE
+endif
+
 if VISIBILITY
 AM_CPPFLAGS += -DTESS_EXPORTS \
     -fvisibility=hidden -fvisibility-inlines-hidden

src/classify/Makefile.am

@@ -5,6 +5,10 @@ AM_CPPFLAGS += \
     -I$(top_srcdir)/src/dict \
     -I$(top_srcdir)/src/viewer
 
+if DISABLED_LEGACY_ENGINE
+AM_CPPFLAGS += -DDISABLED_LEGACY_ENGINE
+endif
+
 if VISIBILITY
 AM_CPPFLAGS += -DTESS_EXPORTS \
     -fvisibility=hidden -fvisibility-inlines-hidden

src/training/Makefile.am

@@ -16,6 +16,10 @@ AM_CPPFLAGS += \
 
 EXTRA_DIST = language-specific.sh tesstrain.sh tesstrain_utils.sh
 
+if DISABLED_LEGACY_ENGINE
+AM_CPPFLAGS += -DDISABLED_LEGACY_ENGINE
+endif
+
 # TODO: training programs can not be linked to shared library created 
 # with -fvisibility 
 if VISIBILITY

src/wordrec/Makefile.am

@@ -6,6 +6,10 @@ AM_CPPFLAGS += \
     -I$(top_srcdir)/src/dict \
     -I$(top_srcdir)/src/viewer
 
+if DISABLED_LEGACY_ENGINE
+AM_CPPFLAGS += -DDISABLED_LEGACY_ENGINE
+endif
+
 if VISIBILITY
 AM_CPPFLAGS += -DTESS_EXPORTS \
     -fvisibility=hidden -fvisibility-inlines-hidden