* Patch by ross burton to allow make dist to pass (Closes: #3480)

 * Move to doxygen in the default build, make --enable-doxygen=no to bypass, this also makes distcheck pass

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

diff --git a/Makefile.am b/Makefile.am
index d95030ca0c58a88d608f432866b49779012eaa7a..7de82c27489d5c825ae9d6011d52a9a2ff2024e8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,8 @@
 # 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 libtool.m4
-SUBDIRS = avahi-common avahi-core avahi-discover avahi-client avahi-daemon
+EXTRA_DIST = bootstrap.sh LICENSE doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in
+SUBDIRS = avahi-common avahi-core avahi-discover avahi-client avahi-daemon doxygen
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = avahi-core.pc

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index 6920e8c6627c7e9795481e0d6ce317f6014d67dc..6fb08399ba1676899a3da999e29cc88db0ea01c4 100644 (file)
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -65,7 +65,9 @@ libavahi_core_la_SOURCES = \
        browse-service-type.c \
        browse-service.c \
        resolve-service.c \
-       dns.c dns.h
+       dns.c dns.h \
+       core.h \
+       llist.h
 
 prioq_test_SOURCES = \
        prioq-test.c  \

diff --git a/configure.ac b/configure.ac
index e17692da5aa77d9bc32ac7a9a56bdabd11633d6d..b5492c51e1ce108771aca293a4e7539381b7be2a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,17 @@ if test "x$ENABLE_GTK" = "xyes"; then
 fi
 AM_CONDITIONAL(ENABLE_GTK, test "x$ENABLE_GTK" = "xyes")
 
+AC_ARG_ENABLE(doxygen,
+        AC_HELP_STRING([--enable-doxygen],[use doxygen to generate API docs (default=yes)]),
+        [case "${enableval}" in
+                yes) ENABLE_DOXYGEN=yes ;;
+                no)  ENABLE_DOXYGEN=no ;;
+                *) AC_MSG_ERROR(bad value ${enableval} for --enable-gtk) ;;
+        esac],
+        [ENABLE_DOXYGEN=yes]) dnl Default value
+
+AM_CONDITIONAL(ENABLE_DOXYGEN, test "x$ENABLE_DOXYGEN" = "xyes")
+
 # If using GCC specify some additional parameters
 if test "x$GCC" = "xyes" ; then
    CFLAGS="$CFLAGS -pipe -W -Wall -pedantic"

diff --git a/doxygen/Makefile.am b/doxygen/Makefile.am
index 4d085ef974b04c8c9c52a68743fb7f73657eb530..caf338e73d38b368a0bc1587540d5767b24e2cbd 100644 (file)
--- a/doxygen/Makefile.am
+++ b/doxygen/Makefile.am
@@ -17,6 +17,10 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
+if ENABLE_DOXYGEN
+all: doxygen
+endif
+
 doxygen: doxygen.conf
        doxygen $<