summaryrefslogtreecommitdiff
path: root/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2011-01-07 00:32:11 +0100
committerMaciej Mrozowski <reavertm@gentoo.org>2011-01-07 00:32:11 +0100
commit11ad60dbb8676cfce8e1145b4be31053eb940f8a (patch)
treea8023e1fe049faa603a8a26b3fcb6565b38d2fb0 /dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
parent02e912cd81275206f75b83c0de9b7d52ed0bc5ec (diff)
parent63fc8b1181aaabfe6dfbad592a758574819f17e9 (diff)
downloadkde-11ad60dbb8676cfce8e1145b4be31053eb940f8a.tar.gz
kde-11ad60dbb8676cfce8e1145b4be31053eb940f8a.tar.bz2
kde-11ad60dbb8676cfce8e1145b4be31053eb940f8a.zip
Merge branch 'master' into kde-git
Conflicts: kde-base/pykde4/Manifest kde-base/pykde4/pykde4-9999.ebuild
Diffstat (limited to 'dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch')
-rw-r--r--dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch5
1 files changed, 4 insertions, 1 deletions
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch b/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
index c18138afb99..b4f6d6f9dbb 100644
--- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
+++ b/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
@@ -1,6 +1,6 @@
--- configure.ac.orig 2010-09-20 23:15:36.692289201 +0200
+++ configure.ac 2010-09-20 23:26:30.159014141 +0200
-@@ -171,8 +171,15 @@
+@@ -171,8 +171,18 @@
# GTK Doc
###########################
@@ -12,6 +12,9 @@
GTK_DOC_CHECK([1.4])
+if test "x$enable_doc" != "xno" ; then
GNOME_DOC_INIT
++else
++# The initialisation is still needed for certain conditionals to be defined, just make it not output any error
++GNOME_DOC_INIT(,,[:])
+fi
GNOME_COMPILE_WARNINGS