From ea38ceb7995967634dd3d477c49714d6aba0816c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 17 Mar 2017 12:15:20 +0100 Subject: [PATCH] configure.ac: align to tuxbox code Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/2d56f091b1b4056d8ae5153abf36128e8b4ea18b Author: vanhofen Date: 2017-03-17 (Fri, 17 Mar 2017) Origin message was: ------------------ - configure.ac: align to tuxbox code --- configure.ac | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/configure.ac b/configure.ac index f2a63b926..9ea124d84 100644 --- a/configure.ac +++ b/configure.ac @@ -99,6 +99,17 @@ AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes") # TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl) TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl) +## For the check you must use the corresponding libtool number as version number, +## see freetype source code docs/VERSIONS.TXT +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) if test -z "$CURL_LIBS" -a -z "$CURL_CFLAGS"; then TUXBOX_APPS_LIB_CONFIG(CURL,curl-config) @@ -303,6 +314,7 @@ else HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__file__="\"$(subst $(srcdir)/,,$(abspath $<))\""' HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__path_file__="\"$(subst $(top_srcdir)/,,$(abspath $<))\""' fi + AC_SUBST(HWLIB_CFLAGS) AC_SUBST(FREETYPE_CFLAGS) AC_SUBST(FREETYPE_LIBS)