summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMartin Lambers <marlam@marlam.de>2011-05-25 11:28:30 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-05-27 16:55:07 +0200
commitea7e318fb2d7a7c2395d87c93d1d5f703166ac0d (patch)
tree3407baf0d69de98ea8df9a94a9e697ff2810c892 /configure
parent87ababd7c5adb6d82a3a642b9b6e2223b3a4025b (diff)
Remove support for libdc1394 < 2.0.
Versions >= 2.0 have been around for a very long time now.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure12
1 files changed, 1 insertions, 11 deletions
diff --git a/configure b/configure
index c54706ab98..6e89473e2b 100755
--- a/configure
+++ b/configure
@@ -1076,8 +1076,6 @@ HAVE_LIST="
isatty
kbhit
ldbrx
- libdc1394_1
- libdc1394_2
llrint
llrintf
local_aligned_16
@@ -2911,6 +2909,7 @@ check_mathfunc truncf
enabled avisynth && require2 vfw32 "windows.h vfw.h" AVIFileInit -lavifil32
enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0
enabled frei0r && { check_header frei0r.h || die "ERROR: frei0r.h header not found"; }
+enabled libdc1394 && require_pkg_config libdc1394-2 dc1394/dc1394.h dc1394_new
enabled libdirac && require_pkg_config dirac \
"libdirac_decoder/dirac_parser.h libdirac_encoder/dirac_encoder.h" \
"dirac_decoder_init dirac_encoder_init"
@@ -2942,15 +2941,6 @@ enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs
enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
-# libdc1394 check
-if enabled libdc1394; then
- { check_lib dc1394/dc1394.h dc1394_new -ldc1394 -lraw1394 &&
- enable libdc1394_2; } ||
- { check_lib libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394 &&
- enable libdc1394_1; } ||
- die "ERROR: No version of libdc1394 found "
-fi
-
SDL_CONFIG="${cross_prefix}sdl-config"
if check_pkg_config sdl SDL_version.h SDL_Linked_Version; then
check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&