From fe61b2da7f64a9728bf669e1247c41f5be6338cc Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 9 Dec 2017 13:01:37 +0100 Subject: [PATCH] configure: fix logic around libswresample Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/62f54dceeb2949e13d0085e0e6589dbf1877b4e3 Author: vanhofen Date: 2017-12-09 (Sat, 09 Dec 2017) Origin message was: ------------------ - configure: fix logic around libswresample ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- configure.ac | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 9dcb0318c..4a6f804d9 100644 --- a/configure.ac +++ b/configure.ac @@ -80,17 +80,17 @@ TUXBOX_APPS_LIB_PKGCONFIG_CHECK(OGG,ogg) if test -z "$OGG_CFLAGS" ; then TUXBOX_APPS_LIB_PKGCONFIG(OGG,ogg) fi -TUXBOX_APPS_LIB_PKGCONFIG(SWRESAMPLE,libswresample) -else -TUXBOX_APPS_LIB_PKGCONFIG(SWRESAMPLE,libswresample) + fi +TUXBOX_APPS_LIB_PKGCONFIG(SWRESAMPLE,libswresample) + +AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes") + if test "$BOXTYPE" = "tripledragon"; then TUXBOX_APPS_LIB_PKGCONFIG(DIRECTFB, directfb) fi -AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes") - # TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl) TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl) @@ -109,6 +109,7 @@ PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 16.2.10], if test -z "$CURL_LIBS" -a -z "$CURL_CFLAGS"; then TUXBOX_APPS_LIB_CONFIG(CURL,curl-config) fi + # fallback to freetype-config (which is ugly for cross-compilation) if test -z "$FREETYPE_LIBS" -a -z "$FREETYPE_CFLAGS"; then TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)