diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 11:23:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 11:26:49 +0100 |
| commit | 0425e16d96cccf6de32231ecfc37cde72985dde5 (patch) | |
| tree | 684c60947613ef177bc9fc86ec3b46d30075f55e | |
| parent | 69c32456a045235c67243515384666c741b7e8e6 (diff) | |
| parent | 521979e6b1e7a89751aebc285a40d6508f8af48f (diff) | |
| download | ffmpeg-streaming-0425e16d96cccf6de32231ecfc37cde72985dde5.zip ffmpeg-streaming-0425e16d96cccf6de32231ecfc37cde72985dde5.tar.gz | |
Merge commit '521979e6b1e7a89751aebc285a40d6508f8af48f'
* commit '521979e6b1e7a89751aebc285a40d6508f8af48f':
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
@@ -5079,7 +5079,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 && |
