diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-01-31 08:56:50 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-02-05 09:03:27 -0500 |
| commit | 1df1e7fd649b4ff3e00a908d4ade54bc6b32892f (patch) | |
| tree | 026c9eeec75dfd3df35206ea7696eefb65041d71 | |
| parent | 6fce3ec9157794d1a90ae28b2615c00ce84f95ed (diff) | |
XORG_WITH_GROFF: add tests for -ms and -mm macro packages
OS and distros often splits groff in a basic and full package, the former
having the groff program and the later having devices, fonts and macros
Checking for the groff executable is not enough.
Use HAVE_GROFF if you do not use -ms or -mm
Use HAVE_GROFF_MS and/or HAVE_GROFF_MM otherwise
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | xorg-macros.m4.in | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in index e9210a9..fc5904b 100644 --- a/xorg-macros.m4.in +++ b/xorg-macros.m4.in @@ -468,14 +468,24 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes]) # as whether or not to use the groff package. # # Interface to module: -# HAVE_GROFF: used in makefiles to conditionally generate documentation -# GROFF: returns the path of the groff program found -# returns the path set by the user in the environment -# --with-groff: 'yes' user instructs the module to use groff -# 'no' user instructs the module not to use groff +# HAVE_GROFF: used in makefiles to conditionally generate documentation +# HAVE_GROFF_MM: the memorandum macros (-mm) package +# HAVE_GROFF_MS: the -ms macros package +# GROFF: returns the path of the groff program found +# returns the path set by the user in the environment +# --with-groff: 'yes' user instructs the module to use groff +# 'no' user instructs the module not to use groff # # 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 +# having the groff program and the later having devices, fonts and macros +# Checking for the groff executable is not enough. +# +# If macros are missing, we cannot assume that groff is useless, so we don't +# unset HAVE_GROFF or GROFF env variables. +# HAVE_GROFF_?? can never be true while HAVE_GROFF is false. +# AC_DEFUN([XORG_WITH_GROFF],[ AC_ARG_VAR([GROFF], [Path to groff command]) AC_ARG_WITH(groff, @@ -505,7 +515,26 @@ 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]) + if ${GROFF} -ms -I. /dev/null >/dev/null 2>&1 ; then + groff_ms_works=yes + else + groff_ms_works=no + fi + AC_MSG_RESULT([$groff_ms_works]) + AC_MSG_CHECKING([for ${GROFF} -mm macros]) + if ${GROFF} -mm -I. /dev/null >/dev/null 2>&1 ; then + groff_mm_works=yes + else + groff_mm_works=no + fi + AC_MSG_RESULT([$groff_mm_works]) +fi AM_CONDITIONAL([HAVE_GROFF], [test "$have_groff" = yes]) +AM_CONDITIONAL([HAVE_GROFF_MS], [test "$groff_ms_works" = yes]) +AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes]) ]) # XORG_WITH_GROFF # XORG_WITH_FOP |