# HG changeset patch
# User William Ehlhardt <williamehlhardt@gmail.com>
# Date 1187071133 0
# Node ID f14d539508caedb65f72719b4803bfc898cc81b8
# Parent  ce892eddb8f10d59561af7fe2b0bc0e8ecf5fdf2# Parent  8c126e388ea41259a8c4a8d11992772aeb4bd63d
propagate from branch 'im.pidgin.pidgin' (head cb5420b4b28888af9a419d6ca29f524e552c9cf0)
            to branch 'im.pidgin.soc.2007.certmgr' (head 97c2302635cebf1aef42b25b0c50a883ad091bde)

diff -r ce892eddb8f1 -r f14d539508ca libpurple/Makefile.am
--- a/libpurple/Makefile.am	Tue Aug 14 04:52:22 2007 +0000
+++ b/libpurple/Makefile.am	Tue Aug 14 05:58:53 2007 +0000
@@ -22,6 +22,9 @@
 		win32/giowin32.c \
 		win32/win32dep.h
 
+if USE_GCONFTOOL
+GCONF_DIR=gconf
+endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = purple.pc