build: merge branch 'th/build-without-gtk-doc'

https://bugzilla.gnome.org/show_bug.cgi?id=775003

Makefile.am

@@ -126,7 +126,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-ifnet
 
 dist-configure-check:
-	@echo "*** 'make dist' requires '--enable-gtk-doc --with-introspection --with-libnm-glib'. ***"
+	@echo "*** 'make dist' requires '--enable-gtk-doc --enable-introspection --with-libnm-glib'. ***"
 	@false
 if !BUILD_SETTING_DOCS
 dist_configure_check += dist-configure-check
@@ -842,7 +842,7 @@ libnm/libnm.typelib: libnm/libnm.gir
 INTROSPECTION_GIRS += libnm/NM-1.0.gir
 endif
 
-if BUILD_SETTING_DOCS
+if HAVE_INTROSPECTION
 
 libnm_noinst_data = \
 	libnm/nm-property-docs.xml \
@@ -3002,13 +3002,13 @@ endif
 
 
 clients_cli_settings_doc_c = clients/cli/settings-docs.c
-if BUILD_SETTING_DOCS
+if HAVE_INTROSPECTION
 $(clients_cli_settings_doc_c): clients/cli/settings-docs.xsl libnm/nm-property-docs.xml
-	$(AM_V_GEN) xsltproc --output $@ $^
+	$(AM_V_GEN) $(XSLTPROC) --output $@ $^
 DISTCLEANFILES += $(clients_cli_settings_doc_c)
 else
 $(clients_cli_settings_doc_c):
-	@echo "to generate $(clients_cli_settings_doc_c), configure with --enable-gtk-doc"
+	@echo "to generate $(clients_cli_settings_doc_c), configure with --enable-introspection"
 	@echo "alternatively, build --without-nmcli"
 	@false
 endif
@@ -3895,10 +3895,10 @@ xsltproc_flags = \
 	--stringparam man.authors.section.enabled 0 \
 	--stringparam man.copyright.section.enabled 0
 
-if ENABLE_GTK_DOC
+if HAVE_INTROSPECTION
 
 man/%.1 man/%.5 man/%.7 man/%.8: man/%.xml man/common.ent
-	$(AM_V_GEN) xsltproc --output $@ $(xsltproc_flags) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+	$(AM_V_GEN) $(XSLTPROC) --output $@ $(xsltproc_flags) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 endif
 
@@ -3907,10 +3907,10 @@ man_nm_settings_xml = \
 	man/nm-settings-keyfile.xml \
 	man/nm-settings-ifcfg-rh.xml
 
-if BUILD_SETTING_DOCS
+if HAVE_INTROSPECTION
 
 man/nm-setting%.xml: man/nm-setting%.xsl libnm/nm-setting%-docs.xml
-	$(AM_V_GEN) xsltproc --output $@ $(xsltproc_flags) $^
+	$(AM_V_GEN) $(XSLTPROC) --output $@ $(xsltproc_flags) $^
 
 CLEANFILES += $(man_nm_settings_xml)
 
@@ -3963,7 +3963,7 @@ uninstall-hook-man:
 
 uninstall_hook += uninstall-hook-man
 
-if ENABLE_GTK_DOC
+if HAVE_INTROSPECTION
 install_manpages = true
 man_MANS += $(man_pages)
 CLEANFILES += $(man_pages)

autogen.sh

@@ -28,5 +28,5 @@ AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
 
 cd $olddir
 if test -z "$NOCONFIGURE"; then
-	exec $srcdir/configure --enable-maintainer-mode --enable-more-warnings=error --enable-gtk-doc --with-introspection "$@"
+	exec $srcdir/configure --enable-maintainer-mode --enable-more-warnings=error --enable-gtk-doc --enable-introspection "$@"
 fi

configure.ac

@@ -1101,23 +1101,26 @@ fi
 AM_CONDITIONAL(INSTALL_PREGEN_MANPAGES, test "x${install_pregen_manpages}" = "xyes")
 
 # check if we can build setting property documentation
-if test -n "$INTROSPECTION_MAKEFILE" -a "$enable_gtk_doc" = "yes"; then
+build_setting_docs=no
+if test -n "$INTROSPECTION_MAKEFILE"; then
     # If g-i is installed we know we have python, but we might not have pygobject
     if ! python -c 'from gi.repository import GObject' >& /dev/null; then
-        AC_MSG_ERROR(["--enable-gtk-doc --with-introspection" aims to build the settings documentation. This requires GObject introspection for python (pygobject)])
+        AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)])
     fi
 
-    # gtk-doc depends on perl, but we can check for it anyway
     AC_PATH_PROG(PERL, perl, no)
+    AC_PATH_PROG(XSLTPROC, xsltproc, no)
 
-    build_setting_docs=yes
-else
-    build_setting_docs=no
-fi
-
-if test -n "$INTROSPECTION_MAKEFILE"; then
     have_introspection=yes
+    if test "$enable_gtk_doc" = "yes"; then
+        build_setting_docs=yes
+    fi
 else
+    if test "$enable_gtk_doc" = "yes"; then
+        # large parts of the documentation require introspection/pygobject to extract
+        # the documentation out of the source files. You cannot enable gtk-doc without alone.
+        AC_MSG_ERROR(["--with-gtk-doc requires --enable-introspection"])
+    fi
     have_introspection=no
 fi
 

contrib/fedora/rpm/build_clean.sh

@@ -110,7 +110,7 @@ if [[ $IGNORE_DIRTY != 1 ]]; then
 fi
 
 if [[ $NO_DIST != 1 ]]; then
-    ./autogen.sh --enable-gtk-doc --with-introspection --with-libnm-glib || die "Error autogen.sh"
+    ./autogen.sh --enable-gtk-doc --enable-introspection --with-libnm-glib || die "Error autogen.sh"
     if [[ $QUICK == 1 ]]; then
         make dist -j 7 || die "Error make dist"
     else

docs/api/Makefile.am

@@ -101,6 +101,4 @@ CLEANFILES += html/* tmpl/* xml/* \
 	NetworkManager-sections.txt \
 	NetworkManager-overrides.txt
 
-if BUILD_SETTING_DOCS
 CLEANFILES += settings-spec.xml
-endif