[pango/kill-dynamic-modules: 5/8] [modules] Kill pango-querymodules

[Khaled Hosny <khaledh src gnome org>]

commit c876e45dfbcf722edba190639a07969535c83895
Author: Khaled Hosny <khaledhosny eglug org>
Date:   Sat Jul 26 09:33:58 2014 +0200

    [modules] Kill pango-querymodules
    
    It serves no purpose now.

 configure.ac                |   31 +----
 docs/Makefile.am            |   23 +---
 docs/pango-docs.sgml        |    5 -
 docs/pango-querymodules.xml |  131 -----------------
 pango-zip.sh.in             |    1 -
 pango/Makefile.am           |   18 ---
 pango/querymodules.c        |  323 -------------------------------------------
 7 files changed, 4 insertions(+), 528 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 16b8db6..cf4ac8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -437,10 +437,7 @@ AM_CONDITIONAL(HAVE_CAIRO_QUARTZ, $have_cairo_quartz)
 
 
 #
-# We must have some backend defined, in order for the pango-querymodules
-# rule in pango/Makefile.am to work correctly. If you are up to writing
-# a new Pango backend outside of Pango, you are up to sending the necessary
-# patch to fix that rule. :-)
+# We must have some backend defined
 #
 if $have_freetype || `test "x$with_xft" = xyes && $have_xft` || $have_cairo || $have_win32 ; then : ; else
   AC_MSG_ERROR([*** Could not enable any backends.
@@ -539,32 +536,6 @@ fi
 
 GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
 
-AC_ARG_ENABLE(man,
-              AC_HELP_STRING([--enable-man],
-                             [regenerate man pages from Docbook @<:@default=no@:>@]),
-             enable_man=yes,
-              enable_man=no)
-
-if test "x$enable_man" != xno ; then
-  dnl
-  dnl Check for xsltproc
-  dnl
-  AC_PATH_PROG([XSLTPROC], [xsltproc])
-  if test -z "$XSLTPROC"; then
-    enable_man=no
-  fi
-fi
-
-if test "x$enable_man" != xno ; then
-  dnl check for DocBook DTD and stylesheets in the local catalog.
-  JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
-     [DocBook XML DTD V4.1.2],,enable_man=no)
-  JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
-     [DocBook XSL Stylesheets],,enable_man=no)
-fi
-
-AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
-
 AC_ARG_ENABLE(doc-cross-references,
               AC_HELP_STRING([--disable-doc-cross-references],
                              [cross reference glib and cairo symbols @<:@default=yes@:>@]),
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 89be228..1912413 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -85,8 +85,7 @@ GTKDOC_LIBS += $(GLIB_LIBS)
 # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
 content_files =                                \
        pango_markup.sgml               \
-       version.xml                     \
-       pango-querymodules.xml
+       version.xml
 
 # Images to copy into HTML directory
 HTML_IMAGES =                          \
@@ -116,29 +115,13 @@ BUILT_SOURCES = pango.types
 
 ########################################################################
 
-man_MANS = pango-querymodules.1 
-if ENABLE_MAN
-.xml.1:
-       @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-dist-local-check-mans-enabled:
-       @if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi
-else
-$(man_MANS):
-       @echo Man generation disabled.  Creating dummy $    Configure with --enable-man to enable it.
-       @echo Man generation disabled.  Remove this file, configure with --enable-man, and rebuild Pango > $@
-dist-local-check-mans-enabled:
-       @echo "*** --enable-man must be used in order to make dist"
-       @false
-endif
-
-MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)
+MAINTAINERCLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST +=                          \
        layout.fig                      \
        layout.eps                      \
        version.xml.in                  \
        check.docs                      \
-       pango.types                     \
-       $(man_MANS)
+       pango.types
 
 # force doc rebulid after configure
 dist-hook-local: dist-local-check-mans-enabled dist-local-check-no-cross-references all-local
diff --git a/docs/pango-docs.sgml b/docs/pango-docs.sgml
index 65514ab..c5e3bb8 100644
--- a/docs/pango-docs.sgml
+++ b/docs/pango-docs.sgml
@@ -50,11 +50,6 @@
     <xi:include href="xml/pango-version.xml"/>
     </chapter>
 
-  <chapter id="tools">
-    <title>Pango Tools</title>
-    <xi:include href="pango-querymodules.xml"/>
-  </chapter>
-
   <chapter id="pango-hierarchy">
     <title>Object Hierarchy</title>
     <xi:include href="xml/tree_index.sgml"/>
diff --git a/pango-zip.sh.in b/pango-zip.sh.in
index d3d965b..d1ac2f1 100755
--- a/pango-zip.sh.in
+++ b/pango-zip.sh.in
@@ -14,7 +14,6 @@ cp -p @abs_srcdir@/COPYING share/doc/pango-dev- PANGO_VERSION@
 
 rm $ZIP
 zip $ZIP -@ <<EOF
-bin/pango-querymodules.exe
 bin/libpango- PANGO_API_VERSION@- PANGO_CURRENT_MINUS_AGE@.dll
 bin/libpangoft2- PANGO_API_VERSION@- PANGO_CURRENT_MINUS_AGE@.dll
 bin/libpangowin32- PANGO_API_VERSION@- PANGO_CURRENT_MINUS_AGE@.dll
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 378500f..61b9150 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -424,24 +424,6 @@ typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 endif # HAVE_INTROSPECTION
 
-# ------------------- pango-querymodules -------------------
-
-bin_PROGRAMS = pango-querymodules
-
-pango_querymodules_SOURCES = \
-       querymodules.c
-
-pango_querymodules_LDADD =
-if HAVE_XFT
-pango_querymodules_LDADD += libpangoxft-$(PANGO_API_VERSION).la
-endif
-if HAVE_FREETYPE
-pango_querymodules_LDADD += libpangoft2-$(PANGO_API_VERSION).la
-endif
-if HAVE_WIN32
-pango_querymodules_LDADD += libpangowin32-$(PANGO_API_VERSION).la
-endif
-pango_querymodules_LDADD += libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS)
 
 EXTRA_DIST =                                   \
        pango-enum-types.h                      \