mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Raise avahi-client dependency to 0.6.24.

merge-requests/1/head
Julien BLACHE 2009-02-18 13:25:44 +00:00
rodzic 25818023c6
commit 042656a002
4 zmienionych plików z 12 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
ChangeLog
Wyświetl plik

@ -1,4 +1,6 @@
2009-02-18 Julien Blache <jb@jblache.org>
* configure.in, configure: raise avahi-client dependency to
0.6.24, following a needed bugfix in this release.
* backend/net.c: do not lock the Avahi thread before stopping
it. It looks like it's no longer necessary to do so.
* frontend/saned.c: fix handling of Avahi server restart so it

6
backend/net.c
Wyświetl plik

@ -922,13 +922,9 @@ net_avahi_cleanup (void)
if (!avahi_thread)
return;
/* Not needed anymore? */
/* avahi_threaded_poll_lock (avahi_thread); */
DBG (1, "net_avahi_cleanup: stopping thread\n");
avahi_threaded_poll_stop (avahi_thread);
DBG (1, "net_avahi_cleanup: locking thread\n");
avahi_threaded_poll_stop (avahi_thread);
if (avahi_browser)
avahi_service_browser_free (avahi_browser);

16
configure vendored
Wyświetl plik

@ -9229,12 +9229,12 @@ if test -n "$AVAHI_CFLAGS"; then
pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6.4 \"") >&5
($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6.4 ") 2>&5
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6.24 \"") >&5
($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6.24 ") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags " avahi-client >= 0.6.4 " 2>/dev/null`
pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags " avahi-client >= 0.6.24 " 2>/dev/null`
else
pkg_failed=yes
fi
@ -9245,12 +9245,12 @@ if test -n "$AVAHI_LIBS"; then
pkg_cv_AVAHI_LIBS="$AVAHI_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6.4 \"") >&5
($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6.4 ") 2>&5
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6.24 \"") >&5
($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6.24 ") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs " avahi-client >= 0.6.4 " 2>/dev/null`
pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs " avahi-client >= 0.6.24 " 2>/dev/null`
else
pkg_failed=yes
fi
@ -9268,9 +9268,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " avahi-client >= 0.6.4 " 2>&1`
AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " avahi-client >= 0.6.24 " 2>&1`
else
AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors " avahi-client >= 0.6.4 " 2>&1`
AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors " avahi-client >= 0.6.24 " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$AVAHI_PKG_ERRORS" >&5

2
configure.in
Wyświetl plik

@ -133,7 +133,7 @@ AC_ARG_ENABLE(avahi,
[enable_avahi=$enableval], [enable_avahi=no])
if test "$enable_avahi" = "yes"; then
PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6.4 ],
PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6.24 ],
[AC_DEFINE(WITH_AVAHI, 1, [define if Avahi support is enabled for saned and the net backend])], enable_avahi=no)
fi