Sort lists of components. Sort function checks and group them in more
sensible blocks. Add some whitespace where it helps readability.
Consistently use double instead of single quotes around component lists.
---
configure | 68 ++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 36 insertions(+), 32 deletions(-)
diff --git a/configure b/configure
index 4aa66c0..d199778 100755
--- a/configure
+++ b/configure
@@ -1083,6 +1083,7 @@ HWACCEL_LIST="
vda
vdpau
"
+
LIBRARY_LIST="
avcodec
avdevice
@@ -1133,18 +1134,18 @@ CONFIG_LIST="
xmm_clobber_test
"
-THREADS_LIST='
+THREADS_LIST="
pthreads
w32threads
-'
+"
-ATOMICS_LIST='
+ATOMICS_LIST="
atomics_gcc
atomics_suncc
atomics_win32
-'
+"
-ARCH_LIST='
+ARCH_LIST="
aarch64
alpha
arm
@@ -1169,18 +1170,18 @@ ARCH_LIST='
x86
x86_32
x86_64
-'
+"
-ARCH_EXT_LIST_ARM='
+ARCH_EXT_LIST_ARM="
armv5te
armv6
armv6t2
neon
vfp
vfpv3
-'
+"
-ARCH_EXT_LIST_X86='
+ARCH_EXT_LIST_X86="
amd3dnow
amd3dnowext
avx
@@ -1195,7 +1196,7 @@ ARCH_EXT_LIST_X86='
sse4
sse42
ssse3
-'
+"
ARCH_EXT_LIST="
$ARCH_EXT_LIST_ARM
@@ -1205,16 +1206,16 @@ ARCH_EXT_LIST="
vis
"
-HAVE_LIST_CMDLINE='
+HAVE_LIST_CMDLINE="
inline_asm
symver
yasm
-'
+"
-HAVE_LIST_PUB='
+HAVE_LIST_PUB="
bigendian
fast_unaligned
-'
+"
MATH_FUNCS="
atanf
@@ -1247,11 +1248,11 @@ HAVE_LIST="
$ARCH_EXT_LIST
$(add_suffix _external $ARCH_EXT_LIST)
$(add_suffix _inline $ARCH_EXT_LIST)
+ $ATOMICS_LIST
$HAVE_LIST_CMDLINE
$HAVE_LIST_PUB
- $THREADS_LIST
- $ATOMICS_LIST
$MATH_FUNCS
+ $THREADS_LIST
aligned_malloc
aligned_stack
alsa_asoundlib_h
@@ -1421,7 +1422,7 @@ CMDLINE_SELECT="
optimizations
"
-PATHS_LIST='
+PATHS_LIST="
bindir
datadir
docdir
@@ -1430,7 +1431,7 @@ PATHS_LIST='
mandir
prefix
shlibdir
-'
+"
CMDLINE_SET="
$PATHS_LIST
@@ -2296,7 +2297,7 @@ case "$toolchain" in
add_ldflags -fprofile-arcs -ftest-coverage
;;
hardened)
- add_cflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fno-strict-overflow
-fstack-protector-all
+ add_cflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fno-strict-overflow
-fstack-protector-all
add_ldflags -Wl,-z,relro -Wl,-z,now
;;
?*)
@@ -3675,16 +3676,18 @@ if ! disabled network; then
fi
fi
-# Solaris has nanosleep in -lrt, OpenSolaris no longer needs that
-check_func nanosleep || { check_func nanosleep -lrt && add_extralibs -lrt; }
+check_builtin sync_val_compare_and_swap "" "int *ptr; int oldval, newval;
__sync_val_compare_and_swap(ptr, oldval, newval)"
+check_builtin machine_rw_barrier mbarrier.h "__machine_rw_barrier()"
+check_builtin atomic_cas_ptr atomic.h "void **ptr; void *oldval, *newval;
atomic_cas_ptr(ptr, oldval, newval)"
+check_builtin MemoryBarrier windows.h "MemoryBarrier()"
+check_func_headers malloc.h _aligned_malloc && enable aligned_malloc
check_func fcntl
check_func fork
check_func_headers stdlib.h getenv
check_func gethrtime
check_func getopt
check_func getrusage
-check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
check_func gettimeofday
check_func inet_aton $network_extralibs
check_func isatty
@@ -3693,24 +3696,19 @@ check_func ${malloc_prefix}memalign &&
enable memalign
check_func mkstemp
check_func mmap
check_func mprotect
+# Solaris has nanosleep in -lrt, OpenSolaris no longer needs that
+check_func nanosleep || { check_func nanosleep -lrt && add_extralibs -lrt; }
check_func ${malloc_prefix}posix_memalign && enable posix_memalign
-check_func_headers malloc.h _aligned_malloc && enable aligned_malloc
+check_func sched_getaffinity
+check_func_headers io.h setmode
check_func setrlimit
check_func strerror_r
check_func strptime
check_func strtok_r
-check_func sched_getaffinity
-check_builtin sync_val_compare_and_swap "" "int *ptr; int oldval, newval;
__sync_val_compare_and_swap(ptr, oldval, newval)"
-check_builtin machine_rw_barrier mbarrier.h "__machine_rw_barrier()"
-check_builtin atomic_cas_ptr atomic.h "void **ptr; void *oldval, *newval;
atomic_cas_ptr(ptr, oldval, newval)"
-check_builtin MemoryBarrier windows.h "MemoryBarrier()"
check_func sysconf
check_func sysctl
check_func usleep
-check_func_headers io.h setmode
-check_lib2 "windows.h shellapi.h" CommandLineToArgvW -lshell32
-check_lib2 "windows.h wincrypt.h" CryptGenRandom -ladvapi32
-check_lib2 "windows.h psapi.h" GetProcessMemoryInfo -lpsapi
+
check_func_headers windows.h GetProcessAffinityMask
check_func_headers windows.h GetProcessTimes
check_func_headers windows.h GetSystemTimeAsFileTime
@@ -3739,6 +3737,12 @@ check_header VideoDecodeAcceleration/VDADecoder.h
check_header windows.h
check_header X11/extensions/XvMClib.h
+check_lib2 "windows.h shellapi.h" CommandLineToArgvW -lshell32
+check_lib2 "windows.h wincrypt.h" CryptGenRandom -ladvapi32
+check_lib2 "windows.h psapi.h" GetProcessMemoryInfo -lpsapi
+
+check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
+
disabled zlib || check_lib zlib.h zlibVersion -lz || disable zlib
disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
