Fix broken build for pango_font_info_test

Signed-off-by: Stefan Weil <sw@weilnetz.de>
jjelonek · Dec 28, 2019 · 688f649 · 688f649
1 parent 79f191f
commit 688f649
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -490,6 +490,8 @@ if !($have_cairo); then
         AM_CONDITIONAL([ENABLE_TRAINING], false)
 fi
 
+PKG_CHECK_MODULES([pangocairo], [pangocairo])
+PKG_CHECK_MODULES([pangoft2], [pangoft2])
 
 # ----------------------------------------
 # Final Tasks and Output

diff --git a/unittest/Makefile.am b/unittest/Makefile.am
@@ -41,6 +41,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/unittest/base
 AM_CPPFLAGS += -I$(top_srcdir)/unittest/util
 if ENABLE_TRAINING
 AM_CPPFLAGS += -I$(top_srcdir)/src/training
+AM_CPPFLAGS += $(pangocairo_CFLAGS)
 endif # ENABLE_TRAINING
 AM_CPPFLAGS += -I$(top_srcdir)/src/viewer
 AM_CPPFLAGS += -I$(top_srcdir)/src/wordrec
@@ -339,9 +340,9 @@ pango_font_info_test_SOURCES = pango_font_info_test.cc
 pango_font_info_test_SOURCES += third_party/utf/rune.c
 pango_font_info_test_SOURCES += util/utf8/unicodetext.cc util/utf8/unilib.cc
 pango_font_info_test_LDADD = $(ABSEIL_LIBS) $(TRAINING_LIBS) $(LEPTONICA_LIBS)
-pango_font_info_test_LDADD += $(ICU_I18N_LIBS) -lfontconfig
-pango_font_info_test_LDADD += -lpangocairo-1.0 -lpangoft2-1.0
-pango_font_info_test_LDADD += $(cairo_LIBS) $(pango_LIBS)
+pango_font_info_test_LDADD += $(ICU_I18N_LIBS)
+pango_font_info_test_LDADD += $(pangocairo_LIBS)
+pango_font_info_test_LDADD += $(pangoft2_LIBS)
 endif # TENSORFLOW
 
 paragraphs_test_SOURCES = paragraphs_test.cc