aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-07-13 14:15:07 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-07-13 17:16:30 +0200
commit149def7781fd77af8e0758140337eaabeb1059c0 (patch)
tree2358c9e98b5e2249bb3982af16a109db9ef109f9
parent9e4bb091401f45469a3dbf252344c2468edaa148 (diff)
downloadffmpeg-149def7781fd77af8e0758140337eaabeb1059c0.tar.gz
configure: Only build ffserver if SA_RESAMPLE is available.
QNX does not define SA_RESAMPLE (because it is not implemented). Fixes ticket #2780. Reviewed-by: Nicolas George
-rwxr-xr-xconfigure4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index e6a6f57b14..7dfeec100f 100755
--- a/configure
+++ b/configure
@@ -1500,6 +1500,7 @@ HAVE_LIST="
pthread_cancel
rdtsc
rsync_contimeout
+ sarestart
sched_getaffinity
sdl
SetConsoleTextAttribute
@@ -2214,7 +2215,7 @@ ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter
ffplay_deps="avcodec avformat swscale swresample sdl"
ffplay_select="rdft crop_filter"
ffprobe_deps="avcodec avformat"
-ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"
+ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer sarestart"
ffserver_extralibs='$ldl'
# documentation
@@ -4031,6 +4032,7 @@ check_builtin sync_val_compare_and_swap "" "int *ptr; int oldval, newval; __sync
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_builtin sarestart signal.h "SA_RESTART"
check_func sysconf
check_func sysctl
check_func usleep