diff options
| author | Max Kellermann <max@duempel.org> | 2011-10-09 17:33:09 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-10-09 18:29:25 +0200 |
| commit | 072f83b2409a3441207145794ba1cd7f4fd13f3a (patch) | |
| tree | 8e9577e01e4d5de83b2a25077f770e513e9f0b7f /configure.ac | |
| parent | cbd6770f2fedb0988f28e951994b50b65b4c0221 (diff) | |
| download | mpd-072f83b2409a3441207145794ba1cd7f4fd13f3a.tar.gz mpd-072f83b2409a3441207145794ba1cd7f4fd13f3a.tar.xz mpd-072f83b2409a3441207145794ba1cd7f4fd13f3a.zip | |
configure.ac: use $LIBS instead of $MPD_LIBS
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 9c66bcb03..adee0de0e 100644 --- a/configure.ac +++ b/configure.ac @@ -57,11 +57,6 @@ AC_SUBST(AM_CPPFLAGS,"") AC_SUBST(AM_CFLAGS,"") AC_SUBST(AM_CXXFLAGS,"") -AC_SUBST(MPD_LIBS) -AC_SUBST(MPD_CFLAGS) -MPD_LIBS="" -MPD_CFLAGS="" - dnl --------------------------------------------------------------------------- dnl OS Specific Defaults dnl --------------------------------------------------------------------------- @@ -69,7 +64,7 @@ AC_CANONICAL_HOST case "$host_os" in mingw32* | windows*) - MPD_LIBS="$MPD_LIBS -lws2_32" + LIBS="$LIBS -lws2_32" ;; esac @@ -587,8 +582,7 @@ if test x$with_zeroconf != xno; then if test x$with_zeroconf = xbonjour || test x$with_zeroconf = xauto; then AC_CHECK_HEADER(dns_sd.h, [enable_bonjour=yes;AC_DEFINE([HAVE_BONJOUR], 1, [Define to enable Bonjour Zeroconf support])]) - AC_CHECK_LIB(dns_sd, DNSServiceRegister, - MPD_LIBS="$MPD_LIBS -ldns_sd") + AC_CHECK_LIB([dns_sd], [DNSServiceRegister]) fi if test x$enable_bonjour = xyes; then @@ -903,8 +897,8 @@ if test x$enable_mpc = xyes; then oldcflags=$CFLAGS oldlibs=$LIBS oldcppflags=$CPPFLAGS - CFLAGS="$CFLAGS $MPD_CFLAGS $MPCDEC_CFLAGS -I." - LIBS="$LIBS $MPD_LIBS $MPCDEC_LIBS" + CFLAGS="$CFLAGS $MPCDEC_CFLAGS -I." + LIBS="$LIBS $MPCDEC_LIBS" CPPFLAGS=$CFLAGS AC_CHECK_HEADER(mpc/mpcdec.h, old_mpcdec=no, @@ -1335,7 +1329,7 @@ enable_osx=no case "$host_os" in darwin*) AC_DEFINE(HAVE_OSX, 1, [Define for compiling OS X support]) - MPD_LIBS="$MPD_LIBS -framework AudioUnit -framework CoreAudio -framework CoreServices" + LIBS="$LIBS -framework AudioUnit -framework CoreAudio -framework CoreServices" enable_osx=yes ;; esac @@ -1429,7 +1423,7 @@ case "$host_os" in mingw32* | windows*) AC_DEFINE(ENABLE_WINMM_OUTPUT, 1, [Define to enable WinMM support]) enable_winmm_output=yes - MPD_LIBS="$MPD_LIBS -lwinmm" + LIBS="$LIBS -lwinmm" ;; *) |