virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '9e48de3cc86c732d9cebd496d6f0a2b7e7732754'

Browse Source 
* commit '9e48de3cc86c732d9cebd496d6f0a2b7e7732754':
  configure: Miscellaneous minor changes

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-11-16 13:11:24 -03:00
commit b449af20d5
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
configure vendored
View File

@ -462,7 +462,6 @@ EOF
exit 0
}
quotes='""'
if test -t 1 && which tput >/dev/null 2>&1; then
ncolors=$(tput colors)
if test -n "$ncolors" && test $ncolors -ge 8; then
@ -3733,6 +3732,8 @@ enable_weak $HWACCEL_AUTODETECT_LIBRARY_LIST
disabled logging && logfile=/dev/null
# command line configuration sanity checks
# we need to build at least one lib type
if ! enabled_any static shared; then
cat <<EOF
@ -3884,11 +3885,10 @@ case "$toolchain" in
;;
esac
test -n "$cross_prefix" && enable cross_compile
if enabled cross_compile; then
if test -n "$cross_prefix"; then
test -n "$arch" && test -n "$target_os" ||
die "Must specify target arch (--arch) and OS (--target-os) when cross-compiling"
enable cross_compile
fi
ar_default="${cross_prefix}${ar_default}"
@ -4889,7 +4889,7 @@ case $target_os in
;;
sunos)
SHFLAGS='-shared -Wl,-h,$$(@F)'
enabled x86 && SHFLAGS="-mimpure-text $SHFLAGS"
enabled x86 && append SHFLAGS -mimpure-text
network_extralibs="-lsocket -lnsl"
add_cppflags -D__EXTENSIONS__
# When using suncc to build, the Solaris linker will mark
@ -5774,16 +5774,13 @@ if ! disabled pthreads && ! enabled w32threads && ! enabled os2threads; then
enable pthreads
fi
check_code cc "pthread.h" "static pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER" || disable pthreads
if enabled pthreads; then
check_builtin sem_timedwait semaphore.h "sem_t *s; sem_init(s,0,0); sem_timedwait(s,0); sem_destroy(s)" $pthreads_extralibs
check_func pthread_cancel $pthreads_extralibs
fi
fi
if enabled pthreads; then
check_func pthread_cancel $pthreads_extralibs
fi
enabled pthreads &&
check_builtin sem_timedwait semaphore.h "sem_t *s; sem_init(s,0,0); sem_timedwait(s,0); sem_destroy(s)" $pthreads_extralibs
enabled zlib && check_lib zlib zlib.h zlibVersion -lz
enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2
enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma
@ -6292,6 +6289,7 @@ if enabled proper_dce; then
echo "X { local: *; };" > $TMPV
if test_ldflags -Wl,${version_script},$TMPV; then
append SHFLAGS '-Wl,${version_script},\$(SUBDIR)lib\$(NAME).ver'
quotes='""'
check_cc <<EOF && enable symver_asm_label
void ff_foo(void) __asm__ ("av_foo@VERSION");
void ff_foo(void) { ${inline_asm+__asm__($quotes);} }