Fix hardcoded path for freetype2 includes

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
9 years ago · 0fc8bd091a
parent 2c9119a5ef
commit 0fc8bd091a
3 changed files with 7 additions and 2 deletions
--- a/configure.in.in
+++ b/configure.in.in
@ -1 +1,6 @@
 #MIN_CONFIG
+
+PKG_CHECK_MODULES(FT2, freetype2, have_ft2=yes, have_ft2=no)
+if test "x$have_ft2" = "xno"; then
+  AC_MSG_ERROR([freetype2 library is needed but not found on our system])
+fi
--- a/domino/Makefile.am
+++ b/domino/Makefile.am
@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign

-KDE_CXXFLAGS = -DQT_PLUGIN -I/usr/include/freetype2
+KDE_CXXFLAGS = -DQT_PLUGIN $(FT2_CFLAGS)

 INCLUDES = $(all_includes)

--- a/dominoConfig/Makefile.am
+++ b/dominoConfig/Makefile.am
@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I/usr/include/freetype2
+INCLUDES = $(all_includes) $(FT2_CFLAGS)

 noinst_HEADERS = dominoconf.h
 kde_module_LTLIBRARIES = kstyle_domino_config.la