changeset 19542:f77846f7d444

merge of '7fc610625ed566ff67ef3526fa27198b4bf63eeb' and 'eb69f59edf1a788a6ecf761b2958ddb31ae8d5bb'
author Daniel Atallah <daniel.atallah@gmail.com>
date Thu, 30 Aug 2007 02:28:07 +0000
parents a77432fe2f3b (diff) 6575ec8e1a97 (current diff)
children fa29de8d18bc
files
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/Makefile.am	Wed Aug 29 23:43:36 2007 +0000
+++ b/libpurple/Makefile.am	Thu Aug 30 02:28:07 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