diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-01-03 13:17:14 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-01-03 13:17:14 +0000 |
| commit | ea411ff961225230dbee777fb7946795e7cedc27 (patch) | |
| tree | 5943f99fe67a09ca5d1eb86714e5736bfa72df24 | |
| parent | e7327a8f9d0fa83d3b1411211d5bb18d2f859896 (diff) | |
build avahi-gobject only when avahi-client is also built
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1670 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | avahi-gobject/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 10 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index f65e9e3..1b5b7d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -112,6 +112,7 @@ DX_INPUT += \ $(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 @@ DX_INPUT += \ $(srcdir)/avahi-gobject/ga-service-resolver.h endif endif +endif if HAVE_DBUS DX_INPUT += \ diff --git a/avahi-gobject/Makefile.am b/avahi-gobject/Makefile.am index e9e00a8..a9bcd4b 100644 --- a/avahi-gobject/Makefile.am +++ b/avahi-gobject/Makefile.am @@ -23,6 +23,7 @@ AM_CFLAGS=-I$(top_srcdir) AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' if HAVE_GOBJECT +if HAVE_DBUS avahigobjectincludedir=$(includedir)/avahi-gobject @@ -109,6 +110,7 @@ signals-marshal.c: signals-marshal.list $< > $@ 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] diff --git a/configure.ac b/configure.ac index 1fff56c..6dd58d0 100644 --- a/configure.ac +++ b/configure.ac @@ -1154,6 +1154,11 @@ if test "x$HAVE_GTK" = "xyes" -a "x$BUILD_CLIENT" = "xyes" ; then 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 @@ echo "\ 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} |