[PATCH libX11] config: remove man-pages configuration option
Gaetan Nadon
memsize at videotron.ca
Thu Aug 19 05:21:02 PDT 2010
This option was added in commit 6e752ea120 with no explanation.
The section number is provoded by XORG_MANPAGE_SECTIONS
There is no case where libX11 should be different than other libs
The option was also used to disable building of the man pages,
which build in 14 secs. No indication this is required.
If there is a requirement from system builders to disable building
of man pages, it could be done consistently for all modules.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
configure.ac | 18 +-----------------
man/Makefile.am | 2 --
man/xkb/Makefile.am | 2 --
3 files changed, 1 insertions(+), 21 deletions(-)
diff --git a/configure.ac b/configure.ac
index efdbe4d..ebb1366 100644
--- a/configure.ac
+++ b/configure.ac
@@ -376,17 +376,6 @@ AC_ARG_ENABLE(xkb,
[Disable XKB support *EXPERIMENTAL*]),
[XKB=$enableval],[XKB=yes])
-AC_ARG_ENABLE(man-pages,
- AC_HELP_STRING([--enable-man-pages=section],
- [Choose manual section for installing man pages]),
- [LIBMAN=$enableval],[LIBMAN=yes])
-
-if test "x$LIBMAN" != "xyes"; then
- LIB_MAN_SUFFIX=$LIBMAN
-fi
-
-AM_CONDITIONAL(MANPAGES, [ test x$LIBMAN '!=' xno ])
-
AM_CONDITIONAL(XKB, [ test x$XKB = xyes ])
if test x"$XKB" = "xyes"; then
XKBPROTO_REQUIRES="kbproto"
@@ -544,11 +533,6 @@ AC_OUTPUT([Makefile
x11.pc
x11-xcb.pc])
-man_pages_suffix=$LIB_MAN_SUFFIX
-if test -z "$man_pages_suffix"; then
- man_pages_suffix=none
-fi
-
echo ""
echo "X11 will be built with the following settings:"
echo " Loadable i18n module support: "$XLIB_LOADABLE_I18N
@@ -561,7 +545,7 @@ echo " Internationalization support: "$XLOCALE
echo " XF86BigFont support: "$XF86BIGFONT
echo " XKB support: "$XKB
echo " XLOCALEDIR environment variable support: "$ENABLE_XLOCALEDIR
-echo " Manual pages suffix: "$man_pages_suffix
+echo " Manual pages suffix: "$LIB_MAN_SUFFIX
echo " Compose table cache enabled: "$COMPOSECACHE
echo " Functional specs building enabled: "$build_specs
echo ""
diff --git a/man/Makefile.am b/man/Makefile.am
index 59e2709..60f64cc 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -194,13 +194,11 @@ libman_PRE = \
filemandir = $(FILE_MAN_DIR)
fileman_PRE = Compose.man
-if MANPAGES
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
$(all_shadows:=. at LIB_MAN_SUFFIX@)
fileman_DATA = $(fileman_PRE:man=@FILE_MAN_SUFFIX@) \
$(file_shadows:=. at FILE_MAN_SUFFIX@)
-endif
EXTRA_DIST = $(libman_PRE) $(fileman_PRE)
diff --git a/man/xkb/Makefile.am b/man/xkb/Makefile.am
index e02f9a8..484a85a 100644
--- a/man/xkb/Makefile.am
+++ b/man/xkb/Makefile.am
@@ -202,9 +202,7 @@ libman_PRE = \
XkbUpdateMapFromCore.man \
XkbVirtualModsToReal.man
-if MANPAGES
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
-endif
EXTRA_DIST = $(libman_PRE)
--
1.6.0.4
More information about the xorg-devel
mailing list