aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2009-07-23 23:30:54 +0000
committerMåns Rullgård <mans@mansr.com>2009-07-23 23:30:54 +0000
commitb6f3d925ca541d79fb458024514f0ec338e98d89 (patch)
tree50b0e301f5709b44a317b0eaba7787f4c0d1e7f6
parente45391bb3238798ff4ce6aba7c0ca8cfdd3c7263 (diff)
downloadffmpeg-b6f3d925ca541d79fb458024514f0ec338e98d89.tar.gz
configure: some small simplifications
Originally committed as revision 19503 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index b75e1361bf..f3ff0cb389 100755
--- a/configure
+++ b/configure
@@ -2260,7 +2260,7 @@ if enabled network; then
fi
fi
-enabled network && enabled ipv6 && check_ld <<EOF && enable ipv6 || disable ipv6
+enabled_all network ipv6 && check_ld <<EOF || disable ipv6
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -2292,7 +2292,7 @@ check_header dev/ic/bt8xx.h
check_header sys/soundcard.h
check_header soundcard.h
-enabled alsa_indev || enabled alsa_outdev && check_lib2 alsa/asoundlib.h snd_pcm_htimestamp -lasound
+enabled_any alsa_indev alsa_outdev && check_lib2 alsa/asoundlib.h snd_pcm_htimestamp -lasound
enabled jack_indev && check_lib2 jack/jack.h jack_client_open -ljack