[libegg/spread-table-dnd: 39/45] Tidy smclient CFLAGS and LIBS

[Murray Cumming <murrayc src gnome org>]

commit ad0c827efab8d9b7c3e4e9959d19d8ec1b17335f
Author: David King <davidk openismus com>
Date:   Wed Mar 30 10:47:07 2011 +0200

    Tidy smclient CFLAGS and LIBS

 configure.ac                |   13 ++++---------
 libegg/smclient/Makefile.am |    2 --
 2 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b6bb012..92b7410 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,19 +77,14 @@ PKG_CHECK_MODULES(EGG_XML, libxml-2.0)
 AC_SUBST(EGG_XML_LIBS)
 AC_SUBST(EGG_XML_CFLAGS)
 
-PKG_CHECK_MODULES(EGG_LIBGNOMEUI, libgnomeui-2.0)
-AC_SUBST(EGG_LIBGNOMEUI_LIBS)
-AC_SUBST(EGG_LIBGNOMEUI_CFLAGS)
+PKG_CHECK_EXISTS(dbus-glib-1, have_dbus=yes, have_dbus=no)
+AS_IF([test "x$have_dbus" = "xyes"], [DBUS_DEPS="dbus-glib-1"])
+AM_CONDITIONAL(HAVE_DBUS, test "$have_dbus" = "yes")
 
-PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-2.0)
+PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-2.0 libgnomeui-2.0 $DBUS_DEPS)
 AC_SUBST(EGG_SMCLIENT_LIBS)
 AC_SUBST(EGG_SMCLIENT_CFLAGS)
 
-PKG_CHECK_MODULES(EGG_SMCLIENT_DBUS, dbus-glib-1, have_dbus=yes, have_dbus=no)
-AC_SUBST(EGG_SMCLIENT_DBUS_LIBS)
-AC_SUBST(EGG_SMCLIENT_DBUS_CFLAGS)
-AM_CONDITIONAL(HAVE_DBUS, test "$have_dbus" = "yes")
-
 ## check if we have gtk+ 2.5.x
 AM_CONDITIONAL(HAVE_GTK25, $PKG_CONFIG --atleast-version=2.5.0 gtk+-2.0)
 
diff --git a/libegg/smclient/Makefile.am b/libegg/smclient/Makefile.am
index 9d91268..9612c10 100644
--- a/libegg/smclient/Makefile.am
+++ b/libegg/smclient/Makefile.am
@@ -27,8 +27,6 @@ AM_CPPFLAGS =                            \
 	-DG_LOG_DOMAIN=\""EggSMClient"\" \
 	$(platform_defines)              \
 	$(EGG_SMCLIENT_CFLAGS)           \
-	$(EGG_SMCLIENT_DBUS_CFLAGS)      \
-	$(EGG_LIBGNOMEUI_CFLAGS)         \
 	$(WARN_CFLAGS)                   \
 	$(DISABLE_DEPRECATED)