diff options
author | marha <marha@users.sourceforge.net> | 2009-10-29 18:35:06 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-10-29 18:35:06 +0000 |
commit | 5a5506fed918b6d1a041a040b2060ed25e40d464 (patch) | |
tree | 7a0ecf56aa04552bd8516610a07b572548aa4cb2 /libX11/configure.ac | |
parent | e141b55eccf3c69d8ced513992e21463d37dbb03 (diff) | |
download | vcxsrv-5a5506fed918b6d1a041a040b2060ed25e40d464.tar.gz vcxsrv-5a5506fed918b6d1a041a040b2060ed25e40d464.tar.bz2 vcxsrv-5a5506fed918b6d1a041a040b2060ed25e40d464.zip |
svn merge ^/branches/released
Diffstat (limited to 'libX11/configure.ac')
-rw-r--r-- | libX11/configure.ac | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/libX11/configure.ac b/libX11/configure.ac index db83f262a..d62269747 100644 --- a/libX11/configure.ac +++ b/libX11/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.60) AC_INIT([libX11], - 1.3.1, + 1.3.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libX11) AC_CONFIG_SRCDIR([Makefile.am]) @@ -429,9 +429,23 @@ 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]), |