On Monday 23 June 2003 18:01, Frerich Raabe wrote:
> would it be possible to add a --with-included-docs flag for distcc's
> configure script which makes it install the HTML documentation as shipped
> in the tarball, opposing to rebuilding everything using linuxdoc? I can't
> ship a patch which does that right now (I'm not at home), but it would be
> most excellent if somebody (actually, one particular person :-) could sneak
> that in before the 2.7.1 release.
...and here is a patch which hopefully properly implements the described
behaviour. Now one can either pass --with-included-docs to the configure
script, or have it try whether it can find linuxdoc and possibly fall back to
using the pre-generated documentation files.
I'm not entirely sure whether this works properly since I do not have linuxdoc
installed (this is a FreeBSD system), but having this in the next release
would be most excellent.
- Frerich
--
"Irgendwie haben die Leute das mit der Meinungsfreiheit falsch verstanden,
man darf eine Meinung haben, man muss nicht. Wenn man keine Ahnung hat,
einfach mal Fresse halten."
Index: Makefile.in
===================================================================
RCS file: /cvsroot/distcc/Makefile.in,v
retrieving revision 1.230
diff -u -r1.230 Makefile.in
--- Makefile.in 20 Jun 2003 07:23:59 -0000 1.230
+++ Makefile.in 23 Jun 2003 20:16:02 -0000
@@ -72,6 +72,8 @@
LINUXDOC = @LINUXDOC@
+SGML_DOC = @SGML_DOC@
+
dist_files = AUTHORS COPYING COPYING.FDL NEWS README \
DEPENDENCIES INSTALL README.packaging README.popt \
TODO \
@@ -558,7 +560,7 @@
try-install-linuxdoc:
-$(MAKE) install-linuxdoc
-install-linuxdoc: linuxdoc/html/distcc.html
+install-linuxdoc: $(SGML_DOC)
$(mkinstalldirs) $(DESTDIR)$(manualdocdir)/html
for p in linuxdoc/html/*; do \
$(INSTALL_DATA) $$p $(DESTDIR)$(manualdocdir)/html || exit 1; \
Index: configure.ac
===================================================================
RCS file: /cvsroot/distcc/configure.ac,v
retrieving revision 1.157
diff -u -r1.157 configure.ac
--- configure.ac 20 Jun 2003 07:29:13 -0000 1.157
+++ configure.ac 23 Jun 2003 20:16:03 -0000
@@ -45,6 +45,9 @@
AC_ARG_WITH(included-popt,
AC_HELP_STRING([--with-included-popt], [use bundled popt library, not from system]))
+AC_ARG_WITH(included-docs,
+ AC_HELP_STRING([--with-included-docs], [use included HTML documentation, don't generate it]))
+
AC_ARG_ENABLE(rfc2553,
AC_HELP_STRING([--enable-rfc2553], [use getaddrinfo, getnameinfo, etc]),
AC_DEFINE(ENABLE_RFC2553,1,[Use getaddrinfo(), getnameinfo(), etc]))
@@ -295,11 +298,21 @@
# NB: Cannot use AC_CONFIG_LIBOBJ_DIR here, because it's not present
# in autoconf 2.53.
-AC_CHECK_PROGS(LINUXDOC, [linuxdoc])
-if test "x$LINUXDOC" = x
+SGML_DOC=""
+if test "x$with_included_docs" = x
then
- AC_MSG_NOTICE([Can't rebuild manual without linuxdoc])
+ AC_CHECK_PROGS(LINUXDOC, [linuxdoc])
+ if test "x$LINUXDOC" = x
+ then
+ AC_MSG_NOTICE([Can't rebuild manual without linuxdoc, using pre-generated manual])
+ else
+ SGML_DOC="linuxdoc/html/distcc.html"
+ fi
+else
+ AC_MSG_NOTICE([Using pre-generated manual])
fi
+AC_SUBST(SGML_DOC)
+
AC_ARG_VAR(LINUXDOC, [linuxdoc SGML processor])
AC_C_INLINE
__
distcc mailing list http://distcc.samba.org/
To unsubscribe or change options:
http://lists.samba.org/cgi-bin/mailman/listinfo/distcc
