diff options
| author | Max Kellermann <max@duempel.org> | 2009-04-13 20:47:28 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-04-13 20:47:28 +0200 |
| commit | e1f0c5347c2eb96adb997679d61e12f655d3fe28 (patch) | |
| tree | b602c720d28f058ceac93d972d02119799c9815d | |
| parent | e216e01ab3db0d9bea179b043276401d38bfd957 (diff) | |
| download | mpd-e1f0c5347c2eb96adb997679d61e12f655d3fe28.tar.gz mpd-e1f0c5347c2eb96adb997679d61e12f655d3fe28.tar.xz mpd-e1f0c5347c2eb96adb997679d61e12f655d3fe28.zip | |
configure.ac: detect libiso9660 with pkg-config
Fail if the iso9660 plugin is enabled but not found.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 4f460b2bb..2b77a3ba2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -270,9 +270,11 @@ endif # archive plugins ARCHIVE_CFLAGS = \ + $(ISO9660_CFLAGS) \ $(ZZIP_CFLAGS) ARCHIVE_LIBS = \ + $(ISO9660_LIBS) \ $(ZZIP_LIBS) ARCHIVE_SRC = diff --git a/configure.ac b/configure.ac index f7edd8145..da73fd4c1 100644 --- a/configure.ac +++ b/configure.ac @@ -338,11 +338,8 @@ AC_ARG_ENABLE(iso9660, [enable iso9660 archive support (default: disabled)]),, enable_iso9660=no) -if test x$enable_iso9660 = xyes; then - AC_CHECK_LIB(iso9660, iso9660_ifs_readdir, - [MPD_LIBS="$MPD_LIBS -liso9660"], - enable_iso9660=no) -fi +MPD_AUTO_PKG(iso9660, ISO9660, [libiso9660], + [libiso9660 archive library], [libiso9660 not found]) AM_CONDITIONAL(HAVE_ISO, test x$enable_iso9660 = xyes) if test x$enable_iso9660 = xyes; then |