diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2013-02-07 16:44:33 -0800 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2013-02-07 16:46:52 -0800 |
| commit | 6f6c68fa46e0b137511ad1afa764f452b6cc863a (patch) | |
| tree | b0f9b04bd09877024012ef7c4b81807001df710c | |
| parent | bda01e208ac47f6c8bb1a4ce8336162d790ff931 (diff) | |
Use xorg-macros to drag in man page build dependencies
And make sure to remove generated man page files during make clean.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
[CLEANFILES and XORG_MACROS_VERSION fixed by aplattner@nvidia.com]
Tested-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 27 |
2 files changed, 10 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index 87040d2e..f1cf540c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,6 +42,6 @@ XTS.txt: README $(XMLTO) man $< mv -f $(@:.man=.miscmansuffix) $@ -MAINTAINERCLEANFILES = *.xml $(xtsman_pre) $(xtsman_txt) +CLEANFILES = $(miscman_DATA) $(xtsman_xml) $(xtsman_pre) $(xtsman_txt) endif diff --git a/configure.ac b/configure.ac index 0643a379..e208b759 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,12 @@ AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) +# Initialize X.Org macros +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AM_MAINTAINER_MODE AC_CONFIG_HEADERS([config.h]) @@ -121,26 +127,11 @@ if test "x$PERL" = x || test "x$XSET" = x || test "x$XDPYINFO" = x; then AC_MSG_ERROR([perl, xset and xdpyinfo are required to run xts-config]) fi -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], - [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) - -# Generate man page if asciidoc and xmlto are available. -AC_ARG_VAR([XMLTO], [Path to xmlto command]) -AC_PATH_PROG([XMLTO], [xmlto]) -AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command]) -AC_PATH_PROG([ASCIIDOC], [asciidoc]) - -AM_CONDITIONAL([HAVE_DOCTOOLS], [test "x$XMLTO" != "x" && test "x$ASCIIDOC" != "x"]) +XORG_WITH_ASCIIDOC +XORG_WITH_XMLTO +AM_CONDITIONAL(HAVE_DOCTOOLS, [test "x$XMLTO" != "x" && test "x$ASCIIDOC" != "x"]) if test "x$XMLTO" = "x" || test "x$ASCIIDOC" = "x"; then AC_MSG_WARN([xmlto or asciidoc not found - cannot create man pages without it]) -else - if test x$MISC_MAN_SUFFIX = x ; then - case $host_os in - solaris*) MISC_MAN_SUFFIX=5 ;; - *) MISC_MAN_SUFFIX=7 ;; - esac - fi - AC_SUBST(MISC_MAN_SUFFIX) fi AC_CONFIG_FILES([ |