diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 00:44:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 00:44:21 +0100 |
| commit | 1f44b09d58d96ae98e91755cd3db2689e1deaf15 (patch) | |
| tree | 95f74ccec50311bca5743ddec46187216784756f /configure | |
| parent | 16c838b69a4e359705cfd3f1b4c6e2113c934c85 (diff) | |
| parent | 4070e02dfcf8c7d871b4a41d8b591ec0c130c70a (diff) | |
| download | ffmpeg-1f44b09d58d96ae98e91755cd3db2689e1deaf15.tar.gz | |
Merge commit '4070e02dfcf8c7d871b4a41d8b591ec0c130c70a' into release/2.4
* commit '4070e02dfcf8c7d871b4a41d8b591ec0c130c70a':
configure: Properly fail when libcdio/cdparanoia is not found
Conflicts:
configure
See: f514b5dff769a331ea2153c23594d9b29b667141
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4988,7 +4988,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 enabled xlib && |