[PATCH libXfont 2/2] config: remove redundant MAKE_DEVEL_DOCS and option

Gaetan Nadon memsize at videotron.ca
Wed Jan 20 08:59:18 PST 2010


This is now handled by the generic XORG_WITH_XMLTO macro.
Platforms builder may need to adjust their build scripts.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 Makefile.am  |    2 --
 configure.ac |    7 -------
 2 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d47a551..e8a1922 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,7 +59,6 @@ dist-hook: ChangeLog INSTALL
 # Developer documentation - not installed on system
 EXTRA_DIST += doc/fontlib.xml doc/fontlib.xsl doc/fontlib.css
 
-if MAKE_DEVEL_DOCS
 if HAVE_XMLTO
 noinst_DATA = doc/fontlib.txt doc/fontlib.html $(srcdir)/doc/fontlib.css
 CLEANFILES = doc/fontlib.txt doc/fontlib.html doc/fontlib.pdf doc/fontlib.ps
@@ -76,4 +75,3 @@ doc/fontlib.pdf: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl
 doc/fontlib.ps: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl
 	$(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/fontlib.xsl -o doc ps $(srcdir)/doc/fontlib.xml
 endif HAVE_XMLTO
-endif MAKE_DEVEL_DOCS
diff --git a/configure.ac b/configure.ac
index 6e39c1d..097a7e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,13 +51,6 @@ dnl If the first PKG_CHECK_MODULES appears inside a conditional, pkg-config
 dnl must first be located explicitly.
 PKG_PROG_PKG_CONFIG
 
-# Option to enable support for building developer internals docs
-AC_ARG_ENABLE(devel-docs,
-	AS_HELP_STRING([--enable-devel-docs],
-	    [Build internals documentation for developers (default: enabled)]),
-	    [DEVEL_DOCS=$enableval], [DEVEL_DOCS=yes])
-AM_CONDITIONAL([MAKE_DEVEL_DOCS], [test "x$DEVEL_DOCS" = "xyes"])
-
 # Look for headers
 AC_CHECK_HEADERS([endian.h poll.h sys/poll.h])
 AC_CHECK_FUNCS([poll])
-- 
1.6.0.4

Initial post for review


More information about the xorg-devel mailing list