aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2013-01-17 11:24:01 +0100
committerLuca Barbato <lu_zero@gentoo.org>2013-01-17 21:41:18 +0100
commit43e0e0c4e56d754988f6d2d7eec1c302cee5d5ec (patch)
tree5f2075cf5cc9ea4cb344e642e9250001ffd05a4b /configure
parent973b4d44f1e87df63d78b864eeb5988119f822e7 (diff)
downloadffmpeg-43e0e0c4e56d754988f6d2d7eec1c302cee5d5ec.tar.gz
libcdio: support recent cdio-paranoia
Upstream decided to split the paranoia interface and move the headers accordingly.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure b/configure
index 879c36d178..f7350b38fd 100755
--- a/configure
+++ b/configure
@@ -1199,6 +1199,8 @@ HAVE_LIST="
asm_mod_y
attribute_may_alias
attribute_packed
+ cdio_paranoia_h
+ cdio_paranoia_paranoia_h
closesocket
cmov
CommandLineToArgvW
@@ -3558,8 +3560,9 @@ enabled jack_indev && check_lib2 jack/jack.h jack_client_open -ljack &&
enabled_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio
-enabled libcdio &&
- check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio
+if enabled libcdio; then
+ check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio || check_lib2 "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio
+fi
enabled x11grab &&
require X11 X11/Xlib.h XOpenDisplay -lX11 &&