changeset 19267:8c126e388ea4

merge of '3413e78bc17828c36f80fa106446aef898adfc6d' and '37a828a3519f5c2fe7a6d94dc41d607b807dd371'
author William Ehlhardt <williamehlhardt@gmail.com>
date Tue, 14 Aug 2007 05:20:12 +0000
parents bda9483fbeb1 (diff) d5e76ad4b365 (current diff)
children db6218615be4 f14d539508ca c5f2e9b7b9ab
files
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/Makefile.am	Tue Aug 14 04:32:32 2007 +0000
+++ b/libpurple/Makefile.am	Tue Aug 14 05:20:12 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