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

configure.ac: add macro MPD_ENABLE_AUTO_PKG

Browse Source 
Simplify the definition of many build options.
This commit is contained in:
Max Kellermann
2014-11-21 22:19:57 +01:00
parent b3f5f2f75f
commit b3f5b4932c
19 changed files with 174 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/fs/io/TextFile.cxx
View File

@@ -28,14 +28,14 @@
TextFile::TextFile(Path path_fs, Error &error)
:file_reader(new FileReader(path_fs, error)),
#ifdef HAVE_ZLIB
#ifdef ENABLE_ZLIB
gunzip_reader(file_reader->IsDefined()
? new AutoGunzipReader(*file_reader)
: nullptr),
#endif
buffered_reader(file_reader->IsDefined()
? new BufferedReader(*
#ifdef HAVE_ZLIB
#ifdef ENABLE_ZLIB
gunzip_reader
#else
file_reader
@@ -48,7 +48,7 @@ TextFile::TextFile(Path path_fs, Error &error)
TextFile::~TextFile()
{
delete buffered_reader;
#ifdef HAVE_ZLIB
#ifdef ENABLE_ZLIB
delete gunzip_reader;
#endif
delete file_reader;

2
src/fs/io/TextFile.hxx
View File

@@ -34,7 +34,7 @@ class BufferedReader;
class TextFile {
FileReader *const file_reader;
#ifdef HAVE_ZLIB
#ifdef ENABLE_ZLIB
AutoGunzipReader *const gunzip_reader;
#endif