<p>daniel has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11134">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix --disable-man-doc option<br><br>Build the manuals only if it is not disabled in configure. Previously<br>the option did not have any effect.<br><br>Change-Id: I7e9f6a6507d4f7c4bacdd737ff73b07aa94bc580<br>---<br>M configure.ac<br>M man/Makefile.am<br>2 files changed, 8 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/34/11134/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index c011fea..31f6f04 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -78,19 +78,16 @@</span><br><span> AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false && test "x$doxygen" = "xyes")</span><br><span> </span><br><span> AC_ARG_ENABLE([man-doc],</span><br><span style="color: hsl(0, 100%, 40%);">-             AS_HELP_STRING([--disable-man-doc], [Disable man page documentation]),</span><br><span style="color: hsl(0, 100%, 40%);">-          AS_IF([test "x$enable_man_doc" = "xno"], [enable_man_doc=no],</span><br><span style="color: hsl(0, 100%, 40%);">-             [enable_man_doc=yes]), [enable_man_doc=yes])</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CONDITIONAL([BUILD_MAN], [test "x$enable_man_doc" == "xyes"])</span><br><span style="color: hsl(120, 100%, 40%);">+        [AS_HELP_STRING([--disable-man-doc], [Disable man page documentation])],</span><br><span style="color: hsl(120, 100%, 40%);">+              [ BUILD_MAN=$enableval ], [ BUILD_MAN="yes" ])</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AC_CHECK_PROG(A2X, [a2x], [a2x])</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CONDITIONAL([BUILD_MAN], [test -n "$A2X"])</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-AS_IF([test "$need_a2x" = "yes"], [</span><br><span style="color: hsl(0, 100%, 40%);">-      AC_CHECK_PROG(A2X, [a2x], [found], [no])</span><br><span style="color: hsl(0, 100%, 40%);">-      AS_IF([test "$A2X" != "found"],</span><br><span style="color: hsl(120, 100%, 40%);">+AS_IF([test "x$BUILD_MAN" = "xyes"], [</span><br><span style="color: hsl(120, 100%, 40%);">+      AC_CHECK_PROG(A2X, [a2x], [yes])</span><br><span style="color: hsl(120, 100%, 40%);">+      AS_IF([test "$A2X" != "yes"],</span><br><span>             [AC_MSG_ERROR([a2x not found, please install asciidoc])])</span><br><span> ])</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CONDITIONAL(BUILD_MAN, test "x$BUILD_MAN" = "xyes")</span><br><span style="color: hsl(120, 100%, 40%);">+AC_SUBST(BUILD_MAN)</span><br><span> </span><br><span> # check for syscal fallback on glibc < 2.25 - can be removed once glibc version requirement is bumped</span><br><span> AC_CHECK_DECLS([SYS_getrandom], [], [], [[#include <sys/syscall.h>]])</span><br><span>diff --git a/man/Makefile.am b/man/Makefile.am</span><br><span>index 043c965..927db21 100644</span><br><span>--- a/man/Makefile.am</span><br><span>+++ b/man/Makefile.am</span><br><span>@@ -7,7 +7,7 @@</span><br><span> ASCIIDOCS = osmo-config-merge.txt</span><br><span> </span><br><span> osmo-config-merge.8 : ${ASCIIDOCS}</span><br><span style="color: hsl(0, 100%, 40%);">-           ${A2X} ${A2X_OPTS_MANPAGE} osmo-config-merge.txt</span><br><span style="color: hsl(120, 100%, 40%);">+              a2x ${A2X_OPTS_MANPAGE} osmo-config-merge.txt</span><br><span> </span><br><span> EXTRA_DIST = ${ASCIIDOCS}</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11134">change 11134</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11134"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I7e9f6a6507d4f7c4bacdd737ff73b07aa94bc580 </div>
<div style="display:none"> Gerrit-Change-Number: 11134 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>