# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1188432587 0
# Node ID a77432fe2f3bf2a756999b51330fe96acf55a131
# Parent  7c84cbb57972f77b8a1e6de13dfd24bec9fc1d32# Parent  7d9887c3ac81b3e36387a746c1be8e7d5b980668
merge of '5d55a7b785e21cf51b586dd442481032b187c6c6'
     and '98084aa63392b62af11d017ae863f4cb2f43cf83'

diff -r 7d9887c3ac81 -r a77432fe2f3b ChangeLog
diff -r 7d9887c3ac81 -r a77432fe2f3b libpurple/Makefile.am
--- a/libpurple/Makefile.am	Wed Aug 29 20:28:35 2007 +0000
+++ b/libpurple/Makefile.am	Thu Aug 30 00:09:47 2007 +0000
@@ -22,9 +22,9 @@
 		win32/giowin32.c \
 		win32/win32dep.h
 
-# if USE_GCONFTOOL
-# GCONF_DIR=gconf
-# endif
+if USE_GCONFTOOL
+GCONF_DIR=gconf
+endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = purple.pc