mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

configure.ac: Fix freetype check

Browse Source
This commit is contained in:
M. Liebmann
2017-02-04 10:23:32 +01:00
parent 2ca807e34a
commit dccb6ba8f2
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@@ -93,7 +93,14 @@ TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl)
## For the check you must use the corresponding libtool number as version number, ## For the check you must use the corresponding libtool number as version number,
## see freetype source code docs/VERSIONS.TXT ## see freetype source code docs/VERSIONS.TXT
PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 16.2.10], echo "freetype2 >= 2.5.0 found", [echo "freetype2 >= 2.5.0 not found"; exit 1]) PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 16.2.10],
[echo "freetype2 >= 2.5.0 found"], [
## If freetype is not found:
## Activate this line if you want to search with freetype-config instead
[echo "freetype2 >= 2.5.0 not found, use alternative search method with freetype-config"]
## Activate this line if you want to abort
# AC_MSG_ERROR([freetype2 >= 2.5.0 not found])
])
# fallback to curl-config (which is ugly for cross-compilation) # fallback to curl-config (which is ugly for cross-compilation)
if test -z "$CURL_LIBS" -a -z "$CURL_CFLAGS"; then if test -z "$CURL_LIBS" -a -z "$CURL_CFLAGS"; then
@@ -102,7 +109,7 @@ fi
# fallback to freetype-config (which is ugly for cross-compilation) # fallback to freetype-config (which is ugly for cross-compilation)
if test -z "$FREETYPE_LIBS" -a -z "$FREETYPE_CFLAGS"; then if test -z "$FREETYPE_LIBS" -a -z "$FREETYPE_CFLAGS"; then
TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config) TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
CPPFLAGS+="$FREETYPE_CFLAGS" CPPFLAGS+=" $FREETYPE_CFLAGS"
AC_MSG_CHECKING([whether FreeType version is 2.5.0 or higher]) AC_MSG_CHECKING([whether FreeType version is 2.5.0 or higher])
AC_TRY_CPP([ AC_TRY_CPP([
#include <ft2build.h> #include <ft2build.h>