aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-07-16 16:51:33 +0200
committerDiego Biurrun <diego@biurrun.de>2012-07-18 02:00:21 +0200
commit47876d661a1e59ac29172c2fe6b01aa16d195313 (patch)
tree1f5104414b597357bca9f7480d34ededbacb7dea
parent7a249625fd63d11bc85a61a42dbc142841cf85b7 (diff)
downloadffmpeg-47876d661a1e59ac29172c2fe6b01aa16d195313.tar.gz
configure: cosmetics: drop some unnecessary backslashes
-rwxr-xr-xconfigure14
1 files changed, 7 insertions, 7 deletions
diff --git a/configure b/configure
index 93a68aa568..74378ba7ae 100755
--- a/configure
+++ b/configure
@@ -2846,9 +2846,9 @@ if enabled network; then
if check_header arpa/inet.h ; then
check_func closesocket
elif check_header winsock2.h ; then
- check_func_headers winsock2.h closesocket -lws2 && \
- network_extralibs="-lws2" || \
- { check_func_headers winsock2.h closesocket -lws2_32 && \
+ check_func_headers winsock2.h closesocket -lws2 &&
+ network_extralibs="-lws2" ||
+ { check_func_headers winsock2.h closesocket -lws2_32 &&
network_extralibs="-lws2_32"; }
check_func_headers ws2tcpip.h getaddrinfo $network_extralibs
check_type ws2tcpip.h socklen_t
@@ -3102,7 +3102,7 @@ check_ldflags -Wl,--warn-common
check_ldflags -Wl,-rpath-link=libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
-enabled xmm_clobber_test && \
+enabled xmm_clobber_test &&
check_ldflags -Wl,--wrap,avcodec_open2 \
-Wl,--wrap,avcodec_decode_audio4 \
-Wl,--wrap,avcodec_decode_video2 \
@@ -3110,7 +3110,7 @@ enabled xmm_clobber_test && \
-Wl,--wrap,avcodec_encode_audio2 \
-Wl,--wrap,avcodec_encode_video \
-Wl,--wrap,avcodec_encode_subtitle \
- -Wl,--wrap,sws_scale || \
+ -Wl,--wrap,sws_scale ||
disable xmm_clobber_test
echo "X{};" > $TMPV
@@ -3157,8 +3157,8 @@ if enabled icc; then
# icc 11.0 and 11.1 work with ebp_available, but don't pass the test
enable ebp_available
if enabled x86_32; then
- test ${icc_version%%.*} -ge 11 && \
- check_cflags -falign-stack=maintain-16-byte || \
+ test ${icc_version%%.*} -ge 11 &&
+ check_cflags -falign-stack=maintain-16-byte ||
disable aligned_stack
fi
elif enabled ccc; then