[PATCH app-xfs 3/3] config: remove redundant MAKE_DEVEL_DOCS and option

[Gaetan Nadon]

On Wed, 2010-01-20 at 11:30 -0800, Alan Coopersmith wrote:

> This was added because even if you have XMLTO you may not want to build
> the xfs internals documentation for developers which is unlikely to be
> of interest to 100% of people installing from packages.
> 

Plus the fact that some platforms (Gentoo OpenBSD) may have the tool
installed, but may be too old which breaks the build.
Those platforms asked for a generic macro where xmlto can be
unconditionally turned off the same way on all packages, rather than
reading custom code on each of them.

The option --without-xmlto will do the same. However, there may be a
case for a generic "don't build devel docs, which ever tool may be used"
option. This would be another util-macros feature to discuss. The server
has one, but, of course, it has a different name :-)

I don't have a problem in keeping it, that's why it is in a separate
patch. 


> 	-alan-
> 
> Gaetan Nadon wrote:
> > This is now handled by the generic XORG_WITH_XMLTO macro.
> > Platforms builder may need to adjust their build scripts.
> > 
> > Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> > ---
> >  Makefile.am  |    2 --
> >  configure.ac |    7 -------
> >  2 files changed, 0 insertions(+), 9 deletions(-)
> > 
> > diff --git a/Makefile.am b/Makefile.am
> > index 6d4d176..a3642f7 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -173,7 +173,6 @@ endif LINT
> >  # Developer documentation - not installed on system
> >  EXTRA_DIST += doc/xfs-design.xml doc/xfs-design.css doc/xfs-design.xsl
> >  
> > -if MAKE_DEVEL_DOCS
> >  if HAVE_XMLTO
> >  noinst_DATA = doc/xfs-design/index.html doc/xfs-design.txt
> >  CLEANFILES += $(noinst_DATA)
> > @@ -193,4 +192,3 @@ doc/xfs-design.txt: $(srcdir)/doc/xfs-design.xml $(srcdir)/doc/xfs-design.xsl
> >  	$(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/xfs-design.xsl -o doc txt $(srcdir)/doc/xfs-design.xml
> >  
> >  endif HAVE_XMLTO
> > -endif MAKE_DEVEL_DOCS
> > diff --git a/configure.ac b/configure.ac
> > index b429ed5..a0cfc44 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -95,13 +95,6 @@ AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [
> >                                  [ FONTPATH="${DEFAULT_FONT_PATH}" ])
> >  AC_SUBST([FONTPATH])
> >  
> > -# Option to enable support for building developer internals docs
> > -AC_ARG_ENABLE(devel-docs,
> > -	AS_HELP_STRING([--enable-devel-docs],
> > -	    [Build internals documentation for developers (default: enabled)]),
> > -	    [DEVEL_DOCS=$enableval], [DEVEL_DOCS=yes])
> > -AM_CONDITIONAL([MAKE_DEVEL_DOCS], [test "x$DEVEL_DOCS" = "xyes"])
> > -
> >  # Option to enable support for starting from inetd
> >  AC_ARG_ENABLE(inetd,
> >  	AS_HELP_STRING([--enable-inetd],
> 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.x.org/archives/xorg-devel/attachments/20100120/b2a9c2f7/attachment.html