[PATCH v2 util-macros] XORG_WITH_GROFF: add HAVE_GROFF_HTML Automake conditional
Dan Nicholson
dbn.lists at gmail.com
Tue Jun 22 13:17:04 PDT 2010
On Sun, Jun 20, 2010 at 5:31 PM, Gaetan Nadon <memsize at videotron.ca> wrote:
> Groff uses grohtml to generate html output format. This program, in turn,
> uses a number of pnm* commands from the netpbm package, psselect
> from the psutils package and the ghostscript package.
>
> These are independently installed, so they could be missing.
> A check is made to ensure those dependencies are installed.
> If not, the makefile can use the conditional to supress the target.
>
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
> xorg-macros.m4.in | 23 +++++++++++++++++++++++
> 1 files changed, 23 insertions(+), 0 deletions(-)
>
> diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
> index a8e12ed..443ceaf 100644
> --- a/xorg-macros.m4.in
> +++ b/xorg-macros.m4.in
> @@ -552,6 +552,12 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
> # --with-groff: 'yes' user instructs the module to use groff
> # 'no' user instructs the module not to use groff
> #
> +# Added in version 1.9.0:
> +# HAVE_GROFF_HTML: groff has dependencies to output HTML format:
> +# pnmcut pnmcrop pnmtopng pnmtops from the netpbm package.
> +# psselect from the psutils package.
> +# the ghostcript package. Refer to the grohtml man pages
> +#
> # If the user sets the value of GROFF, AC_PATH_PROG skips testing the path.
> #
> # OS and distros often splits groff in a basic and full package, the former
> @@ -591,6 +597,7 @@ elif test "x$use_groff" = x"no" ; then
> else
> AC_MSG_ERROR([--with-groff expects 'yes' or 'no'])
> fi
> +
> # We have groff, test for the presence of the macro packages
> if test "x$have_groff" = x"yes"; then
> AC_MSG_CHECKING([for ${GROFF} -ms macros])
> @@ -608,9 +615,25 @@ if test "x$have_groff" = x"yes"; then
> fi
> AC_MSG_RESULT([$groff_mm_works])
> fi
> +
> +# We have groff, test for HTML dependencies, one command per package
> +if test "x$have_groff" = x"yes"; then
> + AC_PATH_PROGS(GS_PATH, [gs gswin32c])
> + AC_PATH_PROG(PNMTOPNG_PATH, [pnmtopng])
> + AC_PATH_PROG(PSSELECT_PATH, [psselect])
> + if test "x$GS_PATH" != "x" -a "x$PNMTOPNG_PATH" != "x" -a "x$PSSELECT_PATH" != "x"; then
> + have_groff_html=yes
> + else
> + have_groff_html=no
> + AC_MSG_WARN([grohtml dependencies not found - Documentation skipped. Refer to grohtml man pages])
it would be more accurate to say the html documentation would be
skipped. You could still generate the other groff outputs. Not a big
deal, though.
Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>
More information about the xorg-devel
mailing list