Merge commit '521979e6b1e7a89751aebc285a40d6508f8af48f'

* commit '521979e6b1e7a89751aebc285a40d6508f8af48f': configure: Properly fail when libcdio/cdparanoia is not found Conflicts: configure See: f514b5dff7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 0425e16d96
parent 69c32456a0 521979e6b1
commit 0425e16d96
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -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 &&