diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-26 21:23:55 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-26 21:23:55 +0000 |
| commit | 8f1afd266a69c5454dccf130e8522575c7aecae8 (patch) | |
| tree | d647da44b8f803428e3217d54bd42d89e72fa803 /X11/xtrans/configure.ac | |
| parent | cc5b4c212b7c88026e8ebc5f3d82473149a040c5 (diff) | |
| parent | f28d4c94798d88757227b8c517a05a6ca354dc6f (diff) | |
| download | vcxsrv-8f1afd266a69c5454dccf130e8522575c7aecae8.tar.gz vcxsrv-8f1afd266a69c5454dccf130e8522575c7aecae8.tar.bz2 vcxsrv-8f1afd266a69c5454dccf130e8522575c7aecae8.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'X11/xtrans/configure.ac')
| -rw-r--r-- | X11/xtrans/configure.ac | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/X11/xtrans/configure.ac b/X11/xtrans/configure.ac index 45757bfea..ce521bbb6 100644 --- a/X11/xtrans/configure.ac +++ b/X11/xtrans/configure.ac @@ -20,16 +20,21 @@ dnl PERFORMANCE OF THIS SOFTWARE. dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xtrans, [1.2.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xtrans) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([xtrans], [1.2.6], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xtrans]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require xorg-macros minimum of 1.10 for DocBook XML documentation m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.10) XORG_DEFAULT_OPTIONS +XORG_ENABLE_DOCS +XORG_WITH_XMLTO(0.0.20) +XORG_WITH_FOP +XORG_CHECK_SGML_DOCTOOLS(1.5) # Because xtrans is included into other modules rather than being linked # with, these defines have to be added to the cflags line @@ -49,21 +54,6 @@ sticky_bit_define="-DHAS_STICKY_DIR_BIT" AC_SUBST(sticky_bit_define) -# Documentation is currently provided in troff format, built on request -AC_PATH_PROGS([GROFF], [groff], [none], [$PATH:/usr/gnu/bin]) -AC_PATH_PROGS([PS2PDF], [ps2pdf], [none], [$PATH:/usr/gnu/bin]) - -AC_MSG_CHECKING([whether to build documentation]) -AC_ARG_ENABLE(docs, AC_HELP_STRING([--enable-docs], - [Enable building of documentation]), - [build_docs="${enableval}"], [build_docs="no"]) -AC_MSG_RESULT([${build_docs}]) -if test "x${build_docs}" = xyes && test "x${GROFF}" = xnone ; then - AC_MSG_ERROR([can't build documentation without groff]) -fi - -AM_CONDITIONAL(BUILD_DOCS, [test x$build_docs = xyes]) -AM_CONDITIONAL(HAVE_PS2PDF, [test x$PS2PDF != xnone]) - AC_OUTPUT([Makefile + doc/Makefile xtrans.pc]) |