blob: 446637b276815648030c8ef4c65efb528dc81402 [file] [log] [blame]
Andrew Geissler82c905d2020-04-13 13:39:40 -05001From 9eab96351a726e9ce6a15d158f743e35d73a8900 Mon Sep 17 00:00:00 2001
Brad Bishop19323692019-04-05 15:28:33 -04002From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Thu, 22 Mar 2018 11:08:30 +0100
4Subject: [PATCH] Do not create settings settings/property documentation
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
Andrew Geissler82c905d2020-04-13 13:39:40 -05009From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
10MIME-Version: 1.0
11Content-Type: text/plain; charset=UTF-8
12Content-Transfer-Encoding: 8bit
13
Brad Bishop19323692019-04-05 15:28:33 -040014It was tried to get this work but gi / GirRepository could not be found by
15python. Anyway it is not necessary for us to have the settings/property docs.
16
17Upstream-Status: Inappropriate [OE specific]
18
19Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com>
Andrew Geissler82c905d2020-04-13 13:39:40 -050020
Brad Bishop19323692019-04-05 15:28:33 -040021---
22 Makefile.am | 11 -----------
23 configure.ac | 5 -----
24 2 files changed, 16 deletions(-)
25
26diff --git a/Makefile.am b/Makefile.am
Andrew Geissler82c905d2020-04-13 13:39:40 -050027index d5cbcf5..2a1819a 100644
Brad Bishop19323692019-04-05 15:28:33 -040028--- a/Makefile.am
29+++ b/Makefile.am
Andrew Geissler82c905d2020-04-13 13:39:40 -050030@@ -1473,9 +1473,7 @@ libnm/libnm.typelib: libnm/libnm.gir
31 INTROSPECTION_GIRS += libnm/NM-1.0.gir
Brad Bishop19323692019-04-05 15:28:33 -040032
33 libnm_noinst_data = \
34- libnm/nm-property-docs.xml \
35 libnm/nm-settings-docs-overrides.xml \
36- libnm/nm-settings-docs.xml \
37 libnm/nm-settings-keyfile-docs.xml \
38 libnm/nm-settings-ifcfg-rh-docs.xml
39
Andrew Geissler82c905d2020-04-13 13:39:40 -050040@@ -4236,18 +4234,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
Brad Bishop19323692019-04-05 15:28:33 -040041 $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
42
43 clients_common_settings_doc_h = clients/common/settings-docs.h
44-if HAVE_INTROSPECTION
45-$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp
46- $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
47-DISTCLEANFILES += $(clients_common_settings_doc_h)
48-check-local-settings-docs: $(clients_common_settings_doc_h)
49- $(srcdir)/tools/check-settings-docs.sh "$(srcdir)" "$(builddir)" "$(clients_common_settings_doc_h)"
50-check_local += check-local-settings-docs
51-else
52 $(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp
53 $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)"
54 check-local-settings-docs:
55-endif
56 EXTRA_DIST += \
57 $(clients_common_settings_doc_h) \
58 $(clients_common_settings_doc_h).in
59diff --git a/configure.ac b/configure.ac
Andrew Geissler82c905d2020-04-13 13:39:40 -050060index ad4b0fc..0092092 100644
Brad Bishop19323692019-04-05 15:28:33 -040061--- a/configure.ac
62+++ b/configure.ac
Andrew Geissler82c905d2020-04-13 13:39:40 -050063@@ -1201,11 +1201,6 @@ GTK_DOC_CHECK(1.0)
Brad Bishop19323692019-04-05 15:28:33 -040064 # check if we can build setting property documentation
65 build_docs=no
66 if test -n "$INTROSPECTION_MAKEFILE"; then
67- # If g-i is installed we know we have python, but we might not have pygobject
68- if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then
69- AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)])
70- fi
71-
72 AC_PATH_PROG(PERL, perl)
73 if test -z "$PERL"; then
74 AC_MSG_ERROR([--enable-introspection requires perl])