summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2018-09-29 01:41:58 +0200
committerHarald Welte <laforge@gnumonks.org>2018-09-29 01:43:14 +0200
commit40f35212c71e8926b0dfe7463af959f00c56cd82 (patch)
treed75b3ecc5c970c8d7090c737f11c01da50a7c268 /configure.ac
parent6dd00d876e2b947e070f776f90fbb8305a237d21 (diff)
Revert "osmo-config-merge: Add manual page"
This reverts commit 6dd00d876e2b947e070f776f90fbb8305a237d21. Unfortunately, it seems older a2x versions don't support "-D" for manpage generation: All the osmocom master builds started to fail with: make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 Makefile:545: recipe for target 'osmo-config-merge.8' failed Change-Id: I0f45362d3e978c328d962a5c0d883eade27b875c
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac14
1 files changed, 0 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac
index 529aad1d..bc3358a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,19 +77,6 @@ AC_ARG_ENABLE(doxygen,
AC_PATH_PROG(DOXYGEN,doxygen,false)
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])],
- [ BUILD_MAN=$enableval ], [ BUILD_MAN="yes" ])
-
-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 or use the
- option --disable-man-doc])])
-])
-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>]])
@@ -383,7 +370,6 @@ AC_OUTPUT(
libosmoctrl.pc
libosmosim.pc
include/Makefile
- man/Makefile
src/Makefile
src/vty/Makefile
src/codec/Makefile