Merge commit '521979e6b1e7a89751aebc285a40d6508f8af48f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 10:23:30 +0000 (11:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 10:26:49 +0000 (11:26 +0100)
* commit '521979e6b1e7a89751aebc285a40d6508f8af48f':
  configure: Properly fail when libcdio/cdparanoia is not found

Conflicts:
configure

See: f514b5dff769a331ea2153c23594d9b29b667141
Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure

index 3c71302..d037da1 100755 (executable)
--- 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 &&