-another try. properly handle autoconf vs configure for HTMLFLAGS

3 files changed, 38 insertions, 38 deletions

diff --git a/configure.ac b/configure.ac
index 68cae8c0e..b6a4d21c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -558,6 +558,18 @@ AS_IF([test "x$include_manpages" = "xyes"],
 # texinfo5 switches are used. This comes with no version checks, is
 # enabled only at distributors action (ie defaults to "no").
 # Mantis #3914 for more details (https://bugs.gnunet.org/view.php?id=3914)
+# While GNU makeinfo 6.5 supports --css-ref=URL,
+# makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other
+# base) does only support --css-include=FILE.
+# The only difference is a shorter html output and
+# in 6.5 the ability to use refs instead of include.
+# We prefer not to break builds in this case, so
+# we use the include version which is backwards compatible
+# and upwards compatible, while the ref variant is neither.
+# In the 5.x version they added `--split=chapters|sections` in
+# addition to `--split=nodes`.
+# Hold on to your hats: In version 6.5 this is already removed, ffs.
+# GNU Texinfo, please be more consistent than 1 version in switches.
 AC_MSG_CHECKING(whether to enable texinfo4 switches)
 AC_ARG_ENABLE([texinfo4],
    [AS_HELP_STRING([--enable-texinfo4], [Use texinfo version 4 specific switches])],
@@ -568,11 +580,15 @@ AS_IF([test "x$activate_texinfo4" = "xyes"],
  [
   AM_CONDITIONAL([ACTIVATE_TEXINFO4],true)
   AC_DEFINE([ACTIVATE_TEXINFO4],[1],[Using texinfo version 4 specific switches])
+  TEXINFO_HTMLFLAGS="--no-split --css-include=style.css --css-include=manual.css"
  ],[
   AM_CONDITIONAL([ACTIVATE_TEXINFO4],false)
   AC_DEFINE([INCLUDE_MANPAGES],[0],[Using texinfo version 5 or later switches])
+  TEXINFO_HTMLFLAGS="--split --css-ref='../style.css' --css-ref='../manual.css'"
+
  ])
 
+AC_SUBST([TEXINFO_HTMLFLAGS])
 
 # Adam shostack suggests the following for Windows:
 # -D_FORTIFY_SOURCE=2 -fstack-protector-all
diff --git a/doc/handbook/Makefile.am b/doc/handbook/Makefile.am
index 4597d9a3d..d7bcab696 100644
--- a/doc/handbook/Makefile.am
+++ b/doc/handbook/Makefile.am
@@ -3,25 +3,8 @@ docdir = $(datadir)/doc/gnunet/
 
 infoimagedir = $(infodir)/images
 
-if ACTIVATE_TEXINFO4
-# NOTE: While GNU makeinfo 6.5 supports --css-ref=URL,
-# makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other
-# base) does only support --css-include=FILE.
-# The only difference is a shorter html output and
-# in 6.5 the ability to use refs instead of include.
-# We prefer not to break builds in this case, so
-# we use the include version which is backwards compatible
-# and upwards compatible, while the ref variant is neither.
-AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css --css-include=manual.css
-else
-# In the 5.x version they added `--split=chapters|sections` in
-# addition to `--split=nodes`.
-# Hold on to your hats: In version 6.5 this is already removed, ffs.
-# GNU Texinfo, please be more consistent than 1 version in switches.
-# This however is compatible to version 5.2. Thanks, I hate it.
-# AM_MAKEINFOHTMLFLAGS = --split=sections --css-ref="../style.css" --css-ref="../manual.css"
-AM_MAKEINFOHTMLFLAGS = --split --css-ref="../style.css" --css-ref="../manual.css"
-endif
+AM_MAKEINFOHTMLFLAGS = $(TEXINFO_HTMLFLAGS)
+
 
 dist_infoimage_DATA =                                           \
         images/gnunet-gtk-0-10-gns-a-done.png                   \
@@ -78,6 +61,25 @@ gnunet_TEXINFOS = 						\
         agpl-3.0.texi                                           \
         version.texi
 
+#if ACTIVATE_TEXINFO4
+# NOTE: While GNU makeinfo 6.5 supports --css-ref=URL,
+# makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other
+# base) does only support --css-include=FILE.
+# The only difference is a shorter html output and
+# in 6.5 the ability to use refs instead of include.
+# We prefer not to break builds in this case, so
+# we use the include version which is backwards compatible
+# and upwards compatible, while the ref variant is neither.
+#AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css --css-include=manual.css
+#else
+# In the 5.x version they added `--split=chapters|sections` in
+# addition to `--split=nodes`.
+# Hold on to your hats: In version 6.5 this is already removed, ffs.
+# GNU Texinfo, please be more consistent than 1 version in switches.
+# This however is compatible to version 5.2. Thanks, I hate it.
+# AM_MAKEINFOHTMLFLAGS = --split=sections --css-ref="../style.css" --css-ref="../manual.css"
+#AM_MAKEINFOHTMLFLAGS = --split --css-ref="../style.css" --css-ref="../manual.css"
+#endif
 EXTRA_DIST =                                                    \
         $(gnunet_TEXINFOS)                                      \
         htmlxref.cnf                                            \
diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am
index 4df169872..afe4aa6c0 100644
--- a/doc/tutorial/Makefile.am
+++ b/doc/tutorial/Makefile.am
@@ -1,25 +1,7 @@
 # This Makefile.am is in the public domain
 docdir = $(datadir)/doc/gnunet/
 
-if ACTIVATE_TEXINFO4
-# NOTE: While GNU makeinfo 6.5 supports --css-ref=URL,
-# makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other
-# base) does only support --css-include=FILE.
-# The only difference is a shorter html output and
-# in 6.5 the ability to use refs instead of include.
-# We prefer not to break builds in this case, so
-# we use the include version which is backwards compatible
-# and upwards compatible, while the ref variant is neither.
-AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css --css-include=manual.css
-else
-# In the 5.x version they added `--split=chapters|sections` in
-# addition to `--split=nodes`.
-# Hold on to your hats: In version 6.5 this is already removed, ffs.
-# GNU Texinfo, please be more consistent than 1 version in switches.
-# This however is compatible to version 5.2. Thanks, I hate it.
-# AM_MAKEINFOHTMLFLAGS = --split=sections --css-ref="../style.css" --css-ref="../manual.css"
-AM_MAKEINFOHTMLFLAGS = --split --css-ref="../style.css" --css-ref="../manual.css"
-endif
+AM_MAKEINFOHTMLFLAGS = $(TEXINFO_HTMLFLAGS)
 
 
 gnunet_tutorial_examples =                                      \