config_host.mk.in | 6 +++---
configure.ac | 3 ---
2 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 08fc25e8db2edcd1e82c2c43207af6d009ae2329
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Jul 25 19:29:24 2013 +0300
Move the Avahi entries into sorted location
Change-Id: I35e638ffa0766fe39cdfef2123f1db31d9558438
diff --git a/config_host.mk.in b/config_host.mk.in
index 343d9b5..6fb1cc8 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -25,6 +25,8 @@ export AR=@AR@
export ASSERT_ALWAYS_ABORT=@ASSERT_ALWAYS_ABORT@
export ATL_INCLUDE=@ATL_INCLUDE@
export ATL_LIB=@ATL_LIB@
+export AVAHI_CFLAGS=$(gb_SPACE)@AVAHI_CFLAGS@
+export AVAHI_LIBS=$(gb_SPACE)@AVAHI_LIBS@
export LIBATOMIC_OPS_CFLAGS=$(gb_SPACE)@LIBATOMIC_OPS_CFLAGS@
export LIBATOMIC_OPS_LIBS=$(gb_SPACE)@LIBATOMIC_OPS_LIBS@
export AWTLIB=@AWTLIB@
@@ -103,6 +105,7 @@ export DOCDIR=@DOCDIR@
export DOXYGEN=@DOXYGEN@
export DO_FETCH_TARBALLS=@DO_FETCH_TARBALLS@
export DPKG=@DPKG@
+export ENABLE_AVAHI=@ENABLE_AVAHI@
export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
export ENABLE_CORETEXT=@ENABLE_CORETEXT@
export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
@@ -116,7 +119,6 @@ export ENABLE_EVOAB2=@ENABLE_EVOAB2@
export ENABLE_FIREBIRD_SDBC=@ENABLE_FIREBIRD_SDBC@
export ENABLE_GCONF=@ENABLE_GCONF@
export ENABLE_GIO=@ENABLE_GIO@
-export ENABLE_AVAHI=@ENABLE_AVAHI@
export ENABLE_GNOMEVFS=@ENABLE_GNOMEVFS@
export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@
export ENABLE_HARFBUZZ=@ENABLE_HARFBUZZ@
@@ -178,8 +180,6 @@ export GCONF_CFLAGS=$(gb_SPACE)@GCONF_CFLAGS@
export GCONF_LIBS=$(gb_SPACE)@GCONF_LIBS@
export GIO_CFLAGS=$(gb_SPACE)@GIO_CFLAGS@
export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@
-export AVAHI_CFLAGS=$(gb_SPACE)@AVAHI_CFLAGS@
-export AVAHI_LIBS=$(gb_SPACE)@AVAHI_LIBS@
export GIT_REFERENCE_SRC=@GIT_REFERENCE_SRC@
export GIT_LINK_SRC=@GIT_LINK_SRC@
export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
commit 4a2a7060696b42bd7002f35e91b1d88046e504d5
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Jul 25 19:12:12 2013 +0300
Clean up configure output for Avahi
Change-Id: Ice3d3058b0b60642769c09496258cf34e022ff89
diff --git a/configure.ac b/configure.ac
index 496c29d..1a65c0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11388,7 +11388,6 @@ AC_SUBST(CAIRO_LIBS)
dnl ===================================================================
dnl Test whether to use avahi
dnl ===================================================================
-AC_MSG_CHECKING([whether to enable avahi support])
if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_avahi" = "yes";
then
PKG_CHECK_MODULES([AVAHI], [avahi-client >= 0.6.10],
[ENABLE_AVAHI="TRUE"], [ENABLE_AVAHI=""])
@@ -11396,8 +11395,6 @@ if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a
"$enable_avahi" = "yes"; then
AC_DEFINE(ENABLE_AVAHI)
AVAHI_CFLAGS=$(printf '%s' "$AVAHI_CFLAGS" | sed -e
"s/-I/${ISYSTEM?}/g")
fi
-else
- AC_MSG_RESULT([no])
fi
AC_SUBST(ENABLE_AVAHI)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
