From f675be2622bad183871c73c75ce1212403cb06f5 Mon Sep 17 00:00:00 2001 From: Lee Date: Fri, 14 Dec 2018 23:12:07 -0500 Subject: [PATCH] Prefer OpenSP to SP If we're preferring openjade to jade it seems like we should also prefer OpenSP to SP ref: https://lists.privoxy.org/pipermail/privoxy-devel/2018-November/000293.html --- GNUmakefile.in | 3 ++- configure.in | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index fb37a05b..9c496f3b 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -135,6 +135,7 @@ W3M_DUMP_UTF8 = @W3M@ -I ISO-8859 -O UTF-8 -dump # docbook output is ISO-8859 (which is a superset of ascii) JADECAT = @JADECAT@ JADEBIN = @JADEBIN@ +NSGMLS = @NSGMLS@ DB = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldp.dsl\#html DB_TXT = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldp.dsl\#print # -d dsssl_spec @@ -526,7 +527,7 @@ dok-man: # target for man page generation! man: dok-release mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\ - nsgmls ../privoxy-man-page.sgml | sgmlspl ../../../utils/docbook2man/docbook2man-spec.pl &&\ + $(NSGMLS) ../privoxy-man-page.sgml | sgmlspl ../../../utils/docbook2man/docbook2man-spec.pl &&\ perl -pi.bak -e 's/ //; s/\[ /\[/g' $(MAN_PAGE) ;\ perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" $(MAN_PAGE); \ perl -pi.bak -e "s/ö/\\\\[:o]/g" $(MAN_PAGE); \ diff --git a/configure.in b/configure.in index 33241508..3dec6fef 100644 --- a/configure.in +++ b/configure.in @@ -349,10 +349,16 @@ if test $RPMBIN != false; then fi AC_SUBST(RPM_BASE) +dnl prefer openjade to jade dnl Check for jade, so we can build the documentation AC_CHECK_PROGS(JADEBIN,openjade jade,false) AC_SUBST(JADEBIN) +dnl Prefer OpenSP to SP +dnl ref: https://lists.privoxy.org/pipermail/privoxy-devel/2018-November/000293.html +AC_CHECK_PROGS(NSGMLS,onsgmls nsgmls,false) +AC_SUBST(NSGMLS) + dnl Check for man2html for docs. AC_CHECK_PROGS(MAN2HTML,man2html,false) AC_SUBST(MAN2HTML) -- 2.39.2