diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-01-31 14:16:20 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-02-03 20:49:58 -0500 |
| commit | 137d1ff6be99d040e77c8c4c52029c5bdf1f4808 (patch) | |
| tree | 7b56a9e722cec0b066e40b9d4400313a59d671bc | |
| parent | 9ca583c5d6fcf9cd8151ee7b019630b141d32fab (diff) | |
doc: use new macros to control doc generation
Namely XORG_WITH_GROFF for the groff generation tool
XORG_WITH_PS2PDF for the conversion of PS docs to PDF
XORG_ENABLE_SPECS for the generation of specs
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 47 | ||||
| -rw-r--r-- | specs/troffrules.in | 6 |
2 files changed, 10 insertions, 43 deletions
diff --git a/configure.ac b/configure.ac index 0eea575c..6c4a3c64 100644 --- a/configure.ac +++ b/configure.ac @@ -16,14 +16,17 @@ AC_CONFIG_HEADER([include/X11/XlibConf.h]) # Require xorg-macros: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.4) + [m4_fatal([must install xorg-macros 1.6 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.6) # Set common system defines for POSIX extensions, such as _GNU_SOURCE # Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL) # to avoid autoconf errors. AC_USE_SYSTEM_EXTENSIONS XORG_DEFAULT_OPTIONS +XORG_ENABLE_SPECS +XORG_WITH_GROFF +XORG_WITH_PS2PDF # Checks for programs. AC_PROG_LIBTOOL @@ -421,45 +424,6 @@ AC_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database]) XORG_CHECK_MALLOC_ZERO -# Specification documents are currently provided in troff format -AC_ARG_VAR([GROFF], [Path to a groff executable that supports -ms]) -AC_PATH_PROGS([GROFF], [groff], [none], [$PATH:/usr/gnu/bin]) - -AC_ARG_VAR([PS2PDF], [Path to a ps2pdf executable]) -AC_PATH_PROGS([PS2PDF], [ps2pdf], [none], [$PATH:/usr/gnu/bin]) - -if test "x${GROFF}" != xnone ; then - AC_MSG_CHECKING([whether ${GROFF} -ms works]) - if ${GROFF} -ms -I. /dev/null >/dev/null 2>&1 ; then - groff_ms_works=yes - else - groff_ms_works=no - GROFF=none - fi - AC_MSG_RESULT([${groff_ms_works}]) -fi - -AC_MSG_CHECKING([whether to build specifications]) -AC_ARG_ENABLE(specs, AC_HELP_STRING([--enable-specs], - [Enable building of specification docs]), - [build_specs="${enableval}"], [build_specs="auto"]) - -if test "x${build_specs}" = xauto; then - if test "x${GROFF}" = xnone ; then - build_specs=no - else - build_specs=yes - fi -fi -AC_MSG_RESULT([${build_specs}]) -if test "x${build_specs}" = xyes && test "x${GROFF}" = xnone ; then - AC_MSG_ERROR([can't build documentation without groff]) -fi - -AM_CONDITIONAL(BUILD_SPECS, [test x$build_specs = xyes]) -AM_CONDITIONAL(HAVE_PS2PDF, [test x$PS2PDF != xnone]) - - AC_OUTPUT([Makefile include/Makefile man/Makefile @@ -567,4 +531,5 @@ echo " XKB support: "$XKB echo " XLOCALEDIR environment variable support: "$ENABLE_XLOCALEDIR echo " Manual pages suffix: "$man_pages_suffix echo " Compose table cache enabled: "$COMPOSECACHE +echo " Functional specs building enabled: "$build_specs echo "" diff --git a/specs/troffrules.in b/specs/troffrules.in index 8d87067c..d4e44a09 100644 --- a/specs/troffrules.in +++ b/specs/troffrules.in @@ -31,7 +31,8 @@ else printable_format = .ps endif -if BUILD_SPECS +if ENABLE_SPECS +if HAVE_GROFF_MS doc_DATA = $(doc_sources:.ms=.txt) \ $(doc_sources:.ms=$(printable_format)) \ $(doc_sources:.ms=.html) @@ -65,4 +66,5 @@ SUFFIXES = .ms .ps .txt .html .pdf .ps.pdf: $(AM_V_GEN) $(PS2PDF) $< $@ -endif BUILD_SPECS +endif HAVE_GROFF_MS +endif ENABLE_SPECS |