aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README6
-rw-r--r--configure.ac7
2 files changed, 8 insertions, 5 deletions
diff --git a/README b/README
index dd704724f..65b87fc53 100644
--- a/README
+++ b/README
@@ -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
144Recommended autotools for compiling the Git version are: 146Recommended 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.
442AC_MSG_CHECKING(for texi2mdoc) 443AC_MSG_CHECKING(for texi2mdoc binary)
443AC_CHECK_PROGS(TEXI2MDOC_BINARY, [texi2mdoc], false) 444AC_CHECK_PROGS(TEXI2MDOC_BINARY, [texi2mdoc], false)
444AM_CONDITIONAL(HAVE_TEXI2MDOC, test x$TEXI2MDOC_BINARY != xfalse) 445AM_CONDITIONAL(HAVE_TEXI2MDOC, test x$TEXI2MDOC_BINARY != xfalse)
445 446
446# test for mandoc 447# test for mandoc
447AC_MSG_CHECKING(for mandoc) 448AC_MSG_CHECKING(for mandoc binary)
448AC_CHECK_PROGS(MANDOC_BINARY, [mandoc], false) 449AC_CHECK_PROGS(MANDOC_BINARY, [mandoc], false)
449AM_CONDITIONAL(HAVE_MANDOC, test x$MANDOC_BINARY != xfalse) 450AM_CONDITIONAL(HAVE_MANDOC, test x$MANDOC_BINARY != xfalse)
450 451