mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-26 23:13:00 +02:00
make curl and freetype2 detection crosscompile-friendly
Origin commit data
------------------
Branch: ni/coolstream
Commit: a40b58fa20
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
12
configure.ac
12
configure.ac
@@ -89,8 +89,16 @@ fi
|
||||
AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes")
|
||||
|
||||
# TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl)
|
||||
TUXBOX_APPS_LIB_CONFIG(CURL,curl-config)
|
||||
TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
|
||||
TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl)
|
||||
TUXBOX_APPS_LIB_PKGCONFIG(FREETYPE,freetype2)
|
||||
# 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)
|
||||
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)
|
||||
fi
|
||||
|
||||
TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng)
|
||||
TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat)
|
||||
|
Reference in New Issue
Block a user