diff options
| author | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-10-03 21:22:08 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-10-03 21:22:08 +0000 |
| commit | 764ee0f698a17e34998b0e6d85f2c6cbf8f624c7 (patch) | |
| tree | 460c5080e389d4770ae9ed296b9700fe5bf7b769 | |
| parent | d690e4a9febd07988d149a967791c5629c17b258 (diff) | |
- For all drivers that have a <driver>.sgml file, add code in their build
system to build the README file at make dist time
- in util/macros/xorg-macros.m4, add a new XORG_CHECK_LINUXDOC macro that
will check if the required tools and files exist, and if so set a
conditional.
- util/modular/symlink.sh
- Link all the <driver>.sgml to xf86-video-<driver>/README.sgml
- Add all the README.<driver> to the list of excluded files
- xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml: Various changes to make
it spew less warnings when the text file is built.
| -rw-r--r-- | xorg-macros.m4 | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/xorg-macros.m4 b/xorg-macros.m4 index 14207d7..35ad3bb 100644 --- a/xorg-macros.m4 +++ b/xorg-macros.m4 @@ -109,4 +109,34 @@ AC_SUBST([DRIVER_MAN_SUFFIX]) AC_SUBST([ADMIN_MAN_SUFFIX]) ]) # XORG_MANPAGE_SECTIONS - +# XORG_CHECK_LINUXDOC +# ------------------- +# Defines the variable MAKE_TEXT if the necessary tools and +# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt. +# Whether or not the necessary tools and files are found can be checked +# with the AM_CONDITIONAL "BUILD_LINUXDOC" +AC_DEFUN([XORG_CHECK_LINUXDOC],[ +AC_CHECK_FILE( + [$prefix/share/X11/sgml/defs.ent], + [DEFS_ENT_PATH=$prefix/share/X11/sgml], + [DEFS_ENT_PATH=] +) + +AC_PATH_PROG(LINUXDOC, linuxdoc) + +AC_MSG_CHECKING([Whether to build documentation]) + +if [[ ! -z $DEFS_ENT_PATH ] && [ ! -z $LINUXDOC ]] ; then + BUILDDOC=yes +else + BUILDDOC=no +fi + +AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes]) + +AC_MSG_RESULT([$BUILDDOC]) + +MAKE_TEXT="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B txt" + +AC_SUBST(MAKE_TEXT) +]) # XORG_CHECK_LINUXDOC |