Skip to content

M
mpd
Commit 02a6a46e authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

configure.ac: don't append DESPOTIFY_LIBS to MPD_LIBS

Use DESPOTIFY_LIBS in Makefile.am instead. Also, use DESPOTIFY_CFLAGS.
parent 75ad90ab
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
Makefile.am
View file @ 02a6a46e
...@@ -647,6 +647,7 @@ INPUT_CFLAGS = \ ...@@ -647,6 +647,7 @@ INPUT_CFLAGS = \
$(SOUP_CFLAGS) \ $(SOUP_CFLAGS) \
$(CDIO_PARANOIA_CFLAGS) \ $(CDIO_PARANOIA_CFLAGS) \
$(FFMPEG_CFLAGS) \ $(FFMPEG_CFLAGS) \
$(DESPOTIFY_CFLAGS) \
$(MMS_CFLAGS) $(MMS_CFLAGS)
INPUT_LIBS = \ INPUT_LIBS = \
...@@ -654,6 +655,7 @@ INPUT_LIBS = \ ...@@ -654,6 +655,7 @@ INPUT_LIBS = \
$(SOUP_LIBS) \ $(SOUP_LIBS) \
$(CDIO_PARANOIA_LIBS) \ $(CDIO_PARANOIA_LIBS) \
$(FFMPEG_LIBS) \ $(FFMPEG_LIBS) \
$(DESPOTIFY_LIBS) \
$(MMS_LIBS) $(MMS_LIBS)
INPUT_SRC = \ INPUT_SRC = \
......
configure.ac
View file @ 02a6a46e
...@@ -678,7 +678,6 @@ MPD_AUTO_PKG(despotify, DESPOTIFY, [despotify], ...@@ -678,7 +678,6 @@ MPD_AUTO_PKG(despotify, DESPOTIFY, [despotify],
[Despotify support], [despotify not found]) [Despotify support], [despotify not found])
if test x$enable_despotify = xyes; then if test x$enable_despotify = xyes; then
AC_DEFINE(ENABLE_DESPOTIFY, 1, [Define when despotify is enabled]) AC_DEFINE(ENABLE_DESPOTIFY, 1, [Define when despotify is enabled])
MPD_LIBS="$MPD_LIBS $DESPOTIFY_LIBS"
fi fi
AM_CONDITIONAL(ENABLE_DESPOTIFY, test x$enable_despotify = xyes) AM_CONDITIONAL(ENABLE_DESPOTIFY, test x$enable_despotify = xyes)
......
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