Configure fixes

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1152778 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

dnssd/configure.in.in

@@ -2,37 +2,21 @@
 
 AC_ARG_ENABLE(dnssd, [  --disable-dnssd     don't require libdns_sd (browsing and publishing DNS-SD services will not be possible) ],  with_dnssd=$enableval, with_dnssd=yes)
 if test "$with_dnssd" = "yes"; then
-AC_MSG_CHECKING(for DNS-SD support)
+# Check for pkg-config manually first, as if its not installed the
-save_dnssdtest_LIBS="$LIBS"
+# PKG_PROG_PKG_CONFIG macro won't be defined.
-save_dnssdtest_LDFLAGS="$LDFLAGS"
+m4_pattern_allow(PKG_CONFIG_MIN_VERSION)
-save_dnssdtest_CPPFLAGS="$CPPFLAGS"
+AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no)
-LDFLAGS="$all_libraries $LDFLAGS"
+
-CPPFLAGS="$CPPFLAGS $all_includes"
+if test x"$have_pkg_config" == xno; then
-case $host_os in
+    AC_MSG_ERROR(pkg-config is required to install this program)
-  darwin*) LIBS="" ;;
+fi
-  *) LIBS="-ldns_sd" ;;
+
-esac
+PKG_PROG_PKG_CONFIG
-have_libdns_sd="no"
+
-AC_TRY_LINK(	[
+PKG_CHECK_MODULES( AVAHI, [ avahi-qt3 >= 0.4 , avahi-client >= 0.4 ])
-			#include <dns_sd.h>
+AC_SUBST(AVAHI_CFLAGS)
-		],[
+AC_SUBST(AVAHI_LIBS)
-			DNSServiceRefDeallocate( (DNSServiceRef) 0);
+PKG_CHECK_EXISTS( [ avahi-client >= 0.6], AC_DEFINE(AVAHI_API_0_6,1,[Avahi API 0.6] ) )
-			TXTRecordDeallocate( (TXTRecordRef*) 0);
+have_libdns_sd="yes"
-		],[
-			AC_DEFINE(HAVE_DNSSD,1,[Define if dns-sd is available])
-			case $host_os in
-				darwin*) LIB_DNSSD="" ;;
-				*) LIB_DNSSD="-ldns_sd" ;;
-			esac
-			have_libdns_sd="yes"
-			AC_MSG_RESULT(yes)
-		],[
-			AC_MSG_RESULT(no)
-                        LIB_DNSSD=""
-])
-CPPFLAGS=$save_dnssdtest_CPPFLAGS
-LDFLAGS=$save_dnssdtest_LDFLAGS
-LIBS=$save_dnssdtest_LIBS
 fi
-AC_SUBST(LIB_DNSSD)
 AM_CONDITIONAL(HAVE_DNSSD, test "$have_libdns_sd" = "yes")