diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 208c7772c..e37df28dd 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -244,7 +244,6 @@ else | |||
244 | AC_MSG_WARN([warning: 'ifconfig' not found.]) | 244 | AC_MSG_WARN([warning: 'ifconfig' not found.]) |
245 | fi | 245 | fi |
246 | 246 | ||
247 | |||
248 | # miniupnpc / upnpc binary is a soft runtime requirement | 247 | # miniupnpc / upnpc binary is a soft runtime requirement |
249 | AC_PATH_TARGET_TOOL(VAR_UPNPC_BINARY, upnpc, false) | 248 | AC_PATH_TARGET_TOOL(VAR_UPNPC_BINARY, upnpc, false) |
250 | 249 | ||
@@ -301,10 +300,32 @@ then | |||
301 | fi | 300 | fi |
302 | AC_DEFINE_UNQUOTED([NEED_LIBGCRYPT_VERSION], "$NEED_LIBGCRYPT_VERSION", [required libgcrypt version]) | 301 | AC_DEFINE_UNQUOTED([NEED_LIBGCRYPT_VERSION], "$NEED_LIBGCRYPT_VERSION", [required libgcrypt version]) |
303 | 302 | ||
304 | # TODO: add check for VERSION | 303 | # Check for makeinfo version >= 5, required for building documentation. |
304 | # TODO: invalid version should imply --disable-documentation (and | ||
305 | # maybe --with-section7). | ||
305 | # TODO: add check for alternatives | 306 | # TODO: add check for alternatives |
306 | # TODO: add switch to skip documentation building | 307 | # TODO: add switch to skip documentation building |
307 | AM_MISSING_PROG([MAKEINFO], [makeinfo]) | 308 | have_makeinfo_5=false |
309 | AC_PROG_SED | ||
310 | AC_CHECK_PROG([MAKEINFO_FOUND], [makeinfo], [yes]) | ||
311 | if test x"${MAKEINFO_FOUND}" = xyes | ||
312 | then | ||
313 | MAKEINFO_VERSION_REQ=5 | ||
314 | AC_MSG_CHECKING([for makeinfo version >= $MAKEINFO_VERSION_REQ]) | ||
315 | # XXX: is this sed invocation portable? | ||
316 | MAKEINFO_VERSION=`makeinfo --version | sed -ne 's/^\(makeinfo\|texi2any\) .* \([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*.*$/\2/p'` | ||
317 | if test x$MAKEINFO_VERSION = x -o 0$MAKEINFO_VERSION -lt $MAKEINFO_VERSION_REQ | ||
318 | then | ||
319 | AC_MSG_RESULT([no]) | ||
320 | AC_MSG_FAILURE([Program 'makeinfo' version >= $MAKEINFO_VERSION_REQ is required.]) | ||
321 | else | ||
322 | AC_MSG_RESULT([yes]) | ||
323 | have_makeinfo_5=true | ||
324 | fi | ||
325 | else | ||
326 | AC_MSG_FAILURE([Missing program 'makeinfo', Documentation will not be built. Please install it if you want 'info' documentation or refer to online resources at 'https://docs.gnunet.org'.]) | ||
327 | fi | ||
328 | AM_CONDITIONAL([HAVE_MAKEINFO_5], [test x$have_makeinfo_5 = xtrue]) | ||
308 | 329 | ||
309 | # Adam shostack suggests the following for Windows: | 330 | # Adam shostack suggests the following for Windows: |
310 | # -D_FORTIFY_SOURCE=2 -fstack-protector-all | 331 | # -D_FORTIFY_SOURCE=2 -fstack-protector-all |