[Olena-patches] 4326: src/Makefile.am: Handle tesseract dependency.

--- scribo/ChangeLog | 12 ++++++++---- scribo/src/Makefile.am | 14 ++++++-------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index ba7f8c1..2e8acb0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2009-07-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * src/Makefile.am: Handle tesseract dependency. + 2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> * src/preprocessing/Makefile.am: Remove a trailing blank line. @@ -8,7 +12,7 @@ * filter/thick_objects.hh: Fix. -2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> +2009-06-30 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Update Scribo. @@ -21,15 +25,15 @@ * text/recognition.hh: may store the recognized text into a file. -2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> +2009-06-30 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * tests/preprocessing/unskew.cc: fix test. -2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> +2009-06-30 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * preprocessing/unskew.hh: Fix an ambiguity. -2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> +2009-06-30 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Update calls to geom::rotate. diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 381c567..a7b6289 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -62,11 +62,9 @@ table_rebuild_rank_SOURCES = table_rebuild_rank.cc text_in_photo_SOURCES = text_in_photo.cc thin_bboxes_SOURCES = thin_bboxes.cc -# FIXME: Should be enclosed in an Automake conditional like HAVE_TESSERACT. -#bin_PROGRAMS += recognition - -#recognition_SOURCES = recognition.cc -# FIXME: Do not use $(HOME). -#recognition_CXXFLAGS = -# -I$(HOME)/local/include $(HOME)/local/lib/libtesseract_full.a -#recognition_LDFLAGS = -lpthread +if HAVE_TESSERACT + bin_PROGRAMS += recognition + recognition_SOURCES = recognition.cc + recognition_CPPFLAGS = $(AM_CPPFLAGS) $(TESSERACT_CPPFLAGS) + recognition_LDFLAGS = $(AM_LDFLAGS) $(TESSERACT_LDFLAGS) -lpthread +endif HAVE_TESSERACT -- 1.5.6.5