diff options
| author |  waker <wakeroid@gmail.com> | 2011-11-03 18:58:50 +0100 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2011-11-03 18:58:50 +0100 |
| commit | d565d295038bc65e06d4be871183dae9fcf3f823 (patch) | |
| tree | 561adcd27a1feda2d10048074bdd732bf4696366 /plugins/artwork/Makefile.am | |
| parent | 095c21789c8210f5e51452b83b8e4b3caa6989dd (diff) | |
| parent | 9e4a5021eb7bd880b90fde42b6b19bbeda7ffd01 (diff) | |
Merge branch 'master' into devel
Conflicts:
configure.ac
scripts/quickinstall.sh
Diffstat (limited to 'plugins/artwork/Makefile.am')
| -rw-r--r-- | plugins/artwork/Makefile.am | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/artwork/Makefile.am b/plugins/artwork/Makefile.am index 53cda944..74155a1c 100644 --- a/plugins/artwork/Makefile.am +++ b/plugins/artwork/Makefile.am @@ -12,6 +12,11 @@ else ARTWORK_DEPS=$(JPEG_DEPS_LIBS) $(PNG_DEPS_LIBS) endif -AM_CFLAGS = $(CFLAGS) $(ARTWORK_CFLAGS) -std=c99 -artwork_la_LIBADD = $(LDADD) $(ARTWORK_DEPS) +if HAVE_FLAC +FLAC_DEPS=$(FLAC_LIBS) +FLAC_CFLAGS=-DUSE_METAFLAC +endif + +AM_CFLAGS = $(CFLAGS) $(ARTWORK_CFLAGS) $(FLAC_CFLAGS) -std=c99 +artwork_la_LIBADD = $(LDADD) $(ARTWORK_DEPS) $(FLAC_DEPS) endif |