diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 12:48:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 12:49:05 +0100 |
| commit | 4e6f1df657224d560691246cee4d596e8760fa9d (patch) | |
| tree | 490c3043e86f31ae25e1164fbab8b5c0bd20ae08 | |
| parent | bec350611eb1a7a5f7db402e8e86e8e0f985c0d8 (diff) | |
| parent | 0ad8d751337efbbd61c0d78762448b043100b653 (diff) | |
| download | ffmpeg-4e6f1df657224d560691246cee4d596e8760fa9d.tar.gz | |
Merge commit '0ad8d751337efbbd61c0d78762448b043100b653' into release/2.2
* commit '0ad8d751337efbbd61c0d78762448b043100b653':
configure: Properly fail when libcdio/cdparanoia is not found
Conflicts:
configure
See: f514b5dff769a331ea2153c23594d9b29b667141
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4646,7 +4646,7 @@ enabled_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio 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 || - die "ERROR: libcdio-paranoia not found" + die "ERROR: No usable libcdio/cdparanoia found" fi check_lib X11/Xlib.h XOpenDisplay -lX11 && enable xlib |