diff options
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 35 |
2 files changed, 1 insertions, 36 deletions
diff --git a/Makefile.am b/Makefile.am index 566cec68..8aa609f6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,7 @@ noinst_DATA = pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libpulse.pc libpulse-simple.pc -if HAVE_HOWL +if HAVE_AVAHI pkgconfig_DATA += \ libpulse-browse.pc endif diff --git a/configure.ac b/configure.ac index eb6fa2d3..83cb2e1a 100644 --- a/configure.ac +++ b/configure.ac @@ -475,41 +475,6 @@ AC_SUBST(GLIB12_LIBS) AC_SUBST(HAVE_GLIB12) AM_CONDITIONAL([HAVE_GLIB12], [test "x$HAVE_GLIB12" = x1]) -#### Howl support (optional) #### - -AC_ARG_ENABLE([howl], - AC_HELP_STRING([--disable-howl], [Disable optional Howl support]), - [ - case "${enableval}" in - yes) howl=yes ;; - no) howl=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --disable-howl) ;; - esac - ], - [howl=auto]) - -if test "x${howl}" != xno ; then - PKG_CHECK_MODULES(HOWL, [ howl >= 0.9.8 ], - HAVE_HOWL=1, - [ - PKG_CHECK_MODULES(HOWL, [ avahi-compat-howl >= 0.9.8 ], - HAVE_HOWL=1, - [ - HAVE_HOWL=0 - if test "x$howl" = xyes ; then - AC_MSG_ERROR([*** Howl support not found]) - fi - ]) - ]) -else - HAVE_HOWL=0 -fi - -AC_SUBST(HOWL_CFLAGS) -AC_SUBST(HOWL_LIBS) -AC_SUBST(HAVE_HOWL) -AM_CONDITIONAL([HAVE_HOWL], [test "x$HAVE_HOWL" = x1]) - #### Avahi support (optional) #### AC_ARG_ENABLE([avahi], |