Browse Source

Fix hardcoded path for freetype2 includes

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Slávek Banko 2 years ago
parent
commit
0fc8bd091a
3 changed files with 7 additions and 2 deletions
  1. 5
    0
      configure.in.in
  2. 1
    1
      domino/Makefile.am
  3. 1
    1
      dominoConfig/Makefile.am

+ 5
- 0
configure.in.in View File

@@ -1 +1,6 @@
1 1
 #MIN_CONFIG
2
+
3
+PKG_CHECK_MODULES(FT2, freetype2, have_ft2=yes, have_ft2=no)
4
+if test "x$have_ft2" = "xno"; then
5
+  AC_MSG_ERROR([freetype2 library is needed but not found on our system])
6
+fi

+ 1
- 1
domino/Makefile.am View File

@@ -1,6 +1,6 @@
1 1
 AUTOMAKE_OPTIONS = foreign
2 2
 
3
-KDE_CXXFLAGS = -DQT_PLUGIN -I/usr/include/freetype2
3
+KDE_CXXFLAGS = -DQT_PLUGIN $(FT2_CFLAGS)
4 4
 
5 5
 INCLUDES = $(all_includes)
6 6
 

+ 1
- 1
dominoConfig/Makefile.am View File

@@ -1,4 +1,4 @@
1
-INCLUDES = $(all_includes) -I/usr/include/freetype2
1
+INCLUDES = $(all_includes) $(FT2_CFLAGS)
2 2
 
3 3
 noinst_HEADERS = dominoconf.h
4 4
 kde_module_LTLIBRARIES = kstyle_domino_config.la

Loading…
Cancel
Save