[GNUnet-SVN] [gnunet] branch master updated (c03183d3e -> f4ed42acf)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a change to branch master
in repository gnunet.

    from c03183d3e avoid assertions from adding headers that MHD deals with 
internally
     new cf3fe60e3 configure: don't check for makeinfo version. rename section7 
to texi2mdoc-generation
     new d0ced1e47 doc/handboc: backport a newer makeinfo macro
     new 880677043 doc/man/Makefile: rename section7 leftover to new name
     new 35ebb791e doc/tutorial/Makefile: fix leftover
     new 67365fef8 configure: do not produce the word "warning" twice
     new f05f6145b Fix typo in configure.ac
     new f4ed42acf Merge branch 'feature/texinfo-fix'

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README                   |  1 +
 configure.ac             | 54 +++++++++++-------------------------------------
 doc/handbook/Makefile.am |  2 +-
 doc/handbook/gnunet.texi |  5 +++++
 doc/man/Makefile.am      |  2 +-
 doc/tutorial/Makefile.am |  2 +-
 6 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/README b/README
index 3a2870279..43d6671d7 100644
--- a/README
+++ b/README
@@ -47,6 +47,7 @@ These are the direct dependencies for running GNUnet:
 - mysql              >= 5.1         (alternative to sqlite)
 - postgres           >= 9.5         (alternative to sqlite)
 - Texinfo            >= 5.2         [*1]
+- makeinfo           >= 4.8         (at least 4.8 at the time of writing is 
tested) 
 - which                             (for the bootstrap script)
 - gettext
 - zlib
diff --git a/configure.ac b/configure.ac
index 3355812f6..3dd1ce3e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -244,7 +244,7 @@ if test x"$VAR_IFCONFIG_BINARY" != x"false"
 then
 AC_DEFINE_UNQUOTED([IFCONFIG], "$VAR_IFCONFIG_BINARY", [Path to ifconfig])
 else
-AC_MSG_WARN([warning: 'ifconfig' not found.])
+AC_MSG_WARN(['ifconfig' not found.])
 fi
 
 # miniupnpc / upnpc binary is a soft runtime requirement
@@ -319,16 +319,13 @@ else
   AC_DEFINE([DOCUMENTATION],[0],[Not building the documentation])
 fi
 
-# TODO: Include check for mandoc + texi2mdoc.
-# TODO: Rename the switch? Just 'section7' is too vague.
-# mdoc section 7 output.
-AC_MSG_CHECKING(wether to build section 7 mdoc output)
-AC_ARG_ENABLE([section7],
-[AS_HELP_STRING([--disable-section7], [do not build section 7 mdoc output])],
-[section7=${enableval}],
-[section7=yes])
-AC_MSG_RESULT($section7)
-if test "x$section7" = "xyes"
+AC_MSG_CHECKING(wether to include generated texi2mdoc output in installation)
+AC_ARG_ENABLE([texi2mdoc-generation],
+[AS_HELP_STRING([--disable-texi2mdoc-generation], [do not include generated 
texi2mdoc output in installation])],
+[texi2mdoc-generation=${enableval}],
+[texi2mdoc-generation=yes])
+AC_MSG_RESULT($texi2mdoc-generation)
+if test "x$texi2mdoc-generation" = "xyes"
 then
   if test "$texi2mdoc" = 0
   then
@@ -336,12 +333,12 @@ then
   AC_MSG_WARN([ERROR: texi2mdoc can be obtained via your Operating System])
   AC_MSG_WARN([ERROR: package manager or from 
https://mandoc.bsd.lv/texi2mdoc/])
   else
-  AM_CONDITIONAL([SECTION7],true)
-  AC_DEFINE([SECTION7],[1],[Building section 7 mdoc output])
+  AM_CONDITIONAL([TEXI2MDOC_GENERATION],true)
+  AC_DEFINE([TEXI2MDOC_GENERATION],[1],[Building section 7 mdoc output])
   fi
 else
-  AM_CONDITIONAL([SECTION7],false)
-  AC_DEFINE([SECTION7],[0],[Not building section 7 mdoc output])
+  AM_CONDITIONAL([TEXI2MDOC_GENERATION],false)
+  AC_DEFINE([TEXI2MDOC_GENERATION],[0],[Not building section 7 mdoc output])
 fi
 
 # should the build process be building only the documentation?
@@ -361,33 +358,6 @@ else
 fi
 
 
-# Check for makeinfo version >= 5, required for building documentation.
-# TODO: add check for alternatives
-have_makeinfo_5=false
-if test x"$documentation" = xyes || test x"$documentation_only" = xyes
-then
-  AC_PROG_SED
-  AC_CHECK_PROG([MAKEINFO_FOUND], [makeinfo], [yes])
-  if test x"${MAKEINFO_FOUND}" = xyes
-  then
-    MAKEINFO_VERSION_REQ=5
-    AC_MSG_CHECKING([for makeinfo version >= $MAKEINFO_VERSION_REQ])
-    # XXX: is this sed invocation portable?
-    MAKEINFO_VERSION=`makeinfo --version | sed -ne 's/^\(makeinfo\|texi2any\) 
.* \([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*.*$/\2/p'`
-    if test x$MAKEINFO_VERSION = x -o 0$MAKEINFO_VERSION -lt 
$MAKEINFO_VERSION_REQ
-    then
-      AC_MSG_RESULT([no])
-      AC_MSG_FAILURE([Program 'makeinfo' version >= $MAKEINFO_VERSION_REQ is 
required.])
-    else
-      AC_MSG_RESULT([yes])
-      have_makeinfo_5=true
-    fi
-  else
-      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'.])
-  fi
-fi
-AM_CONDITIONAL([HAVE_MAKEINFO_5], [test x$have_makeinfo_5 = xtrue])
-
 # Adam shostack suggests the following for Windows:
 # -D_FORTIFY_SOURCE=2 -fstack-protector-all
 AC_ARG_ENABLE(gcc-hardening,
diff --git a/doc/handbook/Makefile.am b/doc/handbook/Makefile.am
index d12ad1af8..8be033f23 100644
--- a/doc/handbook/Makefile.am
+++ b/doc/handbook/Makefile.am
@@ -138,7 +138,7 @@ version.texi/replacement/revert:
        @echo "@set VERSION GPACKAGE_VERSION" > gversion.texi
        @echo "@set EDITION GPACKAGE_VERSION" >> gversion.texi
 
-if SECTION7
+if TEXI2MDOC_GENERATION
 gnunet-documentation.7: version.texi/replacement
        @echo Attempting to output an mdoc formatted section 7 document
        @texi2mdoc -I$(pwd):$(pwd)/chapters gnunet.texi > 
../man/gnunet-documentation.7
diff --git a/doc/handbook/gnunet.texi b/doc/handbook/gnunet.texi
index 05522d7d0..d688009a4 100644
--- a/doc/handbook/gnunet.texi
+++ b/doc/handbook/gnunet.texi
@@ -5,6 +5,11 @@
 @settitle GNUnet Reference Manual
 @c @exampleindent 2
 
address@hidden macros for backwards compatibility
address@hidden geq{}
+>=
address@hidden macro
+
 @c Set Versions which might be used in more than one place:
 @set GNUFTP-URL https://ftp.gnu.org/gnu/gnunet
 @set PYPI-URL https://pypi.python.org/packages/source
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index d0871571d..ceb7bf68d 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -47,7 +47,7 @@ man_MANS = \
 
 EXTRA_DIST = ${man_MANS}
 
-if SECTION7
+if TEXI2MDOC_GENERATION
 EXTRA_DIST += gnunet-documentation.7 \
              gnunet-c-tutorial.7
 endif
diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am
index 0431e0684..412ac3a6f 100644
--- a/doc/tutorial/Makefile.am
+++ b/doc/tutorial/Makefile.am
@@ -88,7 +88,7 @@ version.texi/replacement/revert:
        @echo "@set VERSION GPACKAGE_VERSION" > gversion.texi
        @echo "@set EDITION GPACKAGE_VERSION" >> gversion.texi
 
-if SECTION7
+if TEXI2MDOC_GENERATION
 gnunet-tutorial.7: version.texi/replacement
        @echo Attempting to output an mdoc formatted section 7 document
        @texi2mdoc -I$(pwd):$(pwd)/chapters gnunet-c-tutorial.texi > 
../man/gnunet-c-tutorial.7

-- 
To stop receiving notification emails like this one, please contact
address@hidden