daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11134
Change subject: Fix --disable-man-doc option
......................................................................
Fix --disable-man-doc option
Build the manuals only if it is not disabled in configure. Previously
the option did not have any effect.
Change-Id: I7e9f6a6507d4f7c4bacdd737ff73b07aa94bc580
---
M configure.ac
M man/Makefile.am
2 files changed, 8 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/34/11134/1
diff --git a/configure.ac b/configure.ac
index c011fea..31f6f04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,19 +78,16 @@
AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false && test "x$doxygen" =
"xyes")
AC_ARG_ENABLE([man-doc],
- AS_HELP_STRING([--disable-man-doc], [Disable man page
documentation]),
- AS_IF([test "x$enable_man_doc" = "xno"], [enable_man_doc=no],
- [enable_man_doc=yes]), [enable_man_doc=yes])
-AM_CONDITIONAL([BUILD_MAN], [test "x$enable_man_doc" == "xyes"])
+ [AS_HELP_STRING([--disable-man-doc], [Disable man page
documentation])],
+ [ BUILD_MAN=$enableval ], [ BUILD_MAN="yes" ])
-AC_CHECK_PROG(A2X, [a2x], [a2x])
-AM_CONDITIONAL([BUILD_MAN], [test -n "$A2X"])
-
-AS_IF([test "$need_a2x" = "yes"], [
- AC_CHECK_PROG(A2X, [a2x], [found], [no])
- AS_IF([test "$A2X" != "found"],
+AS_IF([test "x$BUILD_MAN" = "xyes"], [
+ AC_CHECK_PROG(A2X, [a2x], [yes])
+ AS_IF([test "$A2X" != "yes"],
[AC_MSG_ERROR([a2x not found, please install asciidoc])])
])
+AM_CONDITIONAL(BUILD_MAN, test "x$BUILD_MAN" = "xyes")
+AC_SUBST(BUILD_MAN)
# check for syscal fallback on glibc < 2.25 - can be removed once glibc
version requirement is bumped
AC_CHECK_DECLS([SYS_getrandom], [], [], [[#include <sys/syscall.h>]])
diff --git a/man/Makefile.am b/man/Makefile.am
index 043c965..927db21 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -7,7 +7,7 @@
ASCIIDOCS = osmo-config-merge.txt
osmo-config-merge.8 : ${ASCIIDOCS}
- ${A2X} ${A2X_OPTS_MANPAGE} osmo-config-merge.txt
+ a2x ${A2X_OPTS_MANPAGE} osmo-config-merge.txt
EXTRA_DIST = ${ASCIIDOCS}
--
To view, visit https://gerrit.osmocom.org/11134
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e9f6a6507d4f7c4bacdd737ff73b07aa94bc580
Gerrit-Change-Number: 11134
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillm...@sysmocom.de>
