configure.ac: detect libiso9660 with pkg-config

Fail if the iso9660 plugin is enabled but not found.

configure.ac: detect libiso9660 with pkg-config
e1f0c534 · Max Kellermann · e216e01a · e1f0c534 · e1f0c534
Commit e1f0c534 authored Apr 13, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

Makefile.am Makefile.am +2 -0

configure.ac configure.ac +2 -5

No files found.
--- 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 =

--- 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