diff options
| author | Erlang/OTP <[email protected]> | 2010-04-08 08:32:56 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-04-08 08:32:56 +0000 |
| commit | 6ba7c11891441a0a67d62d4ea278b101d53dbdbf (patch) | |
| tree | 0c0d9d7ac272637ad4b9e8df9d704e037c04be7b /erts | |
| parent | 2e4e428c1f773ed63102ea5628c22e5bf32b8082 (diff) | |
| parent | bdb41b943e42b4a550dbf4db6c9a2c1d4d242b43 (diff) | |
| download | otp-6ba7c11891441a0a67d62d4ea278b101d53dbdbf.tar.gz otp-6ba7c11891441a0a67d62d4ea278b101d53dbdbf.tar.bz2 otp-6ba7c11891441a0a67d62d4ea278b101d53dbdbf.zip | |
Merge branch 'ta/doc-fakefop' into dev
* ta/doc-fakefop:
Build placeholder PDF files if FOP is not found
OTP-8559 ta/doc-fakefop
If the 'fop' program (needed for building PDF files) cannot not be found,
it is now possible to build the HTML and man pages anyway (there will also
be dummy PDF files with no real content created).
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/configure.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/erts/configure.in b/erts/configure.in index 6278af3a2e..e5202b75cb 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -821,13 +821,14 @@ fi AC_CHECK_PROGS(XSLTPROC, xsltproc) if test -z "$XSLTPROC"; then echo "xsltproc" >> doc/CONF_INFO - AC_MSG_WARN([No 'xsltproc' command found: the documentation can not be built]) + AC_MSG_WARN([No 'xsltproc' command found: the documentation cannot be built]) fi AC_CHECK_PROGS(FOP, fop) if test -z "$FOP"; then + FOP="$ERL_TOP/make/fakefop" echo "fop" >> doc/CONF_INFO - AC_MSG_WARN([No 'fop' command found: the documentation can not be built]) + AC_MSG_WARN([No 'fop' command found: going to generate placeholder PDF files]) fi dnl |