diff options
author | Emil Velikov | 2015-04-06 13:02:38 -0500 |
---|---|---|
committer | Emil Velikov | 2015-04-28 05:21:10 -0500 |
commit | e2b531866f9be4b3b1dd9b42f7dda816183792b0 (patch) | |
tree | a853ea567534d2d24c9cca53b63a1d0c8d39109d /configure.ac | |
parent | 41eb131dfe1b8c03cda6e271496bcb7729e58fb6 (diff) | |
download | external-libdrm-e2b531866f9be4b3b1dd9b42f7dda816183792b0.tar.gz external-libdrm-e2b531866f9be4b3b1dd9b42f7dda816183792b0.tar.xz external-libdrm-e2b531866f9be4b3b1dd9b42f7dda816183792b0.zip |
man: rework the Makefile.am
Remove GNU make specific constructs and take into consideration that
Solaris man 7 is not the same as Linux man 7.
This commit introduces a dependency of xorg-macros 1.12 (released 4+
years ago) which is used to handle the above man section discrepancies.
Cc: Niveditha Rau <niveditha.rau@oracle.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 320e482e..f8adf4f6 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -29,6 +29,13 @@ AC_CONFIG_SRCDIR([Makefile.am]) | |||
29 | AC_CONFIG_MACRO_DIR([m4]) | 29 | AC_CONFIG_MACRO_DIR([m4]) |
30 | AC_CONFIG_AUX_DIR([build-aux]) | 30 | AC_CONFIG_AUX_DIR([build-aux]) |
31 | 31 | ||
32 | # Require xorg-macros minimum of 1.12 for XORG_WITH_XSLTPROC | ||
33 | m4_ifndef([XORG_MACROS_VERSION], | ||
34 | [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])]) | ||
35 | XORG_MACROS_VERSION(1.12) | ||
36 | XORG_WITH_XSLTPROC | ||
37 | XORG_MANPAGE_SECTIONS | ||
38 | |||
32 | AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2]) | 39 | AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2]) |
33 | 40 | ||
34 | # Enable quiet compiles on automake 1.11. | 41 | # Enable quiet compiles on automake 1.11. |
@@ -378,9 +385,8 @@ AM_CONDITIONAL(HAVE_LIBUDEV, [test "x$HAVE_LIBUDEV" = xyes]) | |||
378 | 385 | ||
379 | # xsltproc for docbook manpages | 386 | # xsltproc for docbook manpages |
380 | AC_ARG_ENABLE([manpages], | 387 | AC_ARG_ENABLE([manpages], |
381 | AS_HELP_STRING([--disable-manpages], [disable manpages @<:@default=enabled@:>@]), | 388 | AS_HELP_STRING([--enable-manpages], [enable manpages @<:@default=auto@:>@]), |
382 | [MANS=$enableval], [MANS=auto]) | 389 | [MANS=$enableval], [MANS=auto]) |
383 | AC_PATH_PROG(XSLTPROC, xsltproc) | ||
384 | AM_CONDITIONAL([BUILD_MANPAGES], [test "x$XSLTPROC" != "x" -a "x$MANS" != "xno"]) | 390 | AM_CONDITIONAL([BUILD_MANPAGES], [test "x$XSLTPROC" != "x" -a "x$MANS" != "xno"]) |
385 | 391 | ||
386 | # check for offline man-pages stylesheet | 392 | # check for offline man-pages stylesheet |