diff options
author | ng0 <ng0@n0.is> | 2019-11-17 00:38:08 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-11-17 00:38:08 +0000 |
commit | 5cb82d92ddbec05b22e630c4082456ad8d2b34be (patch) | |
tree | 52ce46fce062f69b4ba27e76122656c8729716d9 | |
parent | 96031dd3015c8e911423e83af51d3566f4014b11 (diff) | |
download | gnunet-5cb82d92ddbec05b22e630c4082456ad8d2b34be.tar.gz gnunet-5cb82d92ddbec05b22e630c4082456ad8d2b34be.zip |
make message about texi2mdoc more clear.
-rw-r--r-- | README | 6 | ||||
-rw-r--r-- | configure.ac | 7 |
2 files changed, 8 insertions, 5 deletions
@@ -139,7 +139,9 @@ These are the optional dependencies: | |||
139 | - miniupnpc | 139 | - miniupnpc |
140 | - perl5 (for some utilities) | 140 | - perl5 (for some utilities) |
141 | - TeX Live >= 2012 (for gnunet-bcd[*]) | 141 | - TeX Live >= 2012 (for gnunet-bcd[*]) |
142 | - texi2mdoc (for automatic mdoc generation [*2]) | 142 | - texi2mdoc (for automatic mdoc generation [*2], not |
143 | the texi2mdoc script distributed with | ||
144 | autogen but the texi2mdoc C application) | ||
143 | 145 | ||
144 | Recommended autotools for compiling the Git version are: | 146 | Recommended autotools for compiling the Git version are: |
145 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 147 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
@@ -161,7 +163,7 @@ Recommended autotools for compiling the Git version are: | |||
161 | documentation (experimental stages in gnunet). | 163 | documentation (experimental stages in gnunet). |
162 | If this proves to be reliable, we will | 164 | If this proves to be reliable, we will |
163 | include the mdocml output in the release tarballs. | 165 | include the mdocml output in the release tarballs. |
164 | Contrary to the name, texi2mdoc does not require texinfo, | 166 | Contrary to the name, texi2mdoc does not require Texinfo, |
165 | It is a standalone ISO C utility. | 167 | It is a standalone ISO C utility. |
166 | 168 | ||
167 | [*3] GNU make introduced the != operator in version 4.0. | 169 | [*3] GNU make introduced the != operator in version 4.0. |
diff --git a/configure.ac b/configure.ac index 6f3b5f1bc..9af70d25b 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -437,14 +437,15 @@ AS_IF([test "x$texi2mdoc_generation" = "xyes"], | |||
437 | [0], | 437 | [0], |
438 | [Not building section 7 mdoc output])]) | 438 | [Not building section 7 mdoc output])]) |
439 | 439 | ||
440 | # test for texi2mdoc | 440 | # test for texi2mdoc (the binary, not the script distributed |
441 | # with autogen) | ||
441 | # TODO: refactor this and the check above. | 442 | # TODO: refactor this and the check above. |
442 | AC_MSG_CHECKING(for texi2mdoc) | 443 | AC_MSG_CHECKING(for texi2mdoc binary) |
443 | AC_CHECK_PROGS(TEXI2MDOC_BINARY, [texi2mdoc], false) | 444 | AC_CHECK_PROGS(TEXI2MDOC_BINARY, [texi2mdoc], false) |
444 | AM_CONDITIONAL(HAVE_TEXI2MDOC, test x$TEXI2MDOC_BINARY != xfalse) | 445 | AM_CONDITIONAL(HAVE_TEXI2MDOC, test x$TEXI2MDOC_BINARY != xfalse) |
445 | 446 | ||
446 | # test for mandoc | 447 | # test for mandoc |
447 | AC_MSG_CHECKING(for mandoc) | 448 | AC_MSG_CHECKING(for mandoc binary) |
448 | AC_CHECK_PROGS(MANDOC_BINARY, [mandoc], false) | 449 | AC_CHECK_PROGS(MANDOC_BINARY, [mandoc], false) |
449 | AM_CONDITIONAL(HAVE_MANDOC, test x$MANDOC_BINARY != xfalse) | 450 | AM_CONDITIONAL(HAVE_MANDOC, test x$MANDOC_BINARY != xfalse) |
450 | 451 | ||