summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2018-05-02 19:15:39 +0100
committerSimon McVittie <smcv@collabora.com>2018-05-02 19:19:55 +0100
commit721ef6373069bfc6955018681204e20e1ad836e4 (patch)
tree9de7c789c0b537e596599f8e9a3db2727e49520c /configure.ac
parent48572c4dd8cea6c7a2661c4dacd73eb8d0d916c5 (diff)
Remove remnants of old documentation
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac29
1 files changed, 1 insertions, 28 deletions
diff --git a/configure.ac b/configure.ac
index 0912a47..4a3d512 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,34 +121,7 @@ AC_ARG_VAR([DBUS_RUN_SESSION],
[The dbus-run-session tool from dbus 1.8 or later])
AC_PATH_PROG([DBUS_RUN_SESSION], [dbus-run-session], [dbus-run-session])
-RST2HTMLFLAGS=
-AS_IF([test "${enable_html_docs}" != no],
- [
- AC_CHECK_PROGS([RST2HTML], [rst2html rst2html.py], [])
- AS_IF([test -z "$RST2HTML"],
- [
- AS_CASE(["$enable_html_docs"],
- [if*possible],
- [enable_html_docs=no],
- [*],
- [AC_MSG_ERROR([cannot compile HTML documentation without rst2html installed])])
- ])
- ],
- [
- DBUS_PY_ADD_RST2HTMLFLAG([--generator])
- DBUS_PY_ADD_RST2HTMLFLAG([--date])
- DBUS_PY_ADD_RST2HTMLFLAG([--time])
- DBUS_PY_ADD_RST2HTMLFLAG([--exit-status=2])
- DBUS_PY_ADD_RST2HTMLFLAG([--no-raw])
- DBUS_PY_ADD_RST2HTMLFLAG([--no-file-insertion])
- DBUS_PY_ADD_RST2HTMLFLAG([--cloak-email-addresses])
- DBUS_PY_ADD_RST2HTMLFLAG([--input-encoding=UTF-8])
- ])
-AC_SUBST([RST2HTML])
-AC_SUBST([RST2HTMLFLAGS])
-
-AM_CONDITIONAL([ENABLE_API_DOCS], [test "$enable_api_docs" != no])
-AM_CONDITIONAL([ENABLE_DOCS], [test "$enable_html_docs" != no])
+AM_CONDITIONAL([ENABLE_DOCUMENTATION], [test "$enable_documentation" != no])
PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.8])
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.40])