virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '06db45523c1068c24f049ef2b20fcdead3bf36d8'

Browse Source 
* commit '06db45523c1068c24f049ef2b20fcdead3bf36d8':
  configure: Support the extended pkgconf syntax

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-02 18:54:57 +02:00
parent ce4e57dbb5 06db45523c
commit cec3456254
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@@ -1120,8 +1120,8 @@ check_pkg_config(){
pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg) pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg)
pkg_libs=$($pkg_config --libs $pkg_config_flags $pkg) pkg_libs=$($pkg_config --libs $pkg_config_flags $pkg)
check_func_headers "$headers" "$funcs" $pkg_cflags $pkg_libs "$@" && check_func_headers "$headers" "$funcs" $pkg_cflags $pkg_libs "$@" &&
set_safe ${pkg}_cflags $pkg_cflags && set_safe "${pkg}_cflags" $pkg_cflags &&
set_safe ${pkg}_libs $pkg_libs set_safe "${pkg}_libs" $pkg_libs
} }
check_exec(){ check_exec(){
@@ -1225,8 +1225,8 @@ require_cpp(){
use_pkg_config(){ use_pkg_config(){
pkg="$1" pkg="$1"
check_pkg_config "$@" || return 1 check_pkg_config "$@" || return 1
add_cflags $(get_safe ${pkg}_cflags) add_cflags $(get_safe "${pkg}_cflags")
add_extralibs $(get_safe ${pkg}_libs) add_extralibs $(get_safe "${pkg}_libs")
} }
require_pkg_config(){ require_pkg_config(){
@@ -1246,11 +1246,11 @@ require_libfreetype(){
echo "long check_func(void) { return (long) FT_Init_FreeType; }" echo "long check_func(void) { return (long) FT_Init_FreeType; }"
echo "int main(void) { return 0; }" echo "int main(void) { return 0; }"
} | check_ld "cc" $pkg_cflags $pkg_libs \ } | check_ld "cc" $pkg_cflags $pkg_libs \
&& set_safe ${pkg}_cflags $pkg_cflags \ && set_safe "${pkg}_cflags" $pkg_cflags \
&& set_safe ${pkg}_libs $pkg_libs \ && set_safe "${pkg}_libs" $pkg_libs \
|| die "ERROR: $pkg not found" || die "ERROR: $pkg not found"
add_cflags $(get_safe ${pkg}_cflags) add_cflags $(get_safe "${pkg}_cflags")
add_extralibs $(get_safe ${pkg}_libs) add_extralibs $(get_safe "${pkg}_libs")
} }
hostcc_e(){ hostcc_e(){