Originally committed as revision 19503 to svn://svn.ffmpeg.org/ffmpeg/trunk
Måns Rullgård authored on 2009/07/24 08:30:54... | ... |
@@ -2260,7 +2260,7 @@ if enabled network; then |
2260 | 2260 |
fi |
2261 | 2261 |
fi |
2262 | 2262 |
|
2263 |
-enabled network && enabled ipv6 && check_ld <<EOF && enable ipv6 || disable ipv6 |
|
2263 |
+enabled_all network ipv6 && check_ld <<EOF || disable ipv6 |
|
2264 | 2264 |
#include <sys/types.h> |
2265 | 2265 |
#include <sys/socket.h> |
2266 | 2266 |
#include <netinet/in.h> |
... | ... |
@@ -2292,7 +2292,7 @@ check_header dev/ic/bt8xx.h |
2292 | 2292 |
check_header sys/soundcard.h |
2293 | 2293 |
check_header soundcard.h |
2294 | 2294 |
|
2295 |
-enabled alsa_indev || enabled alsa_outdev && check_lib2 alsa/asoundlib.h snd_pcm_htimestamp -lasound |
|
2295 |
+enabled_any alsa_indev alsa_outdev && check_lib2 alsa/asoundlib.h snd_pcm_htimestamp -lasound |
|
2296 | 2296 |
|
2297 | 2297 |
enabled jack_indev && check_lib2 jack/jack.h jack_client_open -ljack |
2298 | 2298 |
|