Skip to content

M
mpd
Commit 702d6a64 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

configure.ac: append archive libraries to $MPD_LIBS

All archive plugins used to overwrite $MPD_LIBS, ignoring the existing value. Make them append instead, keeping the old value.
parent dfe23590
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 4 deletions
configure.ac
View file @ 702d6a64
......@@ -197,7 +197,9 @@ AC_ARG_ENABLE(bzip2,
enable_bz2=no)
if test x$enable_bz2 = xyes; then
AC_CHECK_LIB(bz2, BZ2_bzDecompressInit,[MPD_LIBS="-lbz2";],enable_bz2=no)
AC_CHECK_LIB(bz2, BZ2_bzDecompressInit,
[MPD_LIBS="$MPD_LIBS -lbz2"],
enable_bz2=no)
fi
AM_CONDITIONAL(HAVE_BZ2, test x$enable_bz2 = xyes)
......@@ -213,7 +215,9 @@ AC_ARG_ENABLE(zip,
enable_zip=no)
if test x$enable_zip = xyes; then
AC_CHECK_LIB(zzip, zzip_dir_open,[MPD_LIBS="-lzzip";],enable_zip=no)
AC_CHECK_LIB(zzip, zzip_dir_open,
[MPD_LIBS="$MPD_LIBS -lzzip"],
enable_zip=no)
fi
AM_CONDITIONAL(HAVE_ZIP, test x$enable_zip = xyes)
......@@ -229,12 +233,13 @@ AC_ARG_ENABLE(iso9660,
enable_iso=no)
if test x$enable_iso = xyes; then
AC_CHECK_LIB(iso9660, iso9660_ifs_readdir ,,enable_iso=no)
AC_CHECK_LIB(iso9660, iso9660_ifs_readdir,
[MPD_LIBS="$MPD_LIBS -liso9660"],
enable_iso=no)
fi
AM_CONDITIONAL(HAVE_ISO, test x$enable_iso = xyes)
if test x$enable_iso = xyes; then
MPD_LIBS="$MPD_LIBS -liso9660"
AC_DEFINE(HAVE_ISO, 1, [Define to have iso archive support])
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment