oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

configure.ac: remove redundant declaration "HAVE_ISO9660"

Browse Source
This commit is contained in:
Max Kellermann 2014-12-22 10:18:06 +01:00
parent 062fef36f9
commit 8fab855099
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -753,7 +753,7 @@ libarchive_a_SOURCES += \
src/archive/plugins/ZzipArchivePlugin.hxx src/archive/plugins/ZzipArchivePlugin.hxx
endif endif
if HAVE_ISO9660 if ENABLE_ISO9660
libarchive_a_SOURCES += \ libarchive_a_SOURCES += \
src/archive/plugins/Iso9660ArchivePlugin.cxx \ src/archive/plugins/Iso9660ArchivePlugin.cxx \
src/archive/plugins/Iso9660ArchivePlugin.hxx src/archive/plugins/Iso9660ArchivePlugin.hxx

3
configure.ac
View File

@ -785,10 +785,7 @@ dnl --------------------------------- iso9660 ---------------------------------
MPD_ENABLE_AUTO_PKG(iso9660, ISO9660, [libiso9660], MPD_ENABLE_AUTO_PKG(iso9660, ISO9660, [libiso9660],
[libiso9660 archive plugin], [libiso9660 not found]) [libiso9660 archive plugin], [libiso9660 not found])
AM_CONDITIONAL(HAVE_ISO9660, test x$enable_iso9660 = xyes)
if test x$enable_iso9660 = xyes; then if test x$enable_iso9660 = xyes; then
AC_DEFINE(HAVE_ISO9660, 1, [Define to have ISO9660 archive support])
AC_PATH_PROG(MKISOFS, mkisofs, no) AC_PATH_PROG(MKISOFS, mkisofs, no)
else else
MKISOFS="no" MKISOFS="no"

2
src/archive/ArchiveList.cxx
View File

@ -35,7 +35,7 @@ const ArchivePlugin *const archive_plugins[] = {
#ifdef ENABLE_ZZIP #ifdef ENABLE_ZZIP
&zzip_archive_plugin, &zzip_archive_plugin,
#endif #endif
#ifdef HAVE_ISO9660 #ifdef ENABLE_ISO9660
&iso9660_archive_plugin, &iso9660_archive_plugin,
#endif #endif
nullptr nullptr