* Allow --disable-manpages, causing manpages not to be built or

installed


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

3 files changed, 71 insertions, 53 deletions

diff --git a/configure.ac b/configure.ac
index e58102c..bf8f316 100644
--- a/configure.ac
+++ b/configure.ac
@@ -560,30 +560,43 @@ DX_PS_FEATURE(OFF)
 DX_INIT_DOXYGEN(avahi, doxygen.cfg, doxygen)
 
 #
-# XMLTOMAN manpage generation
+# Build and Install man pages
 #
-AC_ARG_ENABLE(xmltoman,
-        AS_HELP_STRING([--disable-xmltoman],[Disable rebuilding of man pages with xmltoman]),
+AC_ARG_ENABLE(manpages,
+        AS_HELP_STRING([--disable-manpages],[Disable building and installation of man pages]),
 [case "${enableval}" in
-  yes) xmltoman=yes ;;
-  no)  xmltoman=no ;;
-  *) AC_MSG_ERROR([bad value ${enableval} for --disable-xmltoman]) ;;
-esac],[xmltoman=yes])
-
-if test x$xmltoman = xyes ; then
-    AC_CHECK_PROG(have_xmltoman, xmltoman, yes, no)
- 
-    if test x$have_xmltoman = xno ; then
-        if ! test -e man/avahi-daemon.8 ; then
-            AC_MSG_ERROR([*** xmltoman was not found, it is required to build the manpages and they have not been pre-built])
-            exit 1
+  yes) manpages=yes ;;
+  no)  manpages=no ;;
+  *) AC_MSG_ERROR([bad value ${enableval} for --disable-manpages]) ;;
+esac],[manpages=yes])
+
+if test x$manpages = xyes ; then
+    #
+    # XMLTOMAN manpage generation
+    #
+    AC_ARG_ENABLE(xmltoman,
+    AS_HELP_STRING([--disable-xmltoman],[Disable rebuilding of man pages with xmltoman]),
+    [case "${enableval}" in
+      yes) xmltoman=yes ;;
+      no)  xmltoman=no ;;
+      *) AC_MSG_ERROR([bad value ${enableval} for --disable-xmltoman]) ;;
+    esac],[xmltoman=yes])
+    
+    if test x$xmltoman = xyes ; then
+        AC_CHECK_PROG(have_xmltoman, xmltoman, yes, no)
+     
+        if test x$have_xmltoman = xno ; then
+            if ! test -e man/avahi-daemon.8 ; then
+                AC_MSG_ERROR([*** xmltoman was not found, it is required to build the manpages and they have not been pre-built])
+                exit 1
+            fi
+            AC_MSG_WARN([*** Not rebuilding man pages as xmltoman is not found ***])
+            xmltoman=no
         fi
-        AC_MSG_WARN([*** Not rebuilding man pages as xmltoman is not found ***])
-        xmltoman=no
     fi
 fi
-
 AM_CONDITIONAL([USE_XMLTOMAN], [test "x$xmltoman" = xyes])
+AM_CONDITIONAL([BUILD_MANPAGES], [test "x$manpages" = xyes])
 
 #
 # Conditionally compile test and example programs
diff --git a/docs/TODO b/docs/TODO
index b5ce6b1..eab602f 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -91,5 +91,6 @@ done:
 * consolidate browsing failure events and add an API to query the reason
 * Add sensible record updating API
 * rename AvahiAnnouncement to AvahiAnnouncer (to match AvahiQuerier)
+* implement avahi_client_add_address
 * remove AVAHI_PUBLISH_IS_PROXY
 * replace avahi_server_is_service_local() by AVAHI_PUBLISH flag
diff --git a/man/Makefile.am b/man/Makefile.am
index 0271e7d..c2bd848 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -20,6 +20,25 @@
 pkgsysconfdir=$(sysconfdir)/avahi
 servicedir=$(pkgsysconfdir)/services
 
+noinst_DATA = \
+	avahi-browse.1.xml \
+	avahi-publish-service.1.xml \
+	avahi-publish-address.1.xml \
+	avahi-resolve-address.1.xml \
+	avahi-resolve-host-name.1.xml \
+	avahi-daemon.8.xml \
+	avahi-discover.1.xml \
+	avahi-bookmarks.1.xml \
+	avahi-dnsconfd.8.xml \
+	avahi-daemon.conf.5.xml \
+	avahi-dnsconfd.action.8.xml \
+	avahi.service.5.xml
+
+CLEANFILES = \
+	$(noinst_DATA)
+
+if BUILD_MANPAGES
+
 man_MANS = \
 	avahi-daemon.8 \
 	avahi-dnsconfd.8 \
@@ -42,41 +61,6 @@ man_MANS += \
 endif
 endif
 
-noinst_DATA = \
-	avahi-browse.1.xml \
-	avahi-publish-service.1.xml \
-	avahi-publish-address.1.xml \
-	avahi-resolve-address.1.xml \
-	avahi-resolve-host-name.1.xml \
-	avahi-daemon.8.xml \
-	avahi-discover.1.xml \
-	avahi-bookmarks.1.xml \
-	avahi-dnsconfd.8.xml \
-	avahi-daemon.conf.5.xml \
-	avahi-dnsconfd.action.8.xml \
-	avahi.service.5.xml
-
-EXTRA_DIST = \
-	$(man_MANS) \
-	avahi-browse.1.xml.in \
-	avahi-publish-service.1.xml.in \
-	avahi-publish-address.1.xml.in \
-	avahi-resolve-address.1.xml.in \
-	avahi-resolve-host-name.1.xml.in \
-	avahi-daemon.8.xml.in \
-	avahi-discover.1.xml.in \
-	avahi-bookmarks.1.xml.in \
-	avahi-dnsconfd.8.xml.in \
-	avahi-daemon.conf.5.xml.in \
-	avahi-dnsconfd.action.8.xml.in \
-	avahi.service.5.xml.in \
-	xmltoman.css \
-	xmltoman.xsl \
-	xmltoman.dtd
-
-CLEANFILES = \
-	$(noinst_DATA)
-
 avahi-browse.1.xml: avahi-browse.1.xml.in Makefile
 	sed -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
         -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
@@ -180,3 +164,23 @@ xmllint: $(noinst_DATA)
 	done
 
 endif
+
+endif
+
+EXTRA_DIST = \
+	$(man_MANS) \
+	avahi-browse.1.xml.in \
+	avahi-publish-service.1.xml.in \
+	avahi-publish-address.1.xml.in \
+	avahi-resolve-address.1.xml.in \
+	avahi-resolve-host-name.1.xml.in \
+	avahi-daemon.8.xml.in \
+	avahi-discover.1.xml.in \
+	avahi-bookmarks.1.xml.in \
+	avahi-dnsconfd.8.xml.in \
+	avahi-daemon.conf.5.xml.in \
+	avahi-dnsconfd.action.8.xml.in \
+	avahi.service.5.xml.in \
+	xmltoman.css \
+	xmltoman.xsl \
+	xmltoman.dtd