Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-23 13:23:30 +0300
committerMichael Niedermayer <michaelni@gmx.at>2015-02-23 13:26:49 +0300
commit0425e16d96cccf6de32231ecfc37cde72985dde5 (patch)
tree684c60947613ef177bc9fc86ec3b46d30075f55e /configure
parent69c32456a045235c67243515384666c741b7e8e6 (diff)
parent521979e6b1e7a89751aebc285a40d6508f8af48f (diff)
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>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 3c713022ea..d037da105c 100755
--- a/configure
+++ b/configure
@@ -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 &&