ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Thu Nov 16 13:11:24 2017 -0300| [b449af20d5d4b53cdc51696a04477a16336dc22d] | committer: James Almer
Merge commit '9e48de3cc86c732d9cebd496d6f0a2b7e7732754' * commit '9e48de3cc86c732d9cebd496d6f0a2b7e7732754': configure: Miscellaneous minor changes Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b449af20d5d4b53cdc51696a04477a16336dc22d --- configure | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 934ac3abfd..0fc63cbfca 100755 --- a/configure +++ b/configure @@ -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 -fi - -if enabled pthreads; then - check_func pthread_cancel $pthreads_extralibs + 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 -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);} } ====================================================================== diff --cc configure index 934ac3abfd,be9a3ee5cb..0fc63cbfca --- a/configure +++ b/configure @@@ -462,20 -347,6 +462,19 @@@ EO 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 + bold_color=$(tput bold) + warn_color=$(tput setaf 3) + error_color=$(tput setaf 1) + reset_color=$(tput sgr0) + fi + # 72 used instead of 80 since that's the default of pr + ncols=$(tput cols) +fi +: ${ncols:=72} + log(){ echo "$@" >> $logfile } @@@ -3714,25 -2857,10 +3713,27 @@@ for e in $env; d eval "export $e" done +if disabled autodetect; then + + # Unless iconv is explicitely disabled by the user, we still want to probe + # for the iconv from the libc. + disabled iconv || enable libc_iconv + + disable_weak $EXTERNAL_AUTODETECT_LIBRARY_LIST + disable_weak $HWACCEL_AUTODETECT_LIBRARY_LIST +fi +# Mark specifically enabled, but normally autodetected libraries as requested. +for lib in $AUTODETECT_LIBS; do + enabled $lib && request $lib +done +#TODO: switch to $AUTODETECT_LIBS when $THREADS_LIST is supported the same way +enable_weak $EXTERNAL_AUTODETECT_LIBRARY_LIST +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 @@@ -4889,9 -3827,8 +4889,9 @@@ case $target_os i ;; 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 # an executable with each instruction set encountered by # the Solaris assembler. As our libraries contain their own @@@ -5754,42 -4550,27 +5754,39 @@@ f # check for some common methods of building with pthread support # do this before the optional library checks as some of them require pthreads -if ! disabled pthreads && ! enabled w32threads; then - if check_lib pthreads pthread.h pthread_join -pthread; then +if ! disabled pthreads && ! enabled w32threads && ! enabled os2threads; then + if check_lib pthreads pthread.h pthread_join -pthread && + check_lib pthreads pthread.h pthread_create -pthread; then add_cflags -pthread - elif check_lib pthreads pthread.h pthread_join -pthreads; then + elif check_lib pthreads pthread.h pthread_join -pthreads && + check_lib pthreads pthread.h pthread_create -pthreads; then add_cflags -pthreads - elif check_lib pthreads pthread.h pthread_join -lpthreadGC2; then + elif check_lib pthreads pthread.h pthread_join -ldl -pthread && + check_lib pthreads pthread.h pthread_create -ldl -pthread; then + add_cflags -ldl -pthread + elif check_lib pthreads pthread.h pthread_join -lpthreadGC2 && + check_lib pthreads pthread.h pthread_create -lpthreadGC2; then : - elif check_lib pthreads pthread.h pthread_join -lpthread; then + elif check_lib pthreads pthread.h pthread_join -lpthread && + check_lib pthreads pthread.h pthread_create -lpthread; then : - elif check_func pthread_join; then + elif check_func pthread_join && check_func pthread_create; then enable pthreads fi - enabled pthreads && + check_code cc "pthread.h" "static pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER" || disable pthreads - fi + - - if enabled pthreads; then - check_func pthread_cancel $pthreads_extralibs ++ 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 - 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 - -disabled zlib || check_lib zlib zlib.h zlibVersion -lz -disabled bzlib || check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2 +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 # On some systems dynamic loading requires no extra linker flags -check_lib libdl dlfcn.h dlopen || check_lib libdl dlfcn.h dlopen -ldl +check_lib libdl dlfcn.h "dlopen dlsym" || check_lib libdl dlfcn.h "dlopen dlsym" -ldl check_lib libm math.h sin -lm _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
