diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2016-04-06 19:49:19 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2016-04-06 19:49:19 +0200 |
| commit | 0fc8bd091a374e11cf7b517e01ab0712161049d3 (patch) | |
| tree | 341d33bb515b89bf49cf44106fae6cf2e2998611 | |
| parent | 2c9119a5eff2397157a75f13b901e417f9d3bd12 (diff) | |
| download | tde-style-domino-0fc8bd091a374e11cf7b517e01ab0712161049d3.tar.gz tde-style-domino-0fc8bd091a374e11cf7b517e01ab0712161049d3.zip | |
Fix hardcoded path for freetype2 includes
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
| -rw-r--r-- | configure.in.in | 5 | ||||
| -rw-r--r-- | domino/Makefile.am | 2 | ||||
| -rw-r--r-- | dominoConfig/Makefile.am | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/configure.in.in b/configure.in.in index b3c83b1..62cbc08 100644 --- 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 diff --git a/domino/Makefile.am b/domino/Makefile.am index fcb61e0..d182150 100644 --- 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) diff --git a/dominoConfig/Makefile.am b/dominoConfig/Makefile.am index 9f7a04f..4b13841 100644 --- 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 |