# HG changeset patch
# User Myhailo Danylenko <isbear@ukrpost.net>
# Date 1270590068 -10800
# Node ID 668657be02ba6e5843a2ebc127b27f8a5ad94956
# Parent  eef4e18f8a390a31a63cda34fa0a625abd171819
Honour libidn build flags
Also check for pkg-config program presence

diff -r eef4e18f8a39 -r 668657be02ba mcabber/configure.ac
--- a/mcabber/configure.ac	Tue Apr 06 22:03:55 2010 +0200
+++ b/mcabber/configure.ac	Wed Apr 07 00:41:08 2010 +0300
@@ -32,6 +32,8 @@
 
 AC_SYS_LARGEFILE
 
+PKG_PROG_PKG_CONFIG
+
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h locale.h netdb.h netinet/in.h stddef.h \
@@ -151,8 +153,6 @@
 
 # Check for loudmouth
 PKG_CHECK_MODULES(LOUDMOUTH, loudmouth-1.0 >= 1.4.2)
-AC_SUBST(LOUDMOUTH_CFLAGS)
-AC_SUBST(LOUDMOUTH_LIBS)
 
 # Check for libidn
 AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]],
diff -r eef4e18f8a39 -r 668657be02ba mcabber/mcabber/Makefile.am
--- a/mcabber/mcabber/Makefile.am	Tue Apr 06 22:03:55 2010 +0200
+++ b/mcabber/mcabber/Makefile.am	Wed Apr 07 00:41:08 2010 +0300
@@ -14,11 +14,11 @@
 endif
 
 LDADD = $(GLIB_LIBS) $(LOUDMOUTH_LIBS) $(GPGME_LIBS) $(LIBOTR_LIBS) \
-				$(ENCHANT_LIBS)
+				$(ENCHANT_LIBS) $(LIBIDN_LIBS)
 
 AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
 				$(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
-				$(ENCHANT_CFLAGS)
+				$(ENCHANT_CFLAGS) $(LIBIDN_CFLAGS)
 
 CLEANFILES = hgcset.h