diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-25 02:57:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-25 02:57:41 +0100 |
| commit | 797ef671dda9094640ade203a09dc59e9bf328a4 (patch) | |
| tree | 01f686f189f26f0dc745dc5a4d70d6983b18aafc /configure | |
| parent | 5d6c5dd36c024784a9cd36391c3698c2f1f2d2ab (diff) | |
| parent | 98a7d560b4f835ba5b99b9974ee1a2c096198bea (diff) | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
matroskadec: set default duration for simple block
When building for MinGW32 disable strict ANSI compliancy.
ARM: fix ff_apply_window_int16_neon() prototype
configure: check for --as-needed support early
ARM: NEON optimised apply_window_int16()
ac3enc: NEON optimised shift functions
ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min
mpeg12.c: fix slice threading for mpeg2 field picture mode.
ffmetadec.c: fix compiler warnings.
configure: Don't explicitly disable ffplay or in/outdevices on dos
configure: Remove the explicit disabling of ffserver
configure: Add fork as a dependency to ffserver
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -1488,7 +1488,7 @@ ffmpeg_select="buffer_filter" ffplay_deps="avcodec avformat swscale sdl" ffplay_select="rdft" ffprobe_deps="avcodec avformat" -ffserver_deps="avformat ffm_muxer rtp_protocol rtsp_demuxer" +ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer" ffserver_extralibs='$ldl' doc_deps="texi2html" @@ -2427,7 +2427,6 @@ case $target_os in LIBTARGET=arm-wince fi shlibdir_default="$bindir_default" - disable ffserver SLIBPREF="" SLIBSUF=".dll" SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' @@ -2446,6 +2445,7 @@ case $target_os in check_cpp_condition _mingw.h "defined (__MINGW64_VERSION_MAJOR) || (__MINGW32_MAJOR_VERSION > 3) \ || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" || die "ERROR: MinGW runtime version must be >= 3.15." + add_cppflags -U__STRICT_ANSI__ ;; cygwin*) target_os=cygwin @@ -2460,8 +2460,6 @@ case $target_os in check_cflags -fno-common ;; *-dos|freedos|opendos) - disable ffplay ffserver - disable $INDEV_LIST $OUTDEV_LIST network_extralibs="-lsocket" objformat="coff" enable dos_paths @@ -2742,6 +2740,8 @@ if enabled asm; then $nogas "GNU assembler not found, install gas-preprocessor" fi +check_ldflags -Wl,--as-needed + if check_func dlopen; then ldl= elif check_func dlopen -ldl; then @@ -2976,7 +2976,6 @@ enabled extra_warnings && check_cflags -Winline # add some linker flags check_ldflags -Wl,--warn-common -check_ldflags -Wl,--as-needed check_ldflags '-Wl,-rpath-link,\$(BUILD_ROOT)/libpostproc -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavfilter -Wl,-rpath-link,\$(BUILD_ROOT)/libavdevice -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil' test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic |