[Libreoffice-commits] core.git: configure.ac

[David Tardon]

 configure.ac |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 40b2a899d5bcba98be371a93c635d04d36ff2c2b
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Nov 16 11:20:27 2013 +0100

    fail if avahi is not found
    
    If I configure with --enable-avahi, presumably I want the code to be
    built with avahi support...

diff --git a/configure.ac b/configure.ac
index 0ef3f53..fbac8ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11700,11 +11700,9 @@ dnl Test whether to use avahi
 dnl ===================================================================
 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(HAVE_FEATURE_AVAHI)
-        AVAHI_CFLAGS=$(printf '%s' "$AVAHI_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
-    fi
+                      [ENABLE_AVAHI="TRUE"])
+    AC_DEFINE(HAVE_FEATURE_AVAHI)
+    AVAHI_CFLAGS=$(printf '%s' "$AVAHI_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
 fi
 
 AC_SUBST(ENABLE_AVAHI)