Mercurial > pidgin
changeset 19536:a77432fe2f3b
merge of '5d55a7b785e21cf51b586dd442481032b187c6c6'
and '98084aa63392b62af11d017ae863f4cb2f43cf83'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Thu, 30 Aug 2007 00:09:47 +0000 |
| parents | 7c84cbb57972 (diff) 7d9887c3ac81 (current diff) |
| children | 0eff4257d55b f77846f7d444 |
| files | ChangeLog libpurple/Makefile.am |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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