Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc2a0143

Browse files
committed
Run missing documentation tools through "missing"
Instead of just erroring out when a tool is missing, wrap the call withthe "missing" script that we are already using for bison, flex, andperl, so that the users get a useful error message.
1 parent839acf9 commitc2a0143

File tree

4 files changed

+53
-6
lines changed

4 files changed

+53
-6
lines changed

‎configure‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,7 @@ vpath_build
630630
PROVE
631631
OSX
632632
XSLTPROC
633+
DBTOEPUB
633634
COLLATEINDEX
634635
DOCBOOKSTYLE
635636
have_docbook
@@ -14406,6 +14407,48 @@ fi
1440614407

1440714408

1440814409
fi
14410+
forac_progin dbtoepub
14411+
do
14412+
# Extract the first word of "$ac_prog", so it can be a program name with args.
14413+
set dummy$ac_prog; ac_word=$2
14414+
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for$ac_word">&5
14415+
$as_echo_n"checking for$ac_word...">&6; }
14416+
if${ac_cv_prog_DBTOEPUB+:}false;then:
14417+
$as_echo_n"(cached)">&6
14418+
else
14419+
iftest -n"$DBTOEPUB";then
14420+
ac_cv_prog_DBTOEPUB="$DBTOEPUB"# Let the user override the test.
14421+
else
14422+
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
14423+
foras_dirin$PATH
14424+
do
14425+
IFS=$as_save_IFS
14426+
test -z"$as_dir"&& as_dir=.
14427+
forac_exec_extin''$ac_executable_extensions;do
14428+
if as_fn_executable_p"$as_dir/$ac_word$ac_exec_ext";then
14429+
ac_cv_prog_DBTOEPUB="$ac_prog"
14430+
$as_echo"$as_me:${as_lineno-$LINENO}: found$as_dir/$ac_word$ac_exec_ext">&5
14431+
break 2
14432+
fi
14433+
done
14434+
done
14435+
IFS=$as_save_IFS
14436+
14437+
fi
14438+
fi
14439+
DBTOEPUB=$ac_cv_prog_DBTOEPUB
14440+
iftest -n"$DBTOEPUB";then
14441+
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$DBTOEPUB">&5
14442+
$as_echo"$DBTOEPUB">&6; }
14443+
else
14444+
{$as_echo"$as_me:${as_lineno-$LINENO}: result: no">&5
14445+
$as_echo"no">&6; }
14446+
fi
14447+
14448+
14449+
test -n"$DBTOEPUB"&&break
14450+
done
14451+
1440914452
forac_progin xsltproc
1441014453
do
1441114454
# Extract the first word of "$ac_prog", so it can be a program name with args.

‎configure.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1858,6 +1858,7 @@ PGAC_PROG_JADE
18581858
PGAC_CHECK_DOCBOOK(4.2)
18591859
PGAC_PATH_DOCBOOK_STYLESHEETS
18601860
PGAC_PATH_COLLATEINDEX
1861+
AC_CHECK_PROGS(DBTOEPUB, dbtoepub)
18611862
AC_CHECK_PROGS(XSLTPROC, xsltproc)
18621863
AC_CHECK_PROGS(OSX, [osx sgml2xml sx])
18631864

‎doc/src/sgml/Makefile‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,29 @@ all: html man
2727
distprep: html distprep-man
2828

2929

30+
ifndefDBTOEPUB
31+
DBTOEPUB =$(missing) dbtoepub
32+
endif
33+
3034
ifndefJADE
31-
JADE = jade
35+
JADE =$(missing)jade
3236
endif
3337
SGMLINCLUDE = -D . -D$(srcdir)
3438

3539
ifndefNSGMLS
36-
NSGMLS = nsgmls
40+
NSGMLS =$(missing)nsgmls
3741
endif
3842

3943
ifndefOSX
40-
OSX = osx
44+
OSX =$(missing)osx
4145
endif
4246

4347
ifndefXSLTPROC
44-
XSLTPROC = xsltproc
48+
XSLTPROC =$(missing)xsltproc
4549
endif
4650

4751
overrideXSLTPROCFLAGS += --stringparam pg.version '$(VERSION)'
4852

49-
DBTOEPUB ?= dbtoepub
50-
5153

5254
GENERATED_SGML = bookindex.sgml version.sgml\
5355
features-supported.sgml features-unsupported.sgml errcodes-table.sgml

‎src/Makefile.global.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@ STRIP_SHARED_LIB = @STRIP_SHARED_LIB@
348348

349349
have_docbook= @have_docbook@
350350
COLLATEINDEX= @COLLATEINDEX@
351+
DBTOEPUB= @DBTOEPUB@
351352
DOCBOOKSTYLE= @DOCBOOKSTYLE@
352353
JADE= @JADE@
353354
NSGMLS= @NSGMLS@

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp