[PATCH RESEND xserver 2/2] docs: replace BUILLDOCS with existing ENABLE_DEVEL_DOCS

[Tiago Vignatti]

On Tue, Dec 07, 2010 at 01:43:17PM -0500, ext Gaetan Nadon wrote:
> Use the util-macros AM Conditionals to control generation of developers
> documents. This is used throughout xorg modules.
> 
> The doxygen generated docs are now also managed by --enable-devel-docs.
> 
> Remove --enable-builddocs as this was last use for BUILDDOCS
> 
> 	*** From the RELEASE NOTES ***
> 
>  New configure options for documentation in modules
>  --------------------------------------------------
>  As many more modules now contain documentation to be converted from DocBook XML to text,
>  HTML, PostScript, and/or PDF formats, new standard options have been added to the configure
>  macros to control the build of these in the modules.
>  --with-xmlto=yes|no
>                      Enables or disables use of the xmlto [https://fedorahosted.org/
>                      xmlto/] command to translate DocBook XML to other formats.
>                      All DocBook XML conversions require use of this command.
>  --with-fop=yes|no
>                      Enables or disables use of the Apache fop [http://
>                      xmlgraphics.apache.org/fop/] command to translate DocBook
>                      XML to PostScript and PDF formats.
>  --enable-docs=yes|no
>                      Enables or disables the build and installation of all
>                      documentation except traditional man pages or those covered
>                      by the --enable-devel-docs and --enable-specs options.
>  --enable-devel-docs=yes|no
>                      Enables or disables the build and installation of documentation
>                      for developers of the X.Org software modules.
>  --enable-specs=yes|no
>                      Enables or disables the build and installation of the formal
>                      specification documents for protocols and APIs.
>                                                   
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>

Reviewed-by: Tiago Vignatti <tiago.vignatti at nokia.com>

> ---
>  configure.ac               |    5 -----
>  hw/dmx/Makefile.am         |    6 +-----
>  hw/dmx/doc/Makefile.am     |    2 +-
>  hw/xfree86/doc/Makefile.am |    4 ----
>  4 files changed, 2 insertions(+), 15 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index d6d10b7..f5a7258 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -584,9 +584,6 @@ AC_ARG_ENABLE(sparkle,AS_HELP_STRING([--enable-sparkle], [Enable updating of X11
>  				[ XQUARTZ_SPARKLE="${enableval}" ],
>  				[ XQUARTZ_SPARKLE="no" ])
>  AC_SUBST([XQUARTZ_SPARKLE])
> -AC_ARG_ENABLE(builddocs,      AS_HELP_STRING([--enable-builddocs], [Build docs (default: disabled)]),
> -                                [BUILDDOCS=$enableval],
> -                                [BUILDDOCS=no])
>  AC_ARG_ENABLE(install-libxf86config,
>  				AS_HELP_STRING([--enable-install-libxf86config],
>  				[Install libxf86config (default: disabled)]),
> @@ -712,8 +709,6 @@ if test "x$INT10" = xyes; then
>  	AC_CHECK_HEADERS([sys/vm86.h sys/io.h])
>  fi
>  
> -dnl Handle building documentation
> -AM_CONDITIONAL(BUILDDOCS, test "x$BUILDDOCS" = xyes)
>  XORG_ENABLE_DOCS
>  XORG_ENABLE_DEVEL_DOCS
>  XORG_WITH_XMLTO(0.0.20)
> diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
> index 9854f65..6d8d991 100644
> --- a/hw/dmx/Makefile.am
> +++ b/hw/dmx/Makefile.am
> @@ -1,5 +1,5 @@
>  
> -SUBDIRS = input config examples
> +SUBDIRS = input config examples doc
>  bin_PROGRAMS = Xdmx
>  
>  if XINERAMA
> @@ -14,10 +14,6 @@ GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
>  GLX_DEFS = @GL_CFLAGS@
>  endif
>  
> -if BUILDDOCS
> -SUBDIRS += doc
> -endif
> -
>  AM_CFLAGS = \
>        -DHAVE_DMX_CONFIG_H \
>        $(DIX_CFLAGS) \
> diff --git a/hw/dmx/doc/Makefile.am b/hw/dmx/doc/Makefile.am
> index 6dea366..4bbc8bf 100644
> --- a/hw/dmx/doc/Makefile.am
> +++ b/hw/dmx/doc/Makefile.am
> @@ -24,7 +24,6 @@ doc_sources = dmx.xml scaled.xml
>  # Developer's documentation is not installed
>  if ENABLE_DEVEL_DOCS
>  include $(top_srcdir)/doc/xml/xmlrules-noinst.in
> -endif
>  
>  if HAVE_DOXYGEN
>  
> @@ -40,6 +39,7 @@ html/annotated.html: $(DOXYGEN_SRC)
>  maintainer-clean-local:
>  	rm -rf html/
>  endif
> +endif ENABLE_DEVEL_DOCS
>  
>  EXTRA_DIST = \
>  	$(XML_FILES) \
> diff --git a/hw/xfree86/doc/Makefile.am b/hw/xfree86/doc/Makefile.am
> index 33ff18a..8021736 100644
> --- a/hw/xfree86/doc/Makefile.am
> +++ b/hw/xfree86/doc/Makefile.am
> @@ -1,8 +1,4 @@
> -if BUILDDOCS
>  SUBDIRS = devel man sgml
> -else
> -SUBDIRS = man
> -endif
>  
>  EXTRA_DIST = \
>  	README.modes
> -- 
> 1.6.0.4
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
             Tiago