diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | xorg-macros.m4 | 23 |
2 files changed, 26 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2005-12-08 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * xorg-macros.m4: + Add support for building other formats from sgml docs. + 2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/xorg-macros.m4 b/xorg-macros.m4 index 387810e..0284399 100644 --- a/xorg-macros.m4 +++ b/xorg-macros.m4 @@ -188,10 +188,11 @@ AC_CHECK_FILE( ) AC_PATH_PROG(LINUXDOC, linuxdoc) +AC_PATH_PROG(PS2PDF, ps2pdf) AC_MSG_CHECKING([Whether to build documentation]) -if [[ ! -z $DEFS_ENT_PATH ] && [ ! -z $LINUXDOC ]] ; then +if test x$DEFS_ENT_PATH != x && test x$LINUXDOC != x ; then BUILDDOC=yes else BUILDDOC=no @@ -201,9 +202,27 @@ AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes]) AC_MSG_RESULT([$BUILDDOC]) -MAKE_TEXT="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B txt" +AC_MSG_CHECKING([Whether to build pdf documentation]) + +if test x$PS2PDF != x ; then + BUILDPDFDOC=yes +else + BUILDPDFDOC=no +fi + +AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) + +AC_MSG_RESULT([$BUILDPDFDOC]) + +MAKE_TEXT="SGML_SEARCH_PATH=$DEFS_ENT_PATH GROFF_NO_SGR=y $LINUXDOC -B txt" +MAKE_PS="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B latex --papersize=letter --output=ps" +MAKE_PDF="$PS2PDF" +MAKE_HTML="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B html --split=0" AC_SUBST(MAKE_TEXT) +AC_SUBST(MAKE_PS) +AC_SUBST(MAKE_PDF) +AC_SUBST(MAKE_HTML) ]) # XORG_CHECK_LINUXDOC # XORG_CHECK_MALLOC_ZERO |