Index: trunk/configure.ac
===================================================================
--- trunk/configure.ac	(revision 1668)
+++ trunk/configure.ac	(working copy)
@@ -1154,6 +1154,11 @@
    BUILD_UI="yes"
 fi
 
+BUILD_GOBJECT="no"
+if test "x$BUILD_CLIENT" = "xyes" -a "x$HAVE_GOBJECT" = "xyes" ; then
+   BUILD_GOBJECT="yes"
+fi
+
 echo "\
     Building libavahi-core              yes
     Building avahi-daemon:              ${BUILD_DAEMON}
@@ -1162,7 +1167,7 @@
     Building avahi-utils:               ${BUILD_CLIENT}
     Building avahi-python:              ${BUILD_PYTHON}
     Building libavahi-glib:             ${HAVE_GLIB}
-    Building libavahi-gobject:          ${HAVE_GOBJECT}
+    Building libavahi-gobject:          ${BUILD_GOBJECT}
     Building avahi-discover-standalone: ${HAVE_GTK}
     Building libavahi-qt3:              ${HAVE_QT3}
     Building libavahi-qt4:              ${HAVE_QT4}
Index: trunk/avahi-gobject/Makefile.am
===================================================================
--- trunk/avahi-gobject/Makefile.am	(revision 1668)
+++ trunk/avahi-gobject/Makefile.am	(working copy)
@@ -23,6 +23,7 @@
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 if HAVE_GOBJECT
+if HAVE_DBUS
 
 avahigobjectincludedir=$(includedir)/avahi-gobject
 
@@ -109,6 +110,7 @@
 	$< > $@
 
 endif
+endif
 
 indent:
 	indent -brf -nbbo -nbc -ip0 -cs -nbfde -npsl -br -brs -bap -i4 -bs -cdw -ce -npcs -hnl -cli4 -nut -ci8 ga-*.[ch]
Index: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	(revision 1668)
+++ trunk/Makefile.am	(working copy)
@@ -112,6 +112,7 @@
 	$(srcdir)/avahi-glib/glib-malloc.h
 
 if HAVE_GOBJECT
+if HAVE_DBUS
 DX_INPUT += \
 	$(srcdir)/avahi-gobject/ga-client.h \
 	$(srcdir)/avahi-gobject/ga-entry-group.h \
@@ -122,6 +123,7 @@
 	$(srcdir)/avahi-gobject/ga-service-resolver.h
 endif
 endif
+endif
 
 if HAVE_DBUS
 DX_INPUT += \