From 8345fe9e9504675cb341d2106c18b917ffd2aa28 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 27 Oct 2016 14:13:44 +0100 Subject: [PATCH] Problem: build API incompatible with 4.1 Solution: keep the new --without-docs option, but also keep the old --without-documentation with an added deprecation warning. We can then remove it in the next major release, to leave enough time for users and maintainers to change it without disruptions. --- acinclude.m4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index eceaf696..15a6f0d3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -95,8 +95,13 @@ AC_DEFUN([LIBZMQ_CHECK_DOC_BUILD], [{ AS_HELP_STRING([--without-docs], [Don't build and install man pages [default=build]]), [with_docs=$withval]) + AC_ARG_WITH([documentation], [AS_HELP_STRING([--without-documentation], + [Don't build and install man pages [default=build] DEPRECATED: use --without-docs])]) - if test "x$with_docs" = "xno"; then + if test "x$with_documentation" = "xno"; then + AC_MSG_WARN([--without-documentation is DEPRECATED and will be removed in the next release, use --without-docs]) + fi + if test "x$with_docs" = "xno" || test "x$with_documentation" = "xno"; then libzmq_build_doc="no" libzmq_install_man="no" else