Created
July 5, 2012 04:35
-
-
Save brandt/3051415 to your computer and use it in GitHub Desktop.
gtk+-2.24.10: patch: remove doc compilation to avoid gtk-doc prereq
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git Makefile.am Makefile.am | |
index 8e3a2f1..fe3901b 100644 | |
--- Makefile.am | |
+++ Makefile.am | |
@@ -2,7 +2,7 @@ | |
include $(top_srcdir)/Makefile.decl | |
SRC_SUBDIRS = gdk gtk modules demos tests perf | |
-SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build | |
+SUBDIRS = po po-properties $(SRC_SUBDIRS) m4macros build | |
# require automake 1.4 | |
AUTOMAKE_OPTIONS = 1.7 | |
diff --git configure.in configure.in | |
index 24f1d32..010394c 100644 | |
--- configure.in | |
+++ configure.in | |
@@ -1583,39 +1583,6 @@ fi | |
GOBJECT_INTROSPECTION_CHECK([0.9.3]) | |
################################################## | |
-# Checks for gtk-doc and docbook-tools | |
-################################################## | |
- | |
-GTK_DOC_CHECK([1.11]) | |
- | |
-AC_CHECK_PROG(DB2HTML, db2html, true, false) | |
-AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML) | |
- | |
-AC_ARG_ENABLE(man, | |
- [AC_HELP_STRING([--enable-man], | |
- [regenerate man pages from Docbook [default=no]])],enable_man=yes, | |
- enable_man=no) | |
- | |
-if test "${enable_man}" != no; then | |
- dnl | |
- dnl Check for xsltproc | |
- dnl | |
- AC_PATH_PROG([XSLTPROC], [xsltproc]) | |
- if test -z "$XSLTPROC"; then | |
- enable_man=no | |
- fi | |
- | |
- 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) | |
- | |
- | |
-################################################## | |
# Output commands | |
################################################## | |
@@ -1717,16 +1684,6 @@ demos/Makefile | |
demos/gtk-demo/Makefile | |
demos/gtk-demo/geninclude.pl | |
tests/Makefile | |
-docs/Makefile | |
-docs/reference/Makefile | |
-docs/reference/gdk/Makefile | |
-docs/reference/gdk/version.xml | |
-docs/reference/gtk/Makefile | |
-docs/reference/gtk/version.xml | |
-docs/reference/libgail-util/Makefile | |
-docs/faq/Makefile | |
-docs/tools/Makefile | |
-docs/tutorial/Makefile | |
build/Makefile | |
build/win32/Makefile | |
build/win32/vs9/Makefile |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment