changeset 1880:668657be02ba 0.10.0-rc5

Honour libidn build flags Also check for pkg-config program presence
author Myhailo Danylenko <isbear@ukrpost.net>
date Wed, 07 Apr 2010 00:41:08 +0300
parents eef4e18f8a39
children 1f94aa40e49f
files mcabber/configure.ac mcabber/mcabber/Makefile.am
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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]],
--- 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