Skip to content

M
mpd
Commit 65772a74 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

configure: correct avahi/bonjour state on result page

Was always displayed as "no", even if one was found.
parent cca2c2f4
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
configure.ac
View file @ 65772a74
...@@ -537,15 +537,16 @@ no|avahi|bonjour) ...@@ -537,15 +537,16 @@ no|avahi|bonjour)
;; ;;
esac esac
enable_avahi=no
enable_bounjour=no
if test x$with_zeroconf != xno; then if test x$with_zeroconf != xno; then
if test x$with_zeroconf = xavahi || test x$with_zeroconf = xauto; then if test x$with_zeroconf = xavahi || test x$with_zeroconf = xauto; then
PKG_CHECK_MODULES([AVAHI], [avahi-client avahi-glib], PKG_CHECK_MODULES([AVAHI], [avahi-client avahi-glib],
[found_avahi=1;AC_DEFINE([HAVE_AVAHI], 1, [Define to enable Avahi Zeroconf support])] [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", MPD_LIBS="$MPD_LIBS $AVAHI_LIBS" MPD_CFLAGS="$MPD_CFLAGS $AVAHI_CFLAGS")
[found_avahi=0])
fi fi
if test x$found_avahi = x1; then if test x$enable_avahi = xyes; then
with_zeroconf=avahi with_zeroconf=avahi
elif test x$with_zeroconf = xavahi; then elif test x$with_zeroconf = xavahi; then
AC_MSG_ERROR([Avahi support requested but not found]) AC_MSG_ERROR([Avahi support requested but not found])
...@@ -553,13 +554,12 @@ if test x$with_zeroconf != xno; then ...@@ -553,13 +554,12 @@ if test x$with_zeroconf != xno; then
if test x$with_zeroconf = xbonjour || test x$with_zeroconf = xauto; then if test x$with_zeroconf = xbonjour || test x$with_zeroconf = xauto; then
AC_CHECK_HEADER(dns_sd.h, AC_CHECK_HEADER(dns_sd.h,
[found_bonjour=1;AC_DEFINE([HAVE_BONJOUR], 1, [Define to enable Bonjour Zeroconf support])], [enable_bonjour=yes;AC_DEFINE([HAVE_BONJOUR], 1, [Define to enable Bonjour Zeroconf support])])
[found_bonjour=0])
AC_CHECK_LIB(dns_sd, DNSServiceRegister, AC_CHECK_LIB(dns_sd, DNSServiceRegister,
MPD_LIBS="$MPD_LIBS -ldns_sd") MPD_LIBS="$MPD_LIBS -ldns_sd")
fi fi
if test x$found_bonjour = x1; then if test x$enable_bonjour = xyes; then
with_zeroconf=bonjour with_zeroconf=bonjour
elif test x$with_zeroconf = xbonjour; then elif test x$with_zeroconf = xbonjour; then
AC_MSG_ERROR([Bonjour support requested but not found]) AC_MSG_ERROR([Bonjour support requested but not found])
......
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