From d016c480367fd09e726cdfb7f0255e39527ac044 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Fri, 28 Nov 2025 11:46:21 +0100 Subject: [PATCH 2/2] configure.ac: Use AS_HELP_STRING in AC_ARG_* macros Most changes done by: sed -i \ -e 's@\(AC_ARG_\(ENABLE\|WITH\)\)(\([[:alnum:]_-]\+\),@\1([\3],@' \ -e 's|\[[[:space:]]\{2,\}\(--[[:alnum:]=_-]\+\)[[:space:]]\+\(.*\)],|[AS_HELP_STRING([\1], [\2])],|' \ configure.ac And some manual tweaks. --- configure.ac | 238 +++++++++++++++++++++++++-------------------------- 1 file changed, 119 insertions(+), 119 deletions(-) diff --git a/configure.ac b/configure.ac index cd8b073ed..ba1609ba2 100644 --- a/configure.ac +++ b/configure.ac @@ -245,101 +245,101 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.]) AM_GNU_GETTEXT_VERSION([0.18]) AM_GNU_GETTEXT([external]) -AC_ARG_ENABLE(manual, - [ --disable-manual Do not build user manual], +AC_ARG_ENABLE([manual], + [AS_HELP_STRING([--disable-manual], [Do not build user manual])], [enable_manual=$enableval], [enable_manual=yes]) -AC_ARG_ENABLE(libsm, - [ --disable-libsm Do not build libSM support for session management], +AC_ARG_ENABLE([libsm], + [AS_HELP_STRING([--disable-libsm], [Do not build libSM support for session management])], [enable_libsm=$enableval], [enable_libsm=yes]) -AC_ARG_ENABLE(ipv6, - [ --disable-ipv6 Do not build IPv6 support], +AC_ARG_ENABLE([ipv6], + [AS_HELP_STRING([--disable-ipv6], [Do not build IPv6 support])], [enable_ipv6=$enableval], [enable_ipv6=yes]) -AC_ARG_ENABLE(gnutls, - [ --disable-gnutls Do not build GnuTLS support for TLS], +AC_ARG_ENABLE([gnutls], + [AS_HELP_STRING([--disable-gnutls], [Do not build GnuTLS support for TLS])], [enable_gnutls=$enableval], [enable_gnutls=yes]) -AC_ARG_ENABLE(oauth2, - [ --disable-oauth2 Do not build OAuth2 support], +AC_ARG_ENABLE([oauth2], + [AS_HELP_STRING([--disable-oauth2], [Do not build OAuth2 support])], [enable_oauth2=$enableval], [enable_oauth2=yes]) -AC_ARG_ENABLE(enchant, - [ --disable-enchant Do not build Enchant support for spell-checking], +AC_ARG_ENABLE([enchant], + [AS_HELP_STRING([--disable-enchant], [Do not build Enchant support for spell-checking])], [enable_enchant=$enableval], [enable_enchant=yes]) -AC_ARG_ENABLE(crash-dialog, - [ --enable-crash-dialog Build crash dialog], +AC_ARG_ENABLE([crash-dialog], + [AS_HELP_STRING([--enable-crash-dialog], [Build crash dialog])], [enable_crash_dialog=$enableval], [enable_crash_dialog=no]) -AC_ARG_ENABLE(generic-umpc, - [ --enable-generic-umpc Build generic UMPC code], +AC_ARG_ENABLE([generic-umpc], + [AS_HELP_STRING([--enable-generic-umpc], [Build generic UMPC code])], [enable_generic_umpc=$enableval], [enable_generic_umpc=no]) -AC_ARG_ENABLE(compface, - [ --disable-compface Do not build compface support for X-Face], +AC_ARG_ENABLE([compface], + [AS_HELP_STRING([--disable-compface], [Do not build compface support for X-Face])], [enable_compface=$enableval], [enable_compface=yes]) -AC_ARG_ENABLE(pthread, - [ --disable-pthread Do not build pthread support], +AC_ARG_ENABLE([pthread], + [AS_HELP_STRING([--disable-pthread], [Do not build pthread support])], [enable_pthread=$enableval], [enable_pthread=yes]) -AC_ARG_ENABLE(startup-notification, - [ --disable-startup-notification Do not startup notification support], +AC_ARG_ENABLE([startup-notification], + [AS_HELP_STRING([--disable-startup-notification], [Do not startup notification support])], [enable_startup_notification=$enableval], [enable_startup_notification=yes]) -AC_ARG_ENABLE(dbus, - [ --disable-dbus Do not build DBUS support], +AC_ARG_ENABLE([dbus], + [AS_HELP_STRING([--disable-dbus], [Do not build DBUS support])], [enable_dbus=$enableval], [enable_dbus=yes]) -AC_ARG_ENABLE(ldap, - [ --disable-ldap Do not build LDAP support], +AC_ARG_ENABLE([ldap], + [AS_HELP_STRING([--disable-ldap], [Do not build LDAP support])], [enable_ldap=$enableval], [enable_ldap=yes]) -AC_ARG_ENABLE(jpilot, - [ --disable-jpilot Do not build JPilot support], +AC_ARG_ENABLE([jpilot], + [AS_HELP_STRING([--disable-jpilot], [Do not build JPilot support])], [enable_jpilot=$enableval], [enable_jpilot=yes]) -AC_ARG_ENABLE(networkmanager, - [ --disable-networkmanager Do not build NetworkManager support], +AC_ARG_ENABLE([networkmanager], + [AS_HELP_STRING([--disable-networkmanager], [Do not build NetworkManager support])], [enable_networkmanager=$enableval], [enable_networkmanager=yes]) -AC_ARG_ENABLE(libetpan, - [ --disable-libetpan Do not build libetpan support for IMAP4/NNTP], +AC_ARG_ENABLE([libetpan], + [AS_HELP_STRING([--disable-libetpan], [Do not build libetpan support for IMAP4/NNTP])], [enable_libetpan=$enableval], [enable_libetpan=yes]) -AC_ARG_ENABLE(valgrind, - [ --disable-valgrind Do not build valgrind support for debugging], +AC_ARG_ENABLE([valgrind], + [AS_HELP_STRING([--disable-valgrind], [Do not build valgrind support for debugging])], [enable_valgrind=$enableval], [enable_valgrind=yes]) -AC_ARG_ENABLE(alternate-addressbook, - [ --enable-alternate-addressbook Build alternate external address book support], +AC_ARG_ENABLE([alternate-addressbook], + [AS_HELP_STRING([--enable-alternate-addressbook], [Build alternate external address book support])], [enable_alternate_addressbook=$enableval], [enable_alternate_addressbook=no]) -AC_ARG_ENABLE(svg, - [ --disable-svg Do not build SVG support], +AC_ARG_ENABLE([svg], + [AS_HELP_STRING([--disable-svg], [Do not build SVG support])], [enable_svg=$enableval], [enable_svg=yes]) -AC_ARG_ENABLE(tests, - [ --enable-tests Build unit tests], +AC_ARG_ENABLE([tests], + [AS_HELP_STRING([--enable-tests], [Build unit tests])], [enable_tests=$enableval], [enable_tests=no]) -AC_ARG_ENABLE(more-addressbook-debug, - [ --enable-more-addressbook-debug Build with additional addressbook debug calls], +AC_ARG_ENABLE([more-addressbook-debug], + [AS_HELP_STRING([--enable-more-addressbook-debug], [Build with additional addressbook debug calls])], [enable_more_addressbook_debug=$enableval], [enable_more_addressbook_debug=no]) -AC_ARG_ENABLE(more-ldap-debug, - [ --enable-more-ldap-debug Build with additional LDAP debug calls], +AC_ARG_ENABLE([more-ldap-debug], + [AS_HELP_STRING([--enable-more-ldap-debug], [Build with additional LDAP debug calls])], [enable_more_ldap_debug=$enableval], [enable_more_ldap_debug=no]) -AC_ARG_ENABLE(more-archive-debug, - [ --enable-more-archive-debug Build with additional debug calls in archive plugin], +AC_ARG_ENABLE([more-archive-debug], + [AS_HELP_STRING([--enable-more-archive-debug], [Build with additional debug calls in archive plugin])], [enable_more_archive_debug=$enableval], [enable_more_archive_debug=no]) manualdir='${docdir}/manual' -AC_ARG_WITH(manualdir, - [ --with-manualdir=DIR Manual directory], +AC_ARG_WITH([manualdir], + [AS_HELP_STRING([--with-manualdir=DIR], [Manual directory])], [manualdir="$withval"]) AC_SUBST(manualdir) @@ -512,13 +512,13 @@ PKG_CHECK_MODULES(NETTLE, nettle) AC_SUBST(NETTLE_LIBS) AC_SUBST(NETTLE_CFLAGS) -AC_ARG_WITH(passcrypt-key, [ --with-passcrypt-key=KEY Key used to encode passwords (8 byte string)], - with_passcrypt_key="$withval", with_passcrypt_key="passkey0") +AC_ARG_WITH([passcrypt-key], [AS_HELP_STRING([--with-passcrypt-key=KEY], [Key used to encode passwords (8 byte string)])], + [with_passcrypt_key="$withval"], [with_passcrypt_key="passkey0"]) AC_SUBST(PASSCRYPT_KEY, $with_passcrypt_key) dnl RC dir (will be default at a certain point in time) -AC_ARG_WITH(config-dir, [ --with-config-dir=RCDIR Local configuration dir (default: .claws-mail)], - ac_cv_with_config_dir="$withval", ac_cv_with_config_dir="") +AC_ARG_WITH([config-dir], [AS_HELP_STRING([--with-config-dir=RCDIR], [Local configuration dir (default: .claws-mail)])], + [ac_cv_with_config_dir="$withval"], [ac_cv_with_config_dir=""]) dnl Set correct default value based on platform AS_IF([test x"$ac_cv_with_config_dir" = x""], [ @@ -530,8 +530,8 @@ AS_IF([test x"$ac_cv_with_config_dir" = x""], [ ]) AC_DEFINE_UNQUOTED(CFG_RC_DIR, "$ac_cv_with_config_dir", Configuration directory) -AC_ARG_WITH(password-encryption, [ --with-password-encryption=PROVIDER Which cryptographic library to use for encrypting stored passwords (gnutls, old, default)], - pwd_crypto="$withval", pwd_crypto="default") +AC_ARG_WITH([password-encryption], [AS_HELP_STRING([--with-password-encryption=PROVIDER], [Which cryptographic library to use for encrypting stored passwords (gnutls, old, default)])], + [pwd_crypto="$withval"], [pwd_crypto="default"]) AS_IF([test x"$pwd_crypto" = xdefault], [ AS_IF([test x"$enable_gnutls" = xyes], [ @@ -585,9 +585,9 @@ dnl ************************ dnl Checks for GTK PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.20 cairo) -AC_ARG_ENABLE(deprecated, - [ --disable-deprecated Disable deprecated GTK functions], - gtkdeprecated=$enableval) +AC_ARG_ENABLE([deprecated], + [AS_HELP_STRING([--disable-deprecated], [Disable deprecated GTK functions])], + [gtkdeprecated=$enableval]) AC_MSG_CHECKING([whether to use deprecated GTK functions]) AS_IF([test x"$gtkdeprecated" != xno], [ AC_MSG_RESULT(yes) @@ -1075,129 +1075,129 @@ dnl dnl All plugins are auto-enabled except for Demo which is just there to help dnl potential plugins writers. -AC_ARG_ENABLE(acpi_notifier-plugin, - [ --disable-acpi_notifier-plugin Do not build acpi_notifier plugin], +AC_ARG_ENABLE([acpi_notifier-plugin], + [AS_HELP_STRING([--disable-acpi_notifier-plugin], [Do not build acpi_notifier plugin])], [enable_acpi_notifier_plugin=$enableval], [enable_acpi_notifier_plugin=auto]) -AC_ARG_ENABLE(address_keeper-plugin, - [ --disable-address_keeper-plugin Do not build address_keeper plugin], +AC_ARG_ENABLE([address_keeper-plugin], + [AS_HELP_STRING([--disable-address_keeper-plugin], [Do not build address_keeper plugin])], [enable_address_keeper_plugin=$enableval], [enable_address_keeper_plugin=auto]) -AC_ARG_ENABLE(archive-plugin, - [ --disable-archive-plugin Do not build archive plugin], +AC_ARG_ENABLE([archive-plugin], + [AS_HELP_STRING([--disable-archive-plugin], [Do not build archive plugin])], [enable_archive_plugin=$enableval], [enable_archive_plugin=auto]) -AC_ARG_ENABLE(att_remover-plugin, - [ --disable-att_remover-plugin Do not build att_remover plugin], +AC_ARG_ENABLE([att_remover-plugin], + [AS_HELP_STRING([--disable-att_remover-plugin], [Do not build att_remover plugin])], [enable_att_remover_plugin=$enableval], [enable_att_remover_plugin=auto]) -AC_ARG_ENABLE(attachwarner-plugin, - [ --disable-attachwarner-plugin Do not build attachwarner plugin], +AC_ARG_ENABLE([attachwarner-plugin], + [AS_HELP_STRING([--disable-attachwarner-plugin], [Do not build attachwarner plugin])], [enable_attachwarner_plugin=$enableval], [enable_attachwarner_plugin=auto]) -AC_ARG_ENABLE(bogofilter-plugin, - [ --disable-bogofilter-plugin Do not build bogofilter plugin], +AC_ARG_ENABLE([bogofilter-plugin], + [AS_HELP_STRING([--disable-bogofilter-plugin], [Do not build bogofilter plugin])], [enable_bogofilter_plugin=$enableval], [enable_bogofilter_plugin=auto]) -AC_ARG_ENABLE(bsfilter-plugin, - [ --disable-bsfilter-plugin Do not build bsfilter plugin], +AC_ARG_ENABLE([bsfilter-plugin], + [AS_HELP_STRING([--disable-bsfilter-plugin], [Do not build bsfilter plugin])], [enable_bsfilter_plugin=$enableval], [enable_bsfilter_plugin=auto]) -AC_ARG_ENABLE(clamd-plugin, - [ --disable-clamd-plugin Do not build clamd plugin], +AC_ARG_ENABLE([clamd-plugin], + [AS_HELP_STRING([--disable-clamd-plugin], [Do not build clamd plugin])], [enable_clamd_plugin=$enableval], [enable_clamd_plugin=auto]) -AC_ARG_ENABLE(dillo-plugin, - [ --disable-dillo-plugin Do not build dillo plugin], +AC_ARG_ENABLE([dillo-plugin], + [AS_HELP_STRING([--disable-dillo-plugin], [Do not build dillo plugin])], [enable_dillo_plugin=$enableval], [enable_dillo_plugin=auto]) -AC_ARG_ENABLE(fancy-plugin, - [ --disable-fancy-plugin Do not build fancy plugin], +AC_ARG_ENABLE([fancy-plugin], + [AS_HELP_STRING([--disable-fancy-plugin], [Do not build fancy plugin])], [enable_fancy_plugin=$enableval], [enable_fancy_plugin=auto]) -AC_ARG_ENABLE(fetchinfo-plugin, - [ --disable-fetchinfo-plugin Do not build fetchinfo plugin], +AC_ARG_ENABLE([fetchinfo-plugin], + [AS_HELP_STRING([--disable-fetchinfo-plugin], [Do not build fetchinfo plugin])], [enable_fetchinfo_plugin=$enableval], [enable_fetchinfo_plugin=auto]) -AC_ARG_ENABLE(keyword_warner-plugin, - [ --disable-keyword_warner-plugin Do not build keyword_warner plugin], +AC_ARG_ENABLE([keyword_warner-plugin], + [AS_HELP_STRING([--disable-keyword_warner-plugin], [Do not build keyword_warner plugin])], [enable_keyword_warner_plugin=$enableval], [enable_keyword_warner_plugin=auto]) -AC_ARG_ENABLE(libravatar-plugin, - [ --disable-libravatar-plugin Do not build libravatar plugin], +AC_ARG_ENABLE([libravatar-plugin], + [AS_HELP_STRING([--disable-libravatar-plugin], [Do not build libravatar plugin])], [enable_libravatar_plugin=$enableval], [enable_libravatar_plugin=auto]) -AC_ARG_ENABLE(litehtml_viewer-plugin, - [ --disable-litehtml_viewer-plugin Do not build litehtml_viewer plugin], +AC_ARG_ENABLE([litehtml_viewer-plugin], + [AS_HELP_STRING([--disable-litehtml_viewer-plugin], [Do not build litehtml_viewer plugin])], [enable_litehtml_viewer_plugin=$enableval], [enable_litehtml_viewer_plugin=auto]) -AC_ARG_ENABLE(mailmbox-plugin, - [ --disable-mailmbox-plugin Do not build mailmbox plugin], +AC_ARG_ENABLE([mailmbox-plugin], + [AS_HELP_STRING([--disable-mailmbox-plugin], [Do not build mailmbox plugin])], [enable_mailmbox_plugin=$enableval], [enable_mailmbox_plugin=auto]) -AC_ARG_ENABLE(managesieve-plugin, - [ --disable-managesieve-plugin Do not build managesieve plugin], +AC_ARG_ENABLE([managesieve-plugin], + [AS_HELP_STRING([--disable-managesieve-plugin], [Do not build managesieve plugin])], [enable_managesieve_plugin=$enableval], [enable_managesieve_plugin=auto]) -AC_ARG_ENABLE(newmail-plugin, - [ --disable-newmail-plugin Do not build newmail plugin], +AC_ARG_ENABLE([newmail-plugin], + [AS_HELP_STRING([--disable-newmail-plugin], [Do not build newmail plugin])], [enable_newmail_plugin=$enableval], [enable_newmail_plugin=auto]) -AC_ARG_ENABLE(notification-plugin, - [ --disable-notification-plugin Do not build notification plugin], +AC_ARG_ENABLE([notification-plugin], + [AS_HELP_STRING([--disable-notification-plugin], [Do not build notification plugin])], [enable_notification_plugin=$enableval], [enable_notification_plugin=auto]) -AC_ARG_ENABLE(pdf_viewer-plugin, - [ --disable-pdf_viewer-plugin Do not build pdf_viewer plugin], +AC_ARG_ENABLE([pdf_viewer-plugin], + [AS_HELP_STRING([--disable-pdf_viewer-plugin], [Do not build pdf_viewer plugin])], [enable_pdf_viewer_plugin=$enableval], [enable_pdf_viewer_plugin=auto]) -AC_ARG_ENABLE(perl-plugin, - [ --disable-perl-plugin Do not build perl plugin], +AC_ARG_ENABLE([perl-plugin], + [AS_HELP_STRING([--disable-perl-plugin], [Do not build perl plugin])], [enable_perl_plugin=$enableval], [enable_perl_plugin=auto]) -AC_ARG_ENABLE(python-plugin, - [ --disable-python-plugin Do not build python plugin], +AC_ARG_ENABLE([python-plugin], + [AS_HELP_STRING([--disable-python-plugin], [Do not build python plugin])], [enable_python_plugin=$enableval], [enable_python_plugin=auto]) -AC_ARG_ENABLE(pgpcore-plugin, - [ --disable-pgpcore-plugin Do not build pgpcore plugin], +AC_ARG_ENABLE([pgpcore-plugin], + [AS_HELP_STRING([--disable-pgpcore-plugin], [Do not build pgpcore plugin])], [enable_pgpcore_plugin=$enableval], [enable_pgpcore_plugin=auto]) -AC_ARG_ENABLE(pgpmime-plugin, - [ --disable-pgpmime-plugin Do not build pgpmime plugin], +AC_ARG_ENABLE([pgpmime-plugin], + [AS_HELP_STRING([--disable-pgpmime-plugin], [Do not build pgpmime plugin])], [enable_pgpmime_plugin=$enableval], [enable_pgpmime_plugin=auto]) -AC_ARG_ENABLE(pgpinline-plugin, - [ --disable-pgpinline-plugin Do not build pgpinline plugin], +AC_ARG_ENABLE([pgpinline-plugin], + [AS_HELP_STRING([--disable-pgpinline-plugin], [Do not build pgpinline plugin])], [enable_pgpinline_plugin=$enableval], [enable_pgpinline_plugin=auto]) -AC_ARG_ENABLE(rssyl-plugin, - [ --disable-rssyl-plugin Do not build rssyl plugin], +AC_ARG_ENABLE([rssyl-plugin], + [AS_HELP_STRING([--disable-rssyl-plugin], [Do not build rssyl plugin])], [enable_rssyl_plugin=$enableval], [enable_rssyl_plugin=auto]) -AC_ARG_ENABLE(smime-plugin, - [ --disable-smime-plugin Do not build smime plugin], +AC_ARG_ENABLE([smime-plugin], + [AS_HELP_STRING([--disable-smime-plugin], [Do not build smime plugin])], [enable_smime_plugin=$enableval], [enable_smime_plugin=auto]) -AC_ARG_ENABLE(spamassassin-plugin, - [ --disable-spamassassin-plugin Do not build spamassassin plugin], +AC_ARG_ENABLE([spamassassin-plugin], + [AS_HELP_STRING([--disable-spamassassin-plugin], [Do not build spamassassin plugin])], [enable_spamassassin_plugin=$enableval], [enable_spamassassin_plugin=auto]) -AC_ARG_ENABLE(spam_report-plugin, - [ --disable-spam_report-plugin Do not build spam_report plugin], +AC_ARG_ENABLE([spam_report-plugin], + [AS_HELP_STRING([--disable-spam_report-plugin], [Do not build spam_report plugin])], [enable_spam_report_plugin=$enableval], [enable_spam_report_plugin=auto]) -AC_ARG_ENABLE(tnef_parse-plugin, - [ --disable-tnef_parse-plugin Do not build tnef_parse plugin], +AC_ARG_ENABLE([tnef_parse-plugin], + [AS_HELP_STRING([--disable-tnef_parse-plugin], [Do not build tnef_parse plugin])], [enable_tnef_parse_plugin=$enableval], [enable_tnef_parse_plugin=auto]) -AC_ARG_ENABLE(vcalendar-plugin, - [ --disable-vcalendar-plugin Do not build vcalendar plugin], +AC_ARG_ENABLE([vcalendar-plugin], + [AS_HELP_STRING([--disable-vcalendar-plugin], [Do not build vcalendar plugin])], [enable_vcalendar_plugin=$enableval], [enable_vcalendar_plugin=auto]) dnl disabled by default -AC_ARG_ENABLE(demo-plugin, - [ --enable-demo-plugin Build demo plugin], +AC_ARG_ENABLE([demo-plugin], + [AS_HELP_STRING([--enable-demo-plugin], [Build demo plugin])], [enable_demo_plugin=$enableval], [enable_demo_plugin=no]) -- 2.52.0