diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.ac | 21 | ||||
-rw-r--r-- | doc/handbook/Makefile.am | 7 | ||||
-rw-r--r-- | doc/tutorial/Makefile.am | 15 |
4 files changed, 47 insertions, 2 deletions
@@ -1,3 +1,9 @@ | |||
1 | Sun Jul 28 00:00:00 2019 +0000 | ||
2 | Adding --enable-texinfo4 configure switch, defaulting to off. | ||
3 | This allows distributors to override the texinfo 5.x and later | ||
4 | commandline options we use, and allows us on the serverside to | ||
5 | build html with newer output options. -ng0 | ||
6 | |||
1 | Wed 24 Jul 2019 05:43:43 PM CEST | 7 | Wed 24 Jul 2019 05:43:43 PM CEST |
2 | Releasing GNUnet 0.11.6. -CG | 8 | Releasing GNUnet 0.11.6. -CG |
3 | 9 | ||
diff --git a/configure.ac b/configure.ac index 0b434b1aa..356f6d0d2 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -455,6 +455,27 @@ AS_IF([test "x$include_manpages" = "xyes"], | |||
455 | AC_DEFINE([INCLUDE_MANPAGES],[0],[Not including the man pages in the build and installation]) | 455 | AC_DEFINE([INCLUDE_MANPAGES],[0],[Not including the man pages in the build and installation]) |
456 | ]) | 456 | ]) |
457 | 457 | ||
458 | # Do we have texinfo4? If yes, it is used to set texinfo4 specific switches | ||
459 | # (not syntax!) to the commandline tools which generate the html. If not, | ||
460 | # texinfo5 switches are used. This comes with no version checks, is | ||
461 | # enabled only at distributors action (ie defaults to "no"). | ||
462 | # Mantis #3914 for more details (https://bugs.gnunet.org/view.php?id=3914) | ||
463 | AC_MSG_CHECKING(whether to enable texinfo4 switches) | ||
464 | AC_ARG_ENABLE([texinfo4], | ||
465 | [AS_HELP_STRING([--enable-texinfo4], [Use texinfo version 4 specific switches])], | ||
466 | [activate_texinfo4=${enableval}], | ||
467 | [activate_texinfo4=no]) | ||
468 | AC_MSG_RESULT($activate_texinfo4) | ||
469 | AS_IF([test "x$activate_texinfo4" = "xyes"], | ||
470 | [ | ||
471 | AM_CONDITIONAL([ACTIVATE_TEXINFO4],true) | ||
472 | AC_DEFINE([ACTIVATE_TEXINFO4],[1],[Using texinfo version 4 specific switches]) | ||
473 | ],[ | ||
474 | AM_CONDITIONAL([ACTIVATE_TEXINFO4],false) | ||
475 | AC_DEFINE([INCLUDE_MANPAGES],[0],[Using texinfo version 5 or later switches]) | ||
476 | ]) | ||
477 | |||
478 | |||
458 | # Adam shostack suggests the following for Windows: | 479 | # Adam shostack suggests the following for Windows: |
459 | # -D_FORTIFY_SOURCE=2 -fstack-protector-all | 480 | # -D_FORTIFY_SOURCE=2 -fstack-protector-all |
460 | AC_ARG_ENABLE(gcc-hardening, | 481 | AC_ARG_ENABLE(gcc-hardening, |
diff --git a/doc/handbook/Makefile.am b/doc/handbook/Makefile.am index a50a58937..23e43a34a 100644 --- a/doc/handbook/Makefile.am +++ b/doc/handbook/Makefile.am | |||
@@ -9,6 +9,7 @@ infoimagedir = $(infodir)/images | |||
9 | # $(DOT_FILES:%.dot=%.eps) \ | 9 | # $(DOT_FILES:%.dot=%.eps) \ |
10 | # $(DOT_FILES:%.dot=%.pdf) | 10 | # $(DOT_FILES:%.dot=%.pdf) |
11 | 11 | ||
12 | if ACTIVATE_TEXINFO4 | ||
12 | # NOTE: While GNU makeinfo 6.5 supports --css-ref=URL, | 13 | # NOTE: While GNU makeinfo 6.5 supports --css-ref=URL, |
13 | # makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other | 14 | # makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other |
14 | # base) does only support --css-include=FILE. | 15 | # base) does only support --css-include=FILE. |
@@ -17,8 +18,12 @@ infoimagedir = $(infodir)/images | |||
17 | # We prefer not to break builds in this case, so | 18 | # We prefer not to break builds in this case, so |
18 | # we use the include version which is backwards compatible | 19 | # we use the include version which is backwards compatible |
19 | # and upwards compatible, while the ref variant is neither. | 20 | # and upwards compatible, while the ref variant is neither. |
20 | |||
21 | AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css --css-include=manual.css | 21 | AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css --css-include=manual.css |
22 | else | ||
23 | # In the 5.x version they added `--split=chapters|sections` in | ||
24 | # addition to `--split=nodes`. | ||
25 | AM_MAKEINFOHTMLFLAGS = --split=sections --css-ref=style.css --css-ref=manual.css | ||
26 | endif | ||
22 | 27 | ||
23 | dist_infoimage_DATA = \ | 28 | dist_infoimage_DATA = \ |
24 | images/gnunet-gtk-0-10-gns-a-done.png \ | 29 | images/gnunet-gtk-0-10-gns-a-done.png \ |
diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am index f3908aa99..8525563a2 100644 --- a/doc/tutorial/Makefile.am +++ b/doc/tutorial/Makefile.am | |||
@@ -7,8 +7,21 @@ docdir = $(datadir)/doc/gnunet/ | |||
7 | # $(DOT_FILES:%.dot=%.eps) \ | 7 | # $(DOT_FILES:%.dot=%.eps) \ |
8 | # $(DOT_FILES:%.dot=%.pdf) | 8 | # $(DOT_FILES:%.dot=%.pdf) |
9 | 9 | ||
10 | # See ../handbook/Makefile.am comment! | 10 | if ACTIVATE_TEXINFO4 |
11 | # NOTE: While GNU makeinfo 6.5 supports --css-ref=URL, | ||
12 | # makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other | ||
13 | # base) does only support --css-include=FILE. | ||
14 | # The only difference is a shorter html output and | ||
15 | # in 6.5 the ability to use refs instead of include. | ||
16 | # We prefer not to break builds in this case, so | ||
17 | # we use the include version which is backwards compatible | ||
18 | # and upwards compatible, while the ref variant is neither. | ||
11 | AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css --css-include=manual.css | 19 | AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css --css-include=manual.css |
20 | else | ||
21 | # In the 5.x version they added `--split=chapters|sections` in | ||
22 | # addition to `--split=nodes`. | ||
23 | AM_MAKEINFOHTMLFLAGS = --split=sections --css-ref=style.css --css-ref=manual.css | ||
24 | endif | ||
12 | 25 | ||
13 | #DOT_OPTIONS = \ | 26 | #DOT_OPTIONS = \ |
14 | # -Gratio=.9 -Gnodesep=.005 -Granksep=.00005 \ | 27 | # -Gratio=.9 -Gnodesep=.005 -Granksep=.00005 \ |