--- scribo/ChangeLog | 8 ++++++-- scribo/src/Makefile.am | 18 ++++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4cabf03..4aab740 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,11 +1,15 @@ 2009-08-19 Guillaume Lazzara <lazzara@lrde.epita.fr> + * src/Makefile.am: Link 'recognition' example to libtiff. + +2009-08-19 Guillaume Lazzara <lazzara@lrde.epita.fr> + Fix generation of headers.mk in Scribo. - * scribo/Makefile.am: Add new arguments to + * Makefile.am: Add new arguments to generate_dist_headers.sh. - * scribo/headers.mk: Update. + * headers.mk: Update. 2009-08-17 Thierry Geraud <thierry.geraud@lrde.epita.fr> diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index a7b6289..a7a5259 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -62,9 +62,19 @@ table_rebuild_rank_SOURCES = table_rebuild_rank.cc text_in_photo_SOURCES = text_in_photo.cc thin_bboxes_SOURCES = thin_bboxes.cc + if HAVE_TESSERACT - bin_PROGRAMS += recognition - recognition_SOURCES = recognition.cc - recognition_CPPFLAGS = $(AM_CPPFLAGS) $(TESSERACT_CPPFLAGS) - recognition_LDFLAGS = $(AM_LDFLAGS) $(TESSERACT_LDFLAGS) -lpthread +if HAVE_TIFF + + bin_PROGRAMS += recognition + recognition_SOURCES = recognition.cc + recognition_CPPFLAGS = $(AM_CPPFLAGS) \ + $(TESSERACT_CPPFLAGS) \ + $(TIFF_CPPFLAGS) + recognition_LDFLAGS = $(AM_LDFLAGS) \ + $(TESSERACT_LDFLAGS) \ + $(TIFF_LDFLAGS) \ + -lpthread + +endif HAVE_TIFF endif HAVE_TESSERACT -- 1.5.6.5