[gnome-utils] [gsearchtool] Add EGGSMCLIENT _LIBS & _CFLAGS

[Dennis Cranston <dcransto src gnome org>]

commit e3ef5d47a404470952f859e431b3b2d7e11f1d5e
Author: Dennis Cranston <Dennis_Cranston yahoo com>
Date:   Mon May 18 08:28:44 2009 -0700

    [gsearchtool] Add EGGSMCLIENT _LIBS & _CFLAGS
    
    Add LIBEGGSMCLIENT_LIBS and LIBEGGSMCLIENT_CFLAGS to build.
---
 configure.ac               |    5 +++++
 gsearchtool/ChangeLog      |    2 +-
 libeggsmclient/Makefile.am |    7 +++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6380ddf..1a39846 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,6 +87,11 @@ PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
 
+# libeggsmclient
+PKG_CHECK_MODULES(LIBEGGSMCLIENT, gtk+-2.0 >= $GTK_REQUIRED)
+AC_SUBST(LIBEGGSMCLIENT_CFLAGS)
+AC_SUBST(LIBEGGSMCLIENT_LIBS)
+
 # libgdict requires just gtk+
 PKG_CHECK_MODULES(LIBGDICT, glib-2.0 >= $GLIB_REQUIRED dnl
                             gtk+-2.0 >= $GTK_REQUIRED)
diff --git a/gsearchtool/ChangeLog b/gsearchtool/ChangeLog
index 8df8ee8..834d022 100644
--- a/gsearchtool/ChangeLog
+++ b/gsearchtool/ChangeLog
@@ -3,7 +3,7 @@
 	* configure.ac, Makefile.am, *.[ch]: Added libeggsmclient 
 	& libgnomeui-deprecated.  Remove the use of libgnomui from
 	gnome-search-tool. This reduces the number of shared libraries 
-	required by gnome-search-tool from 75 to 49. Bug 573670.
+	required by gnome-search-tool from 75 to 52. Bug 573670.
 	
 2009-05-17  Dennis Cranston  <dennis_cranston yahoo com>
 
diff --git a/libeggsmclient/Makefile.am b/libeggsmclient/Makefile.am
index bcdc2bd..62cde70 100644
--- a/libeggsmclient/Makefile.am
+++ b/libeggsmclient/Makefile.am
@@ -4,8 +4,11 @@ INCLUDES = -DGTK_DISABLE_DEPRECATED \
 
 noinst_LTLIBRARIES = libeggsmclient.la
 
-libeggsmclient_la_LIBADD = $(GNOME_UTILS_LIBS)
-libeggsmclient_la_CFLAGS = $(GNOME_UTILS_CFLAGS) \
+libeggsmclient_la_LIBADD = $(LIBEGGSMCLIENT_LIBS)           \
+                           -lSM -lICE
+libeggsmclient_la_CFLAGS = $(LIBEGGSMCLIENT_CFLAGS)         \
+                           -DEGG_SM_CLIENT_BACKEND_XSMP     \
+                           -DG_LOG_DOMAIN=\""EggSMClient"\" \
                            $(WARN_CFLAGS)
 libeggsmclient_la_SOURCES = eggdesktopfile.h \
                             eggdesktopfile.c \