From 7caf48e036583cd5833f5dc07ab14960dff25e04 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 2 Nov 2013 17:21:49 +0100 Subject: [PATCH] configure: miscellaneous cosmetics Sort lists of components. Add some whitespace where it helps readability. Consistently use double instead of single quotes around component lists. --- configure | 59 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/configure b/configure index 4b9ba85174..3d1fc290db 100755 --- a/configure +++ b/configure @@ -1158,6 +1158,7 @@ HWACCEL_LIST=" vda vdpau " + LIBRARY_LIST=" avcodec avdevice @@ -1196,8 +1197,8 @@ CONFIG_LIST=" neon_clobber_test network nonfree - pod2man pic + pod2man rdft runtime_cpudetect safe_bitstream_reader @@ -1212,18 +1213,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 @@ -1248,23 +1249,22 @@ 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_SIMD=' +ARCH_EXT_LIST_X86_SIMD=" amd3dnow amd3dnowext avx avx2 - xop fma3 fma4 mmx @@ -1275,7 +1275,8 @@ ARCH_EXT_LIST_X86_SIMD=' sse4 sse42 ssse3 -' + xop +" ARCH_EXT_LIST_X86=" $ARCH_EXT_LIST_X86_SIMD @@ -1291,16 +1292,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 @@ -1333,11 +1334,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 @@ -1378,16 +1379,16 @@ HAVE_LIST=" GetProcessAffinityMask GetProcessMemoryInfo GetProcessTimes - GetSystemTimeAsFileTime getrusage getservbyport + GetSystemTimeAsFileTime gettimeofday gnu_as gsm_h ibm_asm inet_aton - io_h inline_asm_labels + io_h isatty jack_port_get_latency_range ldbrx @@ -1440,8 +1441,6 @@ HAVE_LIST=" symver_asm_label symver_gnu_asm sync_val_compare_and_swap - sysconf - sysctl sys_mman_h sys_param_h sys_resource_h @@ -1450,6 +1449,8 @@ HAVE_LIST=" sys_time_h sys_un_h sys_videoio_h + sysconf + sysctl threads unistd_h usleep @@ -1511,7 +1512,7 @@ CMDLINE_SELECT=" optimizations " -PATHS_LIST=' +PATHS_LIST=" bindir datadir docdir @@ -1520,7 +1521,7 @@ PATHS_LIST=' mandir prefix shlibdir -' +" CMDLINE_SET=" $PATHS_LIST @@ -1724,8 +1725,8 @@ mdec_decoder_select="dsputil error_resilience mpegvideo" metasound_decoder_select="lsp mdct sinewin" mimic_decoder_select="dsputil hpeldsp" mjpeg_decoder_select="dsputil hpeldsp" -mjpegb_decoder_select="mjpeg_decoder" mjpeg_encoder_select="aandcttables dsputil mpegvideoenc" +mjpegb_decoder_select="mjpeg_decoder" mlp_decoder_select="dsputil mlp_parser" motionpixels_decoder_select="dsputil" mp1_decoder_select="mpegaudio" @@ -1783,9 +1784,9 @@ svq3_decoder_select="h264_decoder hpeldsp mpegvideo" svq3_decoder_suggest="zlib" tak_decoder_select="dsputil" theora_decoder_select="vp3_decoder" +thp_decoder_select="mjpeg_decoder" tiff_decoder_suggest="zlib" tiff_encoder_suggest="zlib" -thp_decoder_select="mjpeg_decoder" truehd_decoder_select="mlp_decoder" truemotion2_decoder_select="dsputil" truespeech_decoder_select="dsputil" @@ -1999,8 +2000,8 @@ ffrtmpcrypt_protocol_select="tcp_protocol" ffrtmphttp_protocol_deps="!librtmp_protocol" ffrtmphttp_protocol_select="http_protocol" gopher_protocol_select="network" -httpproxy_protocol_select="tcp_protocol" http_protocol_select="tcp_protocol" +httpproxy_protocol_select="tcp_protocol" https_protocol_select="tls_protocol" librtmp_protocol_deps="librtmp" librtmpe_protocol_deps="librtmp" @@ -2040,8 +2041,8 @@ frei0r_src_filter_deps="frei0r dlopen" frei0r_src_filter_extralibs='$ldl' hqdn3d_filter_deps="gpl" interlace_filter_deps="gpl" -resample_filter_deps="avresample" ocv_filter_deps="libopencv" +resample_filter_deps="avresample" scale_filter_deps="swscale" # examples @@ -2436,7 +2437,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 ;; ?*)