Mercurial > audlegacy-plugins
changeset 1467:42306c187663
Fixed libcdio and libcddb autoconf detection
| author | Calin Crisan ccrisan@gmail.com |
|---|---|
| date | Sat, 11 Aug 2007 15:28:13 +0300 |
| parents | a0b4583a5e48 |
| children | 08364e03c918 |
| files | configure.ac |
| diffstat | 1 files changed, 13 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Sat Aug 11 20:10:10 2007 +0900 +++ b/configure.ac Sat Aug 11 15:28:13 2007 +0300 @@ -1072,9 +1072,6 @@ fi -AC_CHECK_HEADERS(linux/cdrom.h) -AC_CHECK_HEADERS(sys/cdio.h) -AC_CHECK_HEADERS(sys/cdrio.h) AC_CHECK_HEADERS(linux/joystick.h) AC_CHECK_HEADERS(unistd.h) AC_CHECK_HEADERS(fcntl.h) @@ -1101,15 +1098,24 @@ if test "$enable_cdaudio_ng" = "yes"; then PKG_CHECK_MODULES(CDIO, [libcdio >= 0.70], - [INPUT_PLUGINS="$INPUT_PLUGINS cdaudio-ng" - CDIO_LIBS=`pkg-config --libs libcdio_cdda` + , + [AC_MSG_WARN([*** Cannot find libcdio 0.70 or newer, cdaudio-ng will not be built ***]) + enable_cdaudio_ng=no] +) +fi + +if test "$enable_cdaudio_ng" = "yes"; then + PKG_CHECK_MODULES(CDIO, [libcdio_cdda >= 0.70], + [CDIO_LIBS=`pkg-config --libs libcdio_cdda` CDIO_CFLAGS=`pkg-config --cflags libcdio_cdda` AC_SUBST(CDIO_LIBS) AC_SUBST(CDIO_CFLAGS)], - [AC_MSG_WARN([*** Cannot find libcdio 0.70 or newer, cdaudio-ng will not be built ***]) - enable_cdaudio_ng=no] + [AC_MSG_WARN([*** Cannot find libcdio_cdda 0.70 or newer, cdaudio-ng will not be built ***]) + enable_cdaudio_ng=no] ) +fi +if test "$enable_cdaudio_ng" = "yes"; then PKG_CHECK_MODULES(CDDB, [libcddb >= 1.2.1], [INPUT_PLUGINS="$INPUT_PLUGINS cdaudio-ng" CDDB_LIBS=`pkg-config --libs libcddb` @@ -1121,7 +1127,6 @@ ) fi - AM_CONDITIONAL(HAVE_CDROM, test "${ac_cv_header_linux_cdrom_h}" = "yes" || test "${ac_cv_header_sys_cdio_h}" = "yes") AM_CONDITIONAL(HAVE_LINUX_JOYSTICK,test "${ac_cv_header_linux_joystick_h}" = "yes")