From 6869efa540e30f53ebde751818ec845964c3f3a7 Mon Sep 17 00:00:00 2001
From: Karl Fleischmann <karl.fleischmann@open-xchange.com>
Date: Mon, 8 Aug 2022 15:55:02 +0200
Subject: [PATCH] configure: Update m4 syntax

This commit simplifies the help-string definitions and makes them more
consistent with the upstream configuration of the dovecot/core project.
---
 configure.ac | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/configure.ac b/configure.ac
index abeecabe4..6efd517ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,14 +62,9 @@ AC_SUBST(sieve_docdir)
 #
 
 AC_ARG_WITH(unfinished-features,
-[AS_HELP_STRING([--with-unfinished-features],
-	[Build unfinished new features/extensions [default=no]])],
-        if test x$withval = xno || test x$withval = xauto; then
-                want_unfinished_features=$withval
-        else
-                want_unfinished_features=yes
-        fi,
-        want_unfinished_features=no)
+AS_HELP_STRING([--with-unfinished-features], [Build unfinished new features/extensions (default=no)]),
+  TEST_WITH(unfinished_features, $withval),
+  want_unfinished_features=no)
 AM_CONDITIONAL(BUILD_UNFINISHED, test "$want_unfinished_features" = "yes")
 
 if test "$want_unfinished_features" = "yes"; then
@@ -78,28 +73,19 @@ if test "$want_unfinished_features" = "yes"; then
 fi
 
 AC_ARG_WITH(docs,
-[  --with-docs             Install documentation (default)],
-    if test x$withval = xno; then
-        want_docs=no
-    else
-        want_docs=yes
-    fi,
-    want_docs=yes)
+AS_HELP_STRING([--with-docs], [Install documentation (default=yes)]),
+  TEST_WITH(docs, $withval),
+  want_docs=yes)
 AM_CONDITIONAL(BUILD_DOCS, test "$want_docs" = "yes")
 
 AC_ARG_WITH(managesieve,
-[AS_HELP_STRING([--with-managesieve],
-	[Build ManageSieve service [default=yes]])],
-        if test x$withval = xno || test x$withval = xauto; then
-                want_managesieve=$withval
-        else
-                want_managesieve=yes
-        fi,
-        want_managesieve=yes)
+AS_HELP_STRING([--with-managesieve], [Build ManageSieve service (default=yes)]),
+  TEST_WITH(managesieve, $withval),
+  want_managesieve=yes)
 AM_CONDITIONAL(BUILD_MANAGESIEVE, test "$want_managesieve" = "yes")
 
 AC_ARG_WITH(ldap,
-AS_HELP_STRING([--with-ldap=yes|plugin], [Build with LDAP support]),
+AS_HELP_STRING([--with-ldap=yes|plugin], [Build with LDAP support (default=no)]),
   TEST_WITH(ldap, $withval, plugin),
   want_ldap=no)
 
-- 
GitLab