* Patch by Ross Burton to enable conditional use of dbus (--enable-dbus=no), disable...

 * Remove doxygen from EXTRA_DIST as its built by default now

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@107 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/Makefile.am b/Makefile.am
index 7de82c27489d5c825ae9d6011d52a9a2ff2024e8..616a9a697dfa5b3a881dc32cb6754df28fecb738 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-EXTRA_DIST = bootstrap.sh LICENSE doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in
+EXTRA_DIST = bootstrap.sh LICENSE
 SUBDIRS = avahi-common avahi-core avahi-discover avahi-client avahi-daemon doxygen
 
 pkgconfigdir = $(libdir)/pkgconfig

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 8bf007deec058398a5a4882f6d0119b0dc5b655d..3a033934d93d5f2945a88e0b1a200ccb34281a3b 100644 (file)
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -30,6 +30,7 @@ AM_LDADD+=$(DBUS_LIBS)
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
+if ENABLE_DBUS
 bin_PROGRAMS = \
        avahi
 
@@ -38,3 +39,4 @@ avahi_SOURCES = \
 
 avahi_CFLAGS = $(AM_CFLAGS)
 avahi_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la
+endif

diff --git a/configure.ac b/configure.ac
index b5492c51e1ce108771aca293a4e7539381b7be2a..1a295d4c61d61cc463baea05b3b08d23472a062d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -62,11 +62,6 @@ PKG_CHECK_MODULES(GLIB20, [ glib-2.0 >= 2.4.0 ])
 AC_SUBST(GLIB20_CFLAGS)
 AC_SUBST(GLIB20_LIBS)
 
-# Check for DBUS
-PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 0.23, dbus-glib-1 >= 0.23 ])
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
-
 AC_ARG_ENABLE(gtk,
         AC_HELP_STRING([--enable-gtk],[use GTK+ (default=yes)]),
         [case "${enableval}" in
@@ -100,6 +95,24 @@ AC_ARG_ENABLE(doxygen,
 
 AM_CONDITIONAL(ENABLE_DOXYGEN, test "x$ENABLE_DOXYGEN" = "xyes")
 
+AC_ARG_ENABLE(dbus,
+        AC_HELP_STRING([--enable-dbus],[use DBus (default=yes)]),
+        [case "${enableval}" in
+                yes) ENABLE_DBUS=yes ;;
+                no)  ENABLE_DBUS=no ;;
+                *) AC_MSG_ERROR(bad value ${enableval} for --enable-dbus) ;;
+        esac],
+       [ENABLE_DBUS=yes]) dnl Default value
+
+if test "x$ENABLE_DBUS" = "xyes"; then
+        PKG_CHECK_MODULES(DBUS, [ dbus-glib-1 >= 0.23])
+        AC_SUBST(DBUS_CFLAGS)
+       AC_SUBST(DBUS_LIBS)
+fi
+
+AM_CONDITIONAL(ENABLE_DBUS, test "x$ENABLE_DBUS" = "xyes")
+
+
 # If using GCC specify some additional parameters
 if test "x$GCC" = "xyes" ; then
    CFLAGS="$CFLAGS -pipe -W -Wall -pedantic"