[Libreoffice-commits] core.git: config_host/config_features.h.in configure.ac

[Siqi]

 config_host/config_features.h.in |   12 ++++++++++++
 configure.ac                     |    1 -
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 9f8a350c2131f1289f9edb652c8e86e7b806040f
Author: Siqi <me at siqi.fr>
Date:   Fri Jul 26 09:16:59 2013 +0200

    discriptive comments on HAvE_FEATURE_AVAHI and remove unused ac_def
    
    Change-Id: I37183561a264625505036bcc6b945a6b24f05b5a

diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index e5d5187..3437e13 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -66,6 +66,18 @@
 
 #define HAVE_FEATURE_OPENCL 0
 
+/* 
+ * Whether the OS has Avahi support, 
+ * This library is used for zeroconf service publication on the local network
+ * for the Impress remote control, so that the remote can automatically 
+ * discover the running libO instance and its IP address. 
+ * 
+ * This library should be present on most mordern linux distributions
+ * but not on "all" of them. For now, you should add --enable-avahi for 
+ * this to be taken into account. Otherwise the test of its presence 
+ * will not take place.
+ */
+
 #define HAVE_FEATURE_AVAHI 0
 
 #endif
diff --git a/configure.ac b/configure.ac
index 10ffd2a..b45b175 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11392,7 +11392,6 @@ 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=""])
     if test "$ENABLE_AVAHI" = "TRUE"; then
-        AC_DEFINE(ENABLE_AVAHI)
         AC_DEFINE(HAVE_FEATURE_AVAHI)
         AVAHI_CFLAGS=$(printf '%s' "$AVAHI_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
     fi