1*4882a593SmuzhiyunFrom 731c8d7e1f9edb527785d61f74031a5e5846554b Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: James Hilliard <james.hilliard1@gmail.com> 3*4882a593SmuzhiyunDate: Sun, 25 Jul 2021 16:30:59 -0600 4*4882a593SmuzhiyunSubject: [PATCH] Add option to disable xmlto manual generation. 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSigned-off-by: James Hilliard <james.hilliard1@gmail.com> 7*4882a593Smuzhiyun[james.hilliard1@gmail.com: backport from upstream commit 8*4882a593Smuzhiyun95e0b461f5a46c74b00287aca65732ea2fc9d69b] 9*4882a593Smuzhiyun--- 10*4882a593Smuzhiyun Makefile.am | 7 ++++++- 11*4882a593Smuzhiyun configure.ac | 5 +++++ 12*4882a593Smuzhiyun 2 files changed, 11 insertions(+), 1 deletion(-) 13*4882a593Smuzhiyun 14*4882a593Smuzhiyundiff --git a/Makefile.am b/Makefile.am 15*4882a593Smuzhiyunindex 843ba30d..7facab94 100644 16*4882a593Smuzhiyun--- a/Makefile.am 17*4882a593Smuzhiyun+++ b/Makefile.am 18*4882a593Smuzhiyun@@ -209,9 +209,11 @@ else 19*4882a593Smuzhiyun systemd_CLEANFILES= 20*4882a593Smuzhiyun endif 21*4882a593Smuzhiyun 22*4882a593Smuzhiyun+if XMLTO 23*4882a593Smuzhiyun man_MANS= \ 24*4882a593Smuzhiyun man/system-config-printer.1 \ 25*4882a593Smuzhiyun man/system-config-printer-applet.1 26*4882a593Smuzhiyun+endif 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun dbus_DATA = \ 29*4882a593Smuzhiyun dbus/com.redhat.NewPrinterNotification.conf \ 30*4882a593Smuzhiyun@@ -274,7 +276,6 @@ EXTRA_DIST=\ 31*4882a593Smuzhiyun $(bin_SCRIPTS) \ 32*4882a593Smuzhiyun setup.py \ 33*4882a593Smuzhiyun $(EXPORT_MODULES) \ 34*4882a593Smuzhiyun- man/system-config-printer.xml \ 35*4882a593Smuzhiyun $(dbus_DATA) \ 36*4882a593Smuzhiyun $(dbusinterfaces_DATA) \ 37*4882a593Smuzhiyun $(dbusservices_DATA) \ 38*4882a593Smuzhiyun@@ -297,12 +298,16 @@ EXTRA_DIST=\ 39*4882a593Smuzhiyun test_PhysicalDevice.py \ 40*4882a593Smuzhiyun $(appdata_in_files) 41*4882a593Smuzhiyun 42*4882a593Smuzhiyun+if XMLTO 43*4882a593Smuzhiyun+EXTRA_DIST+=man/system-config-printer.xml 44*4882a593Smuzhiyun+ 45*4882a593Smuzhiyun # The man pages are generated from DocBook XML. 46*4882a593Smuzhiyun .stamp-man-pages-built: $(top_srcdir)/man/system-config-printer.xml 47*4882a593Smuzhiyun xmlto man -o man $< 48*4882a593Smuzhiyun touch .stamp-man-pages-built 49*4882a593Smuzhiyun 50*4882a593Smuzhiyun $(man_MANS): .stamp-man-pages-built 51*4882a593Smuzhiyun+endif 52*4882a593Smuzhiyun 53*4882a593Smuzhiyun html: $(EXPORT_MODULES) $(EXPORT_MODULES_GEN) 54*4882a593Smuzhiyun rm -rf html 55*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 56*4882a593Smuzhiyunindex 811f897a..a2a66889 100644 57*4882a593Smuzhiyun--- a/configure.ac 58*4882a593Smuzhiyun+++ b/configure.ac 59*4882a593Smuzhiyun@@ -75,6 +75,11 @@ if test "x$with_systemdsystemunitdir" != xno; then 60*4882a593Smuzhiyun fi 61*4882a593Smuzhiyun AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) 62*4882a593Smuzhiyun 63*4882a593Smuzhiyun+AC_ARG_WITH(xmlto, 64*4882a593Smuzhiyun+ [AC_HELP_STRING([--with-xmlto], 65*4882a593Smuzhiyun+ [Enable xmlto manual generation @<:@default=yes@:>@])]) 66*4882a593Smuzhiyun+AM_CONDITIONAL([XMLTO], [test x$with_xmlto != xno]) 67*4882a593Smuzhiyun+ 68*4882a593Smuzhiyun ALL_LINGUAS="ar as ast bg bn_IN bn br bs ca cs cy da de el en_GB es et fa fi fr fur gu he hi hr hu id is it ja kn ko lt lv mai ml mr ms nb nds nl nn oc or pa pl pt_BR pt ro ru si sk sl sr@latin sr sv ta te th tr uk vi zh_CN zh_TW" 69*4882a593Smuzhiyun AC_CONFIG_FILES([ 70*4882a593Smuzhiyun Makefile 71*4882a593Smuzhiyun-- 72*4882a593Smuzhiyun2.25.1 73*4882a593Smuzhiyun 74