diff options
| author | Max Kellermann <max@duempel.org> | 2011-07-19 00:24:20 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-07-19 00:24:20 +0200 |
| commit | eb2f413cf030a8c9ed51d8dc081e51e4afd287fb (patch) | |
| tree | 47c1265e07af284e8a2ced6cb968b5359b754274 /configure.ac | |
| parent | e54748d3554d57f8320dff7390fa605bf23d7cd0 (diff) | |
| parent | 736fd0e29326548152e91e4e3fb8c0ea9c1b50ac (diff) | |
| download | mpd-eb2f413cf030a8c9ed51d8dc081e51e4afd287fb.tar.gz mpd-eb2f413cf030a8c9ed51d8dc081e51e4afd287fb.tar.xz mpd-eb2f413cf030a8c9ed51d8dc081e51e4afd287fb.zip | |
Merge branch 'v0.16.x'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 94369c77e..84adf4d7e 100644 --- a/configure.ac +++ b/configure.ac @@ -557,15 +557,16 @@ no|avahi|bonjour) ;; esac +enable_avahi=no +enable_bounjour=no if test x$with_zeroconf != xno; then if test x$with_zeroconf = xavahi || test x$with_zeroconf = xauto; then PKG_CHECK_MODULES([AVAHI], [avahi-client avahi-glib], - [found_avahi=1;AC_DEFINE([HAVE_AVAHI], 1, [Define to enable Avahi Zeroconf support])] - MPD_LIBS="$MPD_LIBS $AVAHI_LIBS" MPD_CFLAGS="$MPD_CFLAGS $AVAHI_CFLAGS", - [found_avahi=0]) + [enable_avahi=yes;AC_DEFINE([HAVE_AVAHI], 1, [Define to enable Avahi Zeroconf support])] + MPD_LIBS="$MPD_LIBS $AVAHI_LIBS" MPD_CFLAGS="$MPD_CFLAGS $AVAHI_CFLAGS") fi - if test x$found_avahi = x1; then + if test x$enable_avahi = xyes; then with_zeroconf=avahi elif test x$with_zeroconf = xavahi; then AC_MSG_ERROR([Avahi support requested but not found]) @@ -573,13 +574,12 @@ 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, - [found_bonjour=1;AC_DEFINE([HAVE_BONJOUR], 1, [Define to enable Bonjour Zeroconf support])], - [found_bonjour=0]) + [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") fi - if test x$found_bonjour = x1; then + if test x$enable_bonjour = xyes; then with_zeroconf=bonjour elif test x$with_zeroconf = xbonjour; then AC_MSG_ERROR([Bonjour support requested but not found]) |