Bug 1263156 - Fix "Cannot add 'AVAHI_CFLAGS' to configuration: Key already exists" configure error. r=florian
authoraleth <aleth@instantbird.org>
Fri, 08 Apr 2016 13:09:40 +0200
changeset 788 747fd3ff1c0be6fbc7c0a5867d47b5d6ee7e83f5
parent 787 6476bd54c5ca7c4674095f2740aacaea06fb3047
child 789 c13d58d643bf0a4fb8966430ab7a0f0e9ea6613f
push id63
push useraleth@instantbird.org
push dateMon, 11 Apr 2016 15:28:52 +0000
reviewersflorian
bugs1263156
Bug 1263156 - Fix "Cannot add 'AVAHI_CFLAGS' to configuration: Key already exists" configure error. r=florian
configure.in
--- a/configure.in
+++ b/configure.in
@@ -111,16 +111,17 @@ if test -n "[$]$1"; then
   AC_MSG_RESULT([$]$1)
 else
   AC_MSG_RESULT(no)
 fi
 AC_SUBST($1)dnl
 ])
 
 
+# Forked from build/autoconf/pkg.m4
 # PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
 # defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
 # also defines GSTUFF_PKG_ERRORS on error
 AC_DEFUN([PKG_CHECK_MODULES],
 [succeeded=no
 
   if test -z "$PKG_CONFIG"; then
     AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
@@ -212,18 +213,16 @@ if test "$PURPLE_BONJOUR"; then
             dnl =========================================================
             dnl = Attempt to autodetect Avahi
             dnl =========================================================
             PKG_CHECK_MODULES(AVAHI, avahi-client avahi-glib, PURPLE_AVAHI=1)
 
             if test -z "$PURPLE_AVAHI"; then
                 AC_MSG_ERROR([Could not find avahi-client or avahi-glib. To build without Bonjour, reconfigure with --disable-bonjour.])
             fi
-            AC_SUBST(AVAHI_CFLAGS)
-            AC_SUBST(AVAHI_LIBS)
             ;;
     esac
 fi
 
 dnl =========================================================
 dnl = Microsoft Office Communicator (SIPE)
 dnl =========================================================
 case "$OS_TARGET" in