diff options
| author | Max Kellermann <max@duempel.org> | 2011-10-09 17:36:02 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-10-09 17:39:24 +0200 |
| commit | 02a6a46e86b4818ba5e19f9ece3b15249143d5e5 (patch) | |
| tree | 3b0bed0de2c5f5be843569e792550fb066cf4501 | |
| parent | 75ad90abc74cf9857c0417cfe8f8417c02dd7215 (diff) | |
| download | mpd-02a6a46e86b4818ba5e19f9ece3b15249143d5e5.tar.gz mpd-02a6a46e86b4818ba5e19f9ece3b15249143d5e5.tar.xz mpd-02a6a46e86b4818ba5e19f9ece3b15249143d5e5.zip | |
configure.ac: don't append DESPOTIFY_LIBS to MPD_LIBS
Use DESPOTIFY_LIBS in Makefile.am instead. Also, use
DESPOTIFY_CFLAGS.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index ccf74b9fd..b89810986 100644 --- a/Makefile.am +++ b/Makefile.am @@ -647,6 +647,7 @@ INPUT_CFLAGS = \ $(SOUP_CFLAGS) \ $(CDIO_PARANOIA_CFLAGS) \ $(FFMPEG_CFLAGS) \ + $(DESPOTIFY_CFLAGS) \ $(MMS_CFLAGS) INPUT_LIBS = \ @@ -654,6 +655,7 @@ INPUT_LIBS = \ $(SOUP_LIBS) \ $(CDIO_PARANOIA_LIBS) \ $(FFMPEG_LIBS) \ + $(DESPOTIFY_LIBS) \ $(MMS_LIBS) INPUT_SRC = \ diff --git a/configure.ac b/configure.ac index 50fb9e339..cc3902615 100644 --- a/configure.ac +++ b/configure.ac @@ -678,7 +678,6 @@ MPD_AUTO_PKG(despotify, DESPOTIFY, [despotify], [Despotify support], [despotify not found]) if test x$enable_despotify = xyes; then AC_DEFINE(ENABLE_DESPOTIFY, 1, [Define when despotify is enabled]) - MPD_LIBS="$MPD_LIBS $DESPOTIFY_LIBS" fi AM_CONDITIONAL(ENABLE_DESPOTIFY, test x$enable_despotify = xyes) |