diff options
| author | Max Kellermann <max@duempel.org> | 2009-03-28 21:38:53 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-03-28 21:38:53 +0100 |
| commit | 5164cc1ff811aee5466ef72d9ebb18e282a00bd6 (patch) | |
| tree | 93e6891adcbc217d19bcec861c825aad8001c124 | |
| parent | 50c53e4b24085174fbe8267d4da2b51711543374 (diff) | |
| download | mpd-5164cc1ff811aee5466ef72d9ebb18e282a00bd6.tar.gz mpd-5164cc1ff811aee5466ef72d9ebb18e282a00bd6.tar.xz mpd-5164cc1ff811aee5466ef72d9ebb18e282a00bd6.zip | |
Makefile.am: use JACK_CFLAGS and JACK_LIBS
Don't add those to MPD_CFLAGS and MPD_LIBS.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 249383150..e20aeea54 100644 --- a/Makefile.am +++ b/Makefile.am @@ -448,11 +448,13 @@ endif OUTPUT_CFLAGS = \ $(AO_CFLAGS) \ $(ALSA_CFLAGS) \ + $(JACK_CFLAGS) \ $(SHOUT_CFLAGS) OUTPUT_LIBS = \ $(AO_LIBS) \ $(ALSA_LIBS) \ + $(JACK_LIBS) \ $(SHOUT_LIBS) OUTPUT_API_SRC = \ diff --git a/configure.ac b/configure.ac index 76741cac1..b1e200ff1 100644 --- a/configure.ac +++ b/configure.ac @@ -700,11 +700,8 @@ AM_CONDITIONAL(HAVE_ALSA, test x$enable_alsa = xyes) if test x$enable_jack = xyes; then PKG_CHECK_MODULES([JACK], [jack >= 0.4], - [enable_jack=yes; - AC_DEFINE([HAVE_JACK], 1, - [Define to enable JACK support])] - MPD_LIBS="$MPD_LIBS $JACK_LIBS" - MPD_CFLAGS="$MPD_CFLAGS $JACK_CFLAGS", + [AC_DEFINE([HAVE_JACK], 1, + [Define to enable JACK support])], enable_jack=no) fi |