From b6989285d43cad6a89bfd84c5851affd58566fb1 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gmx.de>
Date: Fri, 28 Nov 2025 09:31:22 +0100
Subject: [PATCH 1/2] configure.ac: Use m4sh syntax where appropriate

See https://autotools.info/autoconf/m4sh.html
---
 configure.ac | 1051 +++++++++++++++++++++++++-------------------------
 1 file changed, 526 insertions(+), 525 deletions(-)

diff --git a/configure.ac b/configure.ac
index e4823e0c4..cd8b073ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,9 @@ EXTRA_GTK3_VERSION=
 
 GIT_VERSION=m4_defn([claws_VERSION])
 
-if test \( -z "$GIT_VERSION" \); then
+AS_IF([test -z "$GIT_VERSION"], [
 	AC_MSG_ERROR([*** could not determine program version])
-fi
+])
 
 MAJOR_VERSION=${GIT_VERSION%%.*}
 MINOR_VERSION=${GIT_VERSION#*.}
@@ -34,16 +34,16 @@ MICRO_VERSION=${MICRO_VERSION%%-*}
 EXTRA_VERSION=${GIT_VERSION#*-}
 EXTRA_VERSION=${EXTRA_VERSION%%-*}
 
-if test \( "x$EXTRA_VERSION" != "x" -a `echo -n $EXTRA_VERSION | wc -c` -lt 5 \); then
+AS_IF([test "x$EXTRA_VERSION" != "x" -a `echo -n $EXTRA_VERSION | wc -c` -lt 5], [
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}git${EXTRA_VERSION}
-else
+], [
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
     EXTRA_VERSION=0
-fi
+])
 
-if test \( "x$EXTRA_RELEASE" != "x" \); then
+AS_IF([test "x$EXTRA_RELEASE" != "x"], [
     VERSION=${VERSION}${EXTRA_RELEASE}${EXTRA_GTK3_VERSION}
-fi
+])
 
 dnl AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 dnl AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
@@ -115,9 +115,9 @@ dnl CXX exists.
 AC_PROG_CXX
 AC_PATH_PROG(REAL_CXX, $CXX)
 HAVE_CXX=no
-if test -n "$REAL_CXX"; then
+AS_IF([test -n "$REAL_CXX"], [
 	HAVE_CXX=yes
-fi
+])
 
 AC_SYS_LARGEFILE
 
@@ -130,46 +130,46 @@ dnl AC_CANONICAL_HOST
 
 dnl Copied from the official gtk+-2 configure.in
 AC_MSG_CHECKING([for host platform])
-case "$host" in
-  *-*-mingw*|*-*-cygwin*)
+AS_CASE(["$host"],
+  [*-*-mingw*|*-*-cygwin*], [
     platform_win32=yes
     LDFLAGS="$LDFLAGS -mwindows -Wl,--export-all-symbols"
-    ;;
-	*-apple-*)
-		platform_osx=yes
-		LDFLAGS="$LDFLAGS -Wl,-export_dynamic"
-		;;
-  *)
+  ],
+  [*-apple-*], [
+    platform_osx=yes
+    LDFLAGS="$LDFLAGS -Wl,-export_dynamic"
+  ],
+  [
     platform_win32=no
-		platform_osx=no
-		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
-    ;;
-esac
+    platform_osx=no
+    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+  ]
+)
 AM_CONDITIONAL(PLATFORM_WIN32, test x"$platform_win32" = x"yes")
 AM_CONDITIONAL(PLATFORM_OSX, test x"$platform_osx" = x"yes")
 AC_MSG_RESULT([$host])
 
 AC_MSG_CHECKING([for native Win32])
-case "$host" in
-  *-*-mingw*)
+AS_CASE(["$host"],
+  [*-*-mingw*], [
     os_win32=yes
-    ;;
-  *)
+  ],
+  [
     os_win32=no
-    ;;
-esac
+  ]
+)
 AC_MSG_RESULT([$os_win32])
 AM_CONDITIONAL(OS_WIN32, test x"$os_win32" = x"yes")
 
 AC_MSG_CHECKING([for Cygwin])
-case "$host" in
-  *-*-cygwin*)
+AS_CASE(["$host"],
+  [*-*-cygwin*], [
     env_cygwin=yes
-    ;;
-  *)
+  ],
+  [
     env_cygwin=no
-    ;;
-esac
+  ]
+)
 AC_MSG_RESULT([$env_cygwin])
 AM_CONDITIONAL(CYGWIN, test x"$env_cygwin" = x"yes")
 
@@ -185,19 +185,19 @@ AC_COMPILE_IFELSE([
 	[time_t_long_long=no])
 CFLAGS=$_gcc_cflags_save
 
-if test x"$time_t_long_long" = xyes; then
+AS_IF([test x"$time_t_long_long" = xyes], [
 	time_t_fmt=lld
-else
+], [
 	time_t_fmt=ld
-fi
+])
 AC_MSG_RESULT([$time_t_fmt])
 AC_DEFINE_UNQUOTED([CM_TIME_FORMAT], ["$time_t_fmt"],
 	[Define printf format specifier for time_t])
 
 AM_CFLAGS="-Wall"
-if test $USE_MAINTAINER_MODE = yes; then
+AS_IF([test $USE_MAINTAINER_MODE = yes], [
 	AM_CFLAGS="$AM_CFLAGS -g"
-fi
+])
 
 AC_MSG_CHECKING([if gcc supports -Wno-pointer-sign])
 _gcc_cflags_save=$CFLAGS
@@ -205,28 +205,28 @@ CFLAGS="-Wno-pointer-sign"
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],_gcc_psign=yes,_gcc_psign=no)
 AC_MSG_RESULT($_gcc_psign)
 CFLAGS=$_gcc_cflags_save;
-if test x"$_gcc_psign" = xyes ; then
+AS_IF([test x"$_gcc_psign" = xyes], [
 	AM_CFLAGS="$AM_CFLAGS -Wno-pointer-sign"
-fi
+])
 
 pthread_name=
-case "$target" in
-*-darwin*)
+AS_CASE(["$target"],
+  [*-darwin*], [
 	AM_CFLAGS="$AM_CFLAGS -fno-common"
-	;;
-*-*-mingw*)
+  ],
+  [*-*-mingw*], [
 	# Note that we need to link to pthread in all cases. This
 	# is because some locking is used even when pthread support is
 	# disabled.
 	pthread_name=pthread
 	AM_CFLAGS="$AM_CFLAGS -mms-bitfields"
 	LIBS="$LIBS -l${pthread_name} -lws2_32 -lregex"
-	;;
-*-*-solaris*)
+  ],
+  [*-*-solaris*], [
 	AM_CFLAGS="$AM_CFLAGS -std=gnu99"
 	AC_DEFINE([SOLARIS], [], [Target is Solaris])
-	;;
-esac
+  ]
+)
 
 AC_SUBST(AM_CFLAGS)
 
@@ -358,48 +358,48 @@ AM_CONDITIONAL(MANUAL_TXT, test -n "$DOCBOOK2TXT")
 AM_CONDITIONAL(MANUAL_PDF, test -n "$DOCBOOK2PDF")
 AM_CONDITIONAL(MANUAL_PS, test -n "$DOCBOOK2PS")
 
-if test x"$enable_manual" = x"yes"; then
-    if test -n "$DOCBOOK2TXT" -o -n "$DOCBOOK2HTML" \
-	-o -n "$DOCBOOK2PS" -o -n "$DOCBOOK2PDF"; then
+AS_IF([test x"$enable_manual" = x"yes"], [
+    AS_IF([test -n "$DOCBOOK2TXT" -o -n "$DOCBOOK2HTML" \
+	-o -n "$DOCBOOK2PS" -o -n "$DOCBOOK2PDF"], [
 	    enable_manual=yes
-	else
+	], [
 	    enable_manual=no
-    fi
-fi
+    ])
+])
 
 AM_CONDITIONAL(BUILD_MANUAL, test x"$enable_manual" = xyes)
 
 dnl Set PACKAGE_DATA_DIR in config.h.
-if test "x${datarootdir}" = 'x${prefix}/share'; then
-	if test "x${prefix}" = "xNONE"; then
+AS_IF([test "x${datarootdir}" = 'x${prefix}/share'], [
+	AS_IF([test "x${prefix}" = "xNONE"], [
     		AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}",[PACKAGE_DATA_DIR])
-  	else
+	], [
     		AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}",[PACKAGE_DATA_DIR])
-  	fi
-else
+	])
+], [
 	AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datarootdir}/${PACKAGE}",[PACKAGE_DATA_DIR])
-fi
+])
 
 AC_CHECK_LIB(xpg4, setlocale)
 
 SM_LIBS=""
 dnl Check for LibSM
 AC_MSG_CHECKING([whether to use LibSM])
-if test x"$enable_libsm" = xyes; then
+AS_IF([test x"$enable_libsm" = xyes] ,[
 	AC_MSG_RESULT(yes)
 	AC_CHECK_LIB(SM, SmcSaveYourselfDone,
 		[SM_LIBS="$X_LIBS -lSM -lICE"],enable_libsm=no,
 		$X_LIBS -lICE)
 	AC_CHECK_HEADERS(X11/SM/SMlib.h,,enable_libsm=no)
-	if test x"$enable_libsm" = xyes; then
+	AS_IF([test x"$enable_libsm" = xyes], [
 		AC_DEFINE(HAVE_LIBSM, 1, [Define to 1 if you have libSM installed])
-	else
+	], [
 		AC_MSG_RESULT(not found)
 		AC_MSG_WARN([*** LibSM will not be supported ***])
-	fi
-else
+	])
+], [
 	AC_MSG_RESULT(no)
-fi
+])
 AC_SUBST(SM_LIBS)
 
 dnl Check for __VA_OPT__ macro
@@ -408,9 +408,9 @@ AC_CACHE_CHECK([for __VA_OPT__],
 	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[#define va_opt_printf(format, ...) fprintf(stderr, format __VA_OPT__(,) __VA_ARGS__)
 		va_opt_printf("success\n");]])],[ac_cv_va_opt=yes],[ac_cv_va_opt=no])]
 )
-if test "$ac_cv_va_opt" = yes; then
+AS_IF([test "$ac_cv_va_opt" = yes], [
 	AC_DEFINE([HAVE_VA_OPT], [1], [Define if __VA_OPT__ macro works])
-fi
+])
 
 dnl Checks for header files.
 AC_HEADER_SYS_WAIT
@@ -452,16 +452,16 @@ PKG_CHECK_MODULES(GDK_PIXBUF, [gdk-pixbuf-2.0 >= 2.26])
 dnl check for IPv6 option
 dnl automated checks for IPv6 support.
 AC_MSG_CHECKING([whether to use IPv6])
-if test x"$enable_ipv6" = xyes; then
+AS_IF([test x"$enable_ipv6" = xyes], [
 	AC_MSG_RESULT(yes)
 	AC_MSG_CHECKING([for IPv6 support])
-	if test x"$platform_win32" = xyes; then
+	AS_IF([test x"$platform_win32" = xyes], [
 		AC_CACHE_VAL(ac_cv_ipv6,[
 			AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 					#include <ws2tcpip.h>
 				]], [[struct in6_addr a;]])],[ac_cv_ipv6=yes],[ac_cv_ipv6=no])
 		])
-	else
+	], [
 		AC_CACHE_VAL(ac_cv_ipv6,[
 			AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 					#define INET6
@@ -469,22 +469,22 @@ if test x"$enable_ipv6" = xyes; then
 					#include <netinet/in.h>
 				]], [[int x = IPPROTO_IPV6; struct in6_addr a;]])],[ac_cv_ipv6=yes],[ac_cv_ipv6=no])
 		])
-	fi
+	])
 	AC_MSG_RESULT($ac_cv_ipv6)
-	if test $ac_cv_ipv6 = yes; then
+	AS_IF([test $ac_cv_ipv6 = yes], [
 		AC_DEFINE(INET6, 1, Define if you want IPv6 support.)
-	else
+	], [
 		AC_MSG_WARN(*** IPv6 will not be supported ***)
 		enable_ipv6=no
-	fi
-else
+	])
+], [
 	AC_MSG_RESULT(no)
-fi
+])
 
 dnl GNUTLS
 AC_MSG_CHECKING([whether to use GnuTLS])
 AC_MSG_RESULT($enable_gnutls)
-if test "x$enable_gnutls" != "xno"; then
+AS_IF([test "x$enable_gnutls" != "xno"], [
         PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.2,
         [
                 AC_DEFINE(USE_GNUTLS, 1, gnutls)
@@ -506,7 +506,7 @@ if test "x$enable_gnutls" != "xno"; then
         ])
         AC_SUBST(GNUTLS_LIBS)
         AC_SUBST(GNUTLS_CFLAGS)
-fi
+])
 
 PKG_CHECK_MODULES(NETTLE, nettle)
 AC_SUBST(NETTLE_LIBS)
@@ -521,62 +521,62 @@ AC_ARG_WITH(config-dir,    [  --with-config-dir=RCDIR      Local configuration d
 	      ac_cv_with_config_dir="$withval", ac_cv_with_config_dir="")
 
 dnl Set correct default value based on platform
-if test x"$ac_cv_with_config_dir" = x""; then
-	if test x"$platform_win32" = xyes; then
+AS_IF([test x"$ac_cv_with_config_dir" = x""], [
+	AS_IF([test x"$platform_win32" = xyes], [
 		ac_cv_with_config_dir="Claws-mail"
-	else
+	], [
 		ac_cv_with_config_dir=".claws-mail"
-	fi
-fi
+	])
+])
 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")
 
-if test x"$pwd_crypto" = xdefault; then
-	if test x"$enable_gnutls" = xyes; then
-		if `$PKG_CONFIG --atleast-version=3.0 gnutls`; then
+AS_IF([test x"$pwd_crypto" = xdefault], [
+	AS_IF([test x"$enable_gnutls" = xyes], [
+		AS_IF([`$PKG_CONFIG --atleast-version=3.0 gnutls`], [
 			pwd_crypto="gnutls"
-		fi
-	fi
-fi
-if test x"$pwd_crypto" = xdefault; then
+		])
+	])
+])
+AS_IF([test x"$pwd_crypto" = xdefault], [
 	pwd_crypto="old"
-fi
+])
 
-case $pwd_crypto in
-	gnutls)
-		if test x"$enable_gnutls" = xno; then
+AS_CASE([$pwd_crypto],
+	[gnutls], [
+		AS_IF([test x"$enable_gnutls" = xno], [
 			AC_MSG_ERROR([GnuTLS password encryption requested but GnuTLS is not available.])
-		fi
-		if ! `$PKG_CONFIG --atleast-version=3.0 gnutls`; then
+		])
+		AS_IF([! `$PKG_CONFIG --atleast-version=3.0 gnutls`], [
 			AC_MSG_ERROR([GnuTLS version at least 3.0 is required for password encryption.])
-		fi
+		])
 		AC_DEFINE(PASSWORD_CRYPTO_GNUTLS, 1, Use GnuTLS for stored password encryption)
-		;;
-	old)
+	],
+	[old], [
 		AC_DEFINE(PASSWORD_CRYPTO_OLD, 1, Use old insecure method for stored password encryption)
-		;;
-	*)
+	],
+	[
 		AC_MSG_ERROR([Unknown password encryption provider requested.])
-		;;
-esac
+	]
+)
 
 AC_MSG_CHECKING([whether GnuTLS support is present for OAuth2])
-if test x"$enable_gnutls" = xyes; then
+AS_IF([test x"$enable_gnutls" = xyes], [
 	AC_MSG_RESULT([yes])
 	AC_MSG_CHECKING([whether to build OAuth2 support])
-	if test x"$enable_oauth2" = xyes; then
+	AS_IF([test x"$enable_oauth2" = xyes], [
 		AC_MSG_RESULT([yes])
 		AC_DEFINE(USE_OAUTH2, 1, [Define if OAuth2 is to be activated.])
-	else
+	], [
 		AC_MSG_RESULT([no])
 		enable_oauth2=no
-	fi
-else
+	])
+], [
 	AC_MSG_RESULT([no])
 	enable_oauth2=no
-fi
+])
 
 dnl ************************
 dnl ** GTK user interface **
@@ -589,12 +589,12 @@ AC_ARG_ENABLE(deprecated,
 		[  --disable-deprecated            Disable deprecated GTK functions],
 		gtkdeprecated=$enableval)
 AC_MSG_CHECKING([whether to use deprecated GTK functions])
-if test x"$gtkdeprecated" != xno; then
+AS_IF([test x"$gtkdeprecated" != xno], [
 	AC_MSG_RESULT(yes)
-else
+], [
 	GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
 	AC_MSG_RESULT(no)
-fi
+])
 
 dnl Make sure the code does not regress to using deprecated GTK stuff...
 GTK_CFLAGS="$GTK_CFLAGS -DGTK_DISABLE_SINGLE_INCLUDES -DGSEAL_ENABLE"
@@ -605,7 +605,7 @@ AC_SUBST(GTK_LIBS)
 dnl enchant is used for spell checking
 AC_MSG_CHECKING([whether to use enchant])
 AC_MSG_RESULT($enable_enchant)
-if test $enable_enchant = yes; then
+AS_IF([test $enable_enchant = yes], [
 	PKG_CHECK_MODULES(ENCHANT, enchant >= 1.4.0,
 	[
 		AC_DEFINE(USE_ENCHANT, 1, enchant)
@@ -626,75 +626,75 @@ if test $enable_enchant = yes; then
 	])
 	AC_SUBST(ENCHANT_CFLAGS)
 	AC_SUBST(ENCHANT_LIBS)
-fi
+])
 
 dnl want crash dialog
-if test $enable_crash_dialog = yes; then
+AS_IF([test $enable_crash_dialog = yes], [
 dnl check if GDB is somewhere
 	AC_CHECK_PROG(enable_crash_dialog, gdb, yes, no)
 	AC_MSG_CHECKING([whether to use crash dialog])
-	if test $enable_crash_dialog = yes; then
+	AS_IF([test $enable_crash_dialog = yes], [
 		AC_DEFINE(CRASH_DIALOG, 1, Pop up crash dialog)
-	fi
+	])
 	AC_MSG_RESULT($enable_crash_dialog)
-fi
+])
 
 dnl generic umpc
-if test $enable_generic_umpc = yes; then
+AS_IF([test $enable_generic_umpc = yes], [
 	AC_DEFINE(GENERIC_UMPC, 1, Generic UMPC code)
 	AC_MSG_RESULT($enable_generic_umpc)
-fi
+])
 
 dnl Check for X-Face support
 AC_MSG_CHECKING([whether to use compface])
-if test x"$enable_compface" = xyes; then
+AS_IF([test x"$enable_compface" = xyes], [
 	AC_MSG_RESULT(yes)
 	AC_CHECK_LIB(compface, uncompface,
 		[AC_DEFINE(HAVE_LIBCOMPFACE, 1, Define if you want compface support.)],
 		[enable_compface=no])
-	if test x"$enable_compface" = xyes; then
+	AS_IF([test x"$enable_compface" = xyes], [
 		COMPFACE_LIBS="-lcompface"
-	else
+	], [
 		COMPFACE_LIBS=""
-	fi
+	])
 	AC_SUBST(COMPFACE_LIBS)
-else
+], [
 	AC_MSG_RESULT(no)
-fi
+])
 
 dnl check for pthread support
 AC_MSG_CHECKING([whether to use pthread])
-if test x$enable_pthread = xno; then
+AS_IF([test x$enable_pthread = xno], [
 	AC_MSG_RESULT(no)
-else
+], [
 	AC_MSG_RESULT(yes)
 
         # For W32 we need to use a special ptrhead lib. In this case we can't
         # use AC_CHECK_LIB because it has no means of checking for a
         # library installed under a different name.  Checking for the
         # header is okay.
-        if test -n "${pthread_name}" ; then
+        AS_IF([test -n "${pthread_name}"], [
            enable_pthread=yes
-        else
-	AC_CHECK_LIB(pthread, pthread_create, :, enable_pthread=no)
-        fi
+        ], [
+	   AC_CHECK_LIB(pthread, pthread_create, :, enable_pthread=no)
+        ])
 	AC_CHECK_HEADERS(pthread.h, :, enable_pthread=no)
 
-	if test x$enable_pthread = xyes; then
+	AS_IF([test x$enable_pthread = xyes], [
 		AC_DEFINE(USE_PTHREAD, 1, Define if you have pthread)
-                if test -z "${pthread_name}" ; then
-		PTHREAD_LIBS="-lpthread"
-	fi
-	fi
+                AS_IF([test -z "${pthread_name}"], [
+		    PTHREAD_LIBS="-lpthread"
+		])
+	])
 
-fi
+])
 AC_SUBST(PTHREAD_LIBS)
 
 dnl
 dnl Check whether we need to pass -lresolv
 dnl We know that we don't need it for W32.
 dnl
-if test x$os_win32 = xno; then
+AS_IF([test x$os_win32 = xno], [
   t_oldLibs="$LIBS"
   LIBS="$LIBS"
   ac_cv_var__res_options=no
@@ -703,16 +703,16 @@ if test x$os_win32 = xno; then
 	     #include <netinet/in.h>
  	     #include <arpa/nameser.h>
 	     #include <resolv.h>]], [[_res.options = RES_INIT;]])],[ac_cv_var__res_options=yes],[]);
-  if test "$ac_cv_var__res_options" != "yes"; then
+  AS_IF([test "$ac_cv_var__res_options" != "yes"], [
 	LIBRESOLV="-lresolv"
-  fi
+  ])
   LIBS="$t_oldLibs"
 
-  if test "x$LIBRESOLV" = "x"; then
+  AS_IF([test "x$LIBRESOLV" = "x"], [
 	AC_CHECK_LIB(resolv, res_query, [LIBRESOLV=-lresolv])
 	LIBS="$t_oldLibs"
-  fi
-fi
+  ])
+])
 AC_SUBST(LIBRESOLV)
 
 LIBS="$LIBS $LIBRESOLV"
@@ -720,7 +720,7 @@ LIBS="$LIBS $LIBRESOLV"
 dnl #######################################################################
 dnl # Check for startup notification
 dnl #######################################################################
-if test "x$enable_startup_notification" = "xyes"; then
+AS_IF([test "x$enable_startup_notification" = "xyes"], [
 	PKG_CHECK_MODULES(STARTUP_NOTIFICATION, libstartup-notification-1.0 >= 0.5,
 	[
 		AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, [Define if we're using libstartup-notification.])
@@ -734,12 +734,12 @@ if test "x$enable_startup_notification" = "xyes"; then
 
 	AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
 	AC_SUBST(STARTUP_NOTIFICATION_LIBS)
-fi
+])
 
 dnl #######################################################################
 dnl # Check for D-Bus support
 dnl #######################################################################
-if test "x$enable_dbus" = "xyes"; then
+AS_IF([test "x$enable_dbus" = "xyes"], [
 	PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.60, dbus-glib-1 >= 0.60],
 	[
 		AC_DEFINE(HAVE_DBUS_GLIB, 1, [Define if glib bindings of D-Bus are available])
@@ -751,7 +751,7 @@ if test "x$enable_dbus" = "xyes"; then
 	])
 	AC_SUBST(DBUS_CFLAGS)
 	AC_SUBST(DBUS_LIBS)
-fi
+])
 
 dnl #######################################################################
 dnl # Configure address book support
@@ -761,10 +761,10 @@ dnl #######################################################################
 dnl # Check for alternate address book support
 dnl #######################################################################
 AC_MSG_CHECKING([whether DBUS support for alternate address book is present])
-if test x"$enable_dbus" = xyes; then
+AS_IF([test x"$enable_dbus" = xyes], [
 	AC_MSG_RESULT([yes])
 	AC_MSG_CHECKING([whether to enable alternate address book])
-	if test x"$enable_alternate_addressbook" = xyes; then
+	AS_IF([test x"$enable_alternate_addressbook" = xyes], [
 		AC_MSG_RESULT([yes])
 		PKG_CHECK_MODULES(CONTACTS, [claws-contacts],
 		[
@@ -776,34 +776,34 @@ if test x"$enable_dbus" = xyes; then
 		[
 			enable_alternate_addressbook=no
 		])
-	else
+	], [
 		AC_MSG_RESULT([no])
 		enable_alternate_addressbook=no
-	fi
-else
+	])
+], [
 	AC_MSG_RESULT([no])
 	enable_alternate_addressbook=no
-fi
+])
 
 dnl #######################################################################
 dnl # Check for old address book support
 dnl #######################################################################
-if test x"$enable_alternate_addressbook" = xno; then
+AS_IF([test x"$enable_alternate_addressbook" = xno], [
 	dnl for LDAP support in addressbook
 	dnl no check for libraries; dynamically loaded
 	AC_MSG_CHECKING([whether to use LDAP])
-	if test x"$enable_ldap" = xno; then
+	AS_IF([test x"$enable_ldap" = xno], [
 		AC_MSG_RESULT(no)
-	elif test x"$enable_ldap" = xyes -a x"$enable_pthread" = xno; then
+	], [test x"$enable_ldap" = xyes -a x"$enable_pthread" = xno], [
 		AC_MSG_RESULT(no - LDAP support needs pthread support)
 
 		enable_ldap=no
-	elif test x"$platform_win32" = xyes; then
+	], [test x"$platform_win32" = xyes], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(USE_LDAP, 1, Define if you want LDAP support in addressbook.)
 		LDAP_LIBS="-lwldap32"
 		AC_SUBST(LDAP_LIBS)
-	else
+	], [
 		AC_MSG_RESULT(yes)
 
 		dnl check for available libraries, and pull them in
@@ -817,7 +817,7 @@ if test x"$enable_alternate_addressbook" = xno; then
 				 [ enable_ldap=yes ],
 				 [ enable_ldap=no ])
 
-		if test "$enable_ldap" = yes; then
+		AS_IF([test "$enable_ldap" = yes], [
 			AC_CHECK_LIB(ldap, ldap_open,
 					 [ enable_ldap=yes ],
 					 [ enable_ldap=no ],
@@ -827,7 +827,7 @@ if test x"$enable_alternate_addressbook" = xno; then
 			 		     [ ac_cv_have_tls=yes ],
 			 		     [ ac_cv_have_tls=no ])
 
-		fi
+		])
 
 		AC_MSG_CHECKING([whether ldap library is available])
 		AC_MSG_RESULT($enable_ldap)
@@ -835,13 +835,13 @@ if test x"$enable_alternate_addressbook" = xno; then
 		AC_MSG_CHECKING([whether TLS library is available])
 		AC_MSG_RESULT($ac_cv_have_tls)
 
-		if test "$enable_ldap" = yes; then
+		AS_IF([test "$enable_ldap" = yes], [
 			AC_DEFINE(USE_LDAP, 1, Define if you want LDAP support in addressbook.)
 			LDAP_LIBS="$LDAP_LIBS -lldap"
 			AC_SUBST(LDAP_LIBS)
-			if test "$ac_cv_have_tls" = yes; then
+			AS_IF([test "$ac_cv_have_tls" = yes], [
 				AC_DEFINE(USE_LDAP_TLS, 1, Define if you want LDAP TLS support in addressbook.)
-			fi
+			])
 			dnl As of OpenLDAP API version 3000 a number of functions has
 			dnl been deprecated. As Claws-mail compiles and runs on many
 			dnl platforms and many versions of OpenLDAP we need to be able
@@ -865,42 +865,42 @@ if test x"$enable_alternate_addressbook" = xno; then
 				 AC_DEFINE(OPEN_LDAP_API_AT_LEAST_3000, 0, Define if OpenLDAP API is at least version 3000.)
 				 AC_DEFINE(LDAP_DEPRECATED, 1, Define to activate deprecated features in OpenLDAP)]
 			)
-		fi
-	fi
+		])
+	])
 
 	dnl for JPilot support in addressbook
 	dnl no check for libraries; these are dynamically loaded
 	AC_MSG_CHECKING([whether to use JPilot])
-	if test "$enable_jpilot" = yes; then
+	AS_IF([test "$enable_jpilot" = yes], [
 		AC_MSG_RESULT(yes)
 		AC_CHECK_HEADERS(pi-args.h pi-appinfo.h pi-address.h pi-version.h,
 				 [ AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.) ],
 				 [ enable_jpilot=no ])
-		if test "$enable_jpilot" = no; then
+		AS_IF([test "$enable_jpilot" = no], [
 			AC_CHECK_HEADERS(libpisock/pi-args.h libpisock/pi-appinfo.h libpisock/pi-address.h libpisock/pi-version.h,
 					 [ enable_jpilot=yes
 					   AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.) ])
-		fi
+		])
 
 		AC_CHECK_LIB(pisock, unpack_Address, [JPILOT_LIBS="-lpisock"], [JPILOT_LIBS="" enable_jpilot="no"])
-		if test x"$enable_jpilot" = xyes; then
+		AS_IF([test x"$enable_jpilot" = xyes], [
 			AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.)
-		else
+		], [
 			AC_MSG_NOTICE([JPilot support not available])
-		fi
+		])
 		AC_SUBST(JPILOT_LIBS)
-	else
+	], [
 		AC_MSG_RESULT(no)
-	fi
-fi
+	])
+])
 
 AM_CONDITIONAL(BUILD_ALTADDRBOOK, test x"$enable_alternate_addressbook" = x"yes")
 
 dnl #######################################################################
 dnl # Check for NetworkManager support
 dnl #######################################################################
-if test x"$enable_dbus" = xyes; then
-	if test x"$enable_networkmanager" = xyes; then
+AS_IF([test x"$enable_dbus" = xyes], [
+	AS_IF([test x"$enable_networkmanager" = xyes], [
 		PKG_CHECK_MODULES(NETWORKMANAGER_SUPPORT, libnm,
 		[
 			AC_DEFINE(HAVE_NETWORKMANAGER_SUPPORT, 1, [Define if NetworkManager support is to be included.])
@@ -912,15 +912,15 @@ if test x"$enable_dbus" = xyes; then
 			enable_networkmanager=no
 		])
 		AC_SUBST(NETWORKMANAGER_SUPPORT_CFLAGS)
-	fi
-else
+	])
+], [
 	echo "NetworkManager support deactivated as D-Bus requirements were not met."
 	enable_networkmanager=no
-fi
+])
 
 dnl Libetpan
 AC_MSG_CHECKING([whether to use libetpan])
-if test x"$enable_libetpan" = xyes; then
+AS_IF([test x"$enable_libetpan" = xyes], [
     AC_MSG_RESULT(yes)
 
     libetpan_config=no
@@ -936,57 +936,57 @@ if test x"$enable_libetpan" = xyes; then
     [
         # before 1.9.4, libetpan uses its own libetpan-config script
         AC_PATH_PROG(libetpanconfig, [libetpan-config])
-        if test "x$libetpanconfig" != "x"; then
+        AS_IF([test "x$libetpanconfig" != "x"], [
             LIBETPAN_CFLAGS="`$libetpanconfig --cflags`"
             LIBETPAN_LIBS="`$libetpanconfig --libs`"
             # support libetpan version like x.x and x.x.x
             libetpan_versiontype=`$libetpanconfig --version | tr -dc . | wc -c`
-            if test $libetpan_versiontype -eq 1; then
+            AS_IF([test $libetpan_versiontype -eq 1], [
                 LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'`
-            else
+            ], [
                 LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'`
-            fi
+            ])
             libetpan_config=yes
-        fi
+        ])
     ])
-    if test "x$libetpan_config" = "xyes"; then
+    AS_IF([test "x$libetpan_config" = "xyes"], [
         libetpan_save_CPPFLAGS=$CPPFLAGS
         CPPFLAGS="$CPPFLAGS $LIBETPAN_CFLAGS"
         AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes])
-        if test "x$libetpan_result" = "xyes"; then
+        AS_IF([test "x$libetpan_result" = "xyes"], [
             AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
             libetpan_save_LIBS=$LIBS
             LIBS="$LIBS $LIBETPAN_LIBS"
             AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <libetpan/dbstorage.h>]], [[db_mailstorage_init(NULL, NULL);]])],[libetpan_result=yes],[libetpan_result=no])
             LIBS=$libetpan_save_LIBS
             AC_MSG_RESULT([$libetpan_result])
-        fi
+        ])
         CPPFLAGS=$libetpan_save_CPPFLAGS
-    fi
-    if test "x$libetpan_result" = "xyes"; then
-        if test $libetpan_versiontype -eq 1; then
-            if test "$LIBETPAN_VERSION" -lt "57"; then
+    ])
+    AS_IF([test "x$libetpan_result" = "xyes"], [
+        AS_IF([test $libetpan_versiontype -eq 1], [
+            AS_IF([test "$LIBETPAN_VERSION" -lt "57"], [
                 AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
                 AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
                 AC_MSG_ERROR([libetpan 0.57 not found])
-            fi
-        fi
+            ])
+        ])
         AC_SUBST(LIBETPAN_CFLAGS)
         AC_SUBST(LIBETPAN_LIBS)
         AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNTP support.)
-    else
+    ], [
         AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ])
         AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
         AC_MSG_ERROR([libetpan 0.57 not found])
-    fi
-else
+    ])
+], [
     AC_MSG_RESULT(no)
-fi
+])
 AM_CONDITIONAL(CLAWS_LIBETPAN, test "x$libetpan_result" = "xyes")
 
 dnl librsvg
 AC_MSG_CHECKING([whether to use librsvg])
-if test x"$enable_svg" = xyes; then
+AS_IF([test x"$enable_svg" = xyes], [
 	AC_MSG_RESULT(yes)
     PKG_CHECK_MODULES([SVG], [librsvg-2.0 >= 2.39.0 cairo >= 1.0.0],
     [
@@ -999,12 +999,12 @@ if test x"$enable_svg" = xyes; then
 		AC_MSG_NOTICE([SVG support deactivated as librsvg2 >= 2.39.0 was not found])
 		enable_svg=no
 	])
-else
+], [
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to use valgrind])
-if test x$enable_valgrind = xyes; then
+AS_IF([test x$enable_valgrind = xyes], [
 	AC_MSG_RESULT(yes)
 	PKG_CHECK_MODULES([VALGRIND], [valgrind >= 2.4.0],
 	[
@@ -1015,17 +1015,17 @@ if test x$enable_valgrind = xyes; then
 		AC_MSG_NOTICE([valgrind support deactivated as valgrind >= 2.4.0 was not found])
 		enable_valgrind=no
 	])
-else
+], [
 	AC_MSG_RESULT(no)
-fi
+])
 AM_CONDITIONAL(CLAWS_VALGRIND, test x"$enable_valgrind" = x"yes")
 
 AC_MSG_CHECKING([whether to build unit tests])
-if test x$enable_tests = xyes; then
+AS_IF([test x$enable_tests = xyes], [
 	AC_MSG_RESULT(yes)
-else
+], [
 	AC_MSG_RESULT(no)
-fi
+])
 AM_CONDITIONAL(BUILD_TESTS, test "x$enable_tests" = "xyes")
 
 dnl ==================================
@@ -1035,31 +1035,31 @@ dnl ==================================
 more_debug_output_modules=""
 
 AC_MSG_CHECKING([whether to build addressbook with more debug calls])
-if test x$enable_more_addressbook_debug = xyes; then
+AS_IF([test x$enable_more_addressbook_debug = xyes], [
 	more_debug_output_modules="$more_debug_output_modules AddressBook"
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(DEBUG_ADDRBOOK, 1, [Define if you want additional addressbook debug calls])
-else
+], [
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build LDAP with more debug calls])
-if test x$enable_more_ldap_debug = xyes; then
+AS_IF([test x$enable_more_ldap_debug = xyes], [
 	more_debug_output_modules="$more_debug_output_modules LDAP"
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(DEBUG_LDAP, 1, [Define if you want additional LDAP debug calls])
-else
+], [
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build archive plugin with more debug calls])
-if test x$enable_more_archive_debug = xyes; then
+AS_IF([test x$enable_more_archive_debug = xyes], [
 	more_debug_output_modules="$more_debug_output_modules ArchivePlugin"
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(DEBUG_ARCHIVE, 1, [Define if you want additional archive plugin debug calls])
-else
+], [
 	AC_MSG_RESULT(no)
-fi
+])
 
 dnl *************************
 dnl ** section for plugins **
@@ -1234,24 +1234,24 @@ AC_SUBST(CURL_CFLAGS)
 dnl expat **********************************************************************
 PKG_CHECK_MODULES(EXPAT, expat, HAVE_EXPAT=yes, HAVE_EXPAT=no)
 
-if test x"$HAVE_EXPAT" = xno; then
+AS_IF([test x"$HAVE_EXPAT" = xno], [
 	AC_CHECK_HEADER(expat.h, [expat_header=yes], [expat_header=no])
 	AC_CHECK_LIB(expat, XML_ParserCreate, [expat_lib=yes], [expat_lib=no])
-	if test x"$expat_header" = xyes -a x"$expat_lib"=xyes; then
+	AS_IF([test x"$expat_header" = xyes -a x"$expat_lib"=xyes], [
 		HAVE_EXPAT=yes
 		EXPAT_CFLAGS=""
 		EXPAT_LIBS="-lexpat"
-	fi
-fi
+	])
+])
 
 AC_SUBST(EXPAT_CFLAGS)
 AC_SUBST(EXPAT_LIBS)
 
 dnl webkit *********************************************************************
 PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.1, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
-if test x"$HAVE_WEBKIT" = xno; then
+AS_IF([test x"$HAVE_WEBKIT" = xno], [
 	PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.0 >= 2.18.0, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
-fi
+])
 AC_SUBST(WEBKIT_LIBS)
 AC_SUBST(WEBKIT_CFLAGS)
 
@@ -1278,11 +1278,11 @@ AC_SUBST(FONTCONFIG_LIBS)
 
 dnl gumbo **********************************************************************
 PKG_CHECK_MODULES(LIBGUMBO, gumbo >= 0.12, HAVE_LIBGUMBO=yes, HAVE_LIBGUMBO=no)
-if test x"$HAVE_LIBGUMBO" = xno; then
-	if test x"$enable_litehtml_viewer_plugin" = xyes; then
+AS_IF([test x"$HAVE_LIBGUMBO" = xno], [
+	AS_IF([test x"$enable_litehtml_viewer_plugin" = xyes], [
 		PKG_CHECK_MODULES(LIBGUMBO, gumbo >= 0.10, HAVE_LIBGUMBO=yes, HAVE_LIBGUMBO=no)
-	fi
-fi
+	])
+])
 AC_SUBST(LIBGUMBO_CFLAGS)
 AC_SUBST(LIBGUMBO_LIBS)
 
@@ -1297,7 +1297,7 @@ AC_SUBST(POPPLER_LIBS)
 AC_SUBST(POPPLER_CFLAGS)
 
 dnl check for Poppler extra features that we conditionally support
-if test x"$HAVE_POPPLER" = xyes; then
+AS_IF([test x"$HAVE_POPPLER" = xyes], [
 	OLD_CFLAGS=$CFLAGS
 	CFLAGS="$POPPLER_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS"
 	AC_CHECK_DECL(POPPLER_DEST_NAMED,
@@ -1307,31 +1307,31 @@ if test x"$HAVE_POPPLER" = xyes; then
 		[AC_DEFINE([HAVE_POPPLER_DEST_XYZ], [], [Description])],
 		,[#include <poppler-action.h>])
 	CFLAGS=$OLD_CFLAGS
-fi
+])
 
 dnl perl ***********************************************************************
 AC_CHECK_PROG(HAVE_PERL, perl, yes, no)
-if test x"$HAVE_PERL" = xyes; then
+AS_IF([test x"$HAVE_PERL" = xyes], [
 	AC_MSG_CHECKING(for perl >= 5.8.0)
-	PERL_VER=`perl -e 'print $] > 5.0079999?"yes":"no"'`
-	if test "$PERL_VER" = "yes"; then
+	PERL_VER=`perl -e 'print $@:>@ > 5.0079999?"yes":"no"'`
+	AS_IF([test "$PERL_VER" = "yes"], [
 		AC_MSG_RESULT(yes)
-	else
+	], [
 		AC_MSG_RESULT(no)
 		HAVE_PERL=no
-	fi
-fi
-if test x"$HAVE_PERL" = xyes; then
+	])
+])
+AS_IF([test x"$HAVE_PERL" = xyes], [
 	AC_MSG_CHECKING(for perl module ExtUtils::Embed)
 	PERL_MOD_EXT_UTILS_EMBED=no
-	if perl -MExtUtils::Embed; then
+	AS_IF([perl -MExtUtils::Embed], [
 		AC_MSG_RESULT(ok)
 		PERL_MOD_EXT_UTILS_EMBED=yes
-	else
+	], [
 		AC_MSG_RESULT(no)
-	fi
+	])
 
-	if test x"$PERL_MOD_EXT_UTILS_EMBED" = xyes; then
+	AS_IF([test x"$PERL_MOD_EXT_UTILS_EMBED" = xyes], [
 		AC_MSG_CHECKING(for Perl compile flags)
 		PERL_CFLAGS=`perl -MExtUtils::Embed -e ccopts`
 		PERL_CFLAGS=`echo $PERL_CFLAGS | sed 's/-D_FILE_OFFSET_BITS=[[0-9]]*//'`
@@ -1341,46 +1342,46 @@ if test x"$HAVE_PERL" = xyes; then
 		PERL_LDFLAGS=`echo $PERL_LDFLAGS |sed 's/-lc\>//'`
 		AC_MSG_RESULT(ok)
 		AC_MSG_NOTICE([Adding perl LIBS ${PERL_CFLAGS}])
-	fi
+	])
 
-	if test x"$HAVE_PERL" = xyes; then
+	AS_IF([test x"$HAVE_PERL" = xyes], [
 		AC_CHECK_LIB(perl,perl_alloc,[AC_DEFINE(HAVE_LIBPERL, 1, Check for libperl.)], 
 			 		     [ HAVE_LIBPERL=no ])
-	fi
+	])
 
-	if test x"$HAVE_LIBPERL" = xno; then
-		if test x"$PERL_MOD_EXT_UTILS_EMBED" = xyes; then
+	AS_IF([test x"$HAVE_LIBPERL" = xno], [
+		AS_IF([test x"$PERL_MOD_EXT_UTILS_EMBED" = xyes], [
 			LIBPERL_PREFIX=`perl -MExtUtils::Embed -e perl_inc`
 			LIBPERL_PREFIX=`echo $LIBPERL_PREFIX |sed 's/-I//'`
 			AC_MSG_CHECKING([for libperl.so])
-			if test -f "$LIBPERL_PREFIX/libperl.so"; then
+			AS_IF([test -f "$LIBPERL_PREFIX/libperl.so"], [
 				AC_MSG_RESULT(yes)
 				HAVE_LIBPERL=yes
-			else
+			], [
 				AC_MSG_RESULT(no)
-			fi
-		fi
-	fi
+			])
+		])
+	])
 	PERL="perl"
 	AC_SUBST(PERL)
 	AC_SUBST(PERL_CFLAGS)
 	AC_SUBST(PERL_LDFLAGS)
-fi
+])
 
 dnl Gpgme **********************************************************************
 PKG_CHECK_MODULES(GPGME, [gpgme >= 1.1.1], HAVE_GPGME_PKGCONFIG=yes, HAVE_GPGME_PKGCONFIG=no)
-if test x"$HAVE_GPGME_PKGCONFIG" = xyes; then
+AS_IF([test x"$HAVE_GPGME_PKGCONFIG" = xyes], [
     PKG_CHECK_MODULES(LIBGPG_ERROR, [gpg-error])
-else
+], [
     AM_PATH_GPGME(1.1.1, HAVE_GPGME_CONFIG=yes, HAVE_GPGME_CONFIG=no)
-fi
+])
 
-if test x"$HAVE_GPGME_PKGCONFIG" = xyes -o x"$HAVE_GPGME_CONFIG" = xyes; then
+AS_IF([test x"$HAVE_GPGME_PKGCONFIG" = xyes -o x"$HAVE_GPGME_CONFIG" = xyes], [
 	AC_DEFINE(USE_GPGME, 1, Define if you use GPGME to support OpenPGP.)
 	HAVE_GPGME=yes
-else
+], [
 	HAVE_GPGME=no
-fi
+])
 
 dnl Python *********************************************************************
 PKG_CHECK_MODULES(PYTHON, python3, HAVE_PYTHON=yes, HAVE_PYTHON=no)
@@ -1398,41 +1399,41 @@ AC_SUBST(PYGOBJECT_LIBS)
 
 dnl libnotify ******************************************************************
 PKG_CHECK_MODULES(libnotify, libnotify >= 0.4.3, HAVE_LIBNOTIFY=yes, HAVE_LIBNOTIFY=no)
-if test x"$HAVE_LIBNOTIFY" = xyes; then
+AS_IF([test x"$HAVE_LIBNOTIFY" = xyes], [
 	AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify support is enabled])
-fi
+])
 AC_SUBST(libnotify_CFLAGS)
 AC_SUBST(libnotify_LIBS)
 
 dnl libcanberra-gtk3 ************************************************************
 PKG_CHECK_MODULES(libcanberra_gtk3, libcanberra-gtk3, HAVE_LIBCANBERRA_GTK=yes, HAVE_LIBCANBERRA_GTK=no)
-if test x"$HAVE_LIBCANBERRA_GTK" = xyes; then
+AS_IF([test x"$HAVE_LIBCANBERRA_GTK" = xyes], [
 	AC_DEFINE(HAVE_LIBCANBERRA_GTK, 1, [Define if libcanberra-gtk3 support is enabled])
-fi
+])
 AC_SUBST(libcanberra_gtk3_CFLAGS)
 AC_SUBST(libcanberra_gtk3_LIBS)
 
 dnl unity/messaging-menu *******************************************************
 PKG_CHECK_MODULES(unity, unity messaging-menu, HAVE_UNITY=yes, HAVE_UNITY=no)
-if test x"$HAVE_UNITY" = xyes; then
+AS_IF([test x"$HAVE_UNITY" = xyes], [
 	AC_DEFINE(NOTIFICATION_INDICATOR, 1, [Activate support for unity and messaging-menu])
-fi
+])
 AC_SUBST(unity_CFLAGS)
 AC_SUBST(unity_LIBS)
 
 dnl ayatana app indicator *******************************************************
 PKG_CHECK_MODULES(ayatanaappindicator, ayatana-appindicator3-0.1, HAVE_AYATANAAPPINDICATOR=yes, HAVE_AYATANAAPPINDICATOR=no)
-if test x"$HAVE_AYATANAAPPINDICATOR" = xyes; then
+AS_IF([test x"$HAVE_AYATANAAPPINDICATOR" = xyes], [
 	AC_DEFINE(NOTIFICATION_AYATANA_INDICATOR, 1, [Activate support for Atayana app indicator])
-fi
+])
 AC_SUBST(ayatanaappindicator_CFLAGS)
 AC_SUBST(ayatanaappindicator_LIBS)
 
 dnl hotkeys ********************************************************************
 PKG_CHECK_MODULES(CM_NP_HOTKEY, [gio-2.0 >= 2.15.6 gio-unix-2.0 >= 2.15.6], HAVE_HOTKEYS=yes, HAVE_HOTKEYS=no)
-if test x"$HAVE_HOTKEYS" = xyes; then
+AS_IF([test x"$HAVE_HOTKEYS" = xyes], [
 	AC_DEFINE(NOTIFICATION_HOTKEYS, 1, Activate support for global hotkeys)
-fi
+])
 AC_SUBST(CM_NP_HOTKEY_CFLAGS)
 AC_SUBST(CM_NP_HOTKEY_LIBS)
 
@@ -1443,35 +1444,35 @@ have_ytnef=0
 # Check both ytnef.h and libytnef/ytnef.h, and adjust YTNEF_CFLAGS
 # accordingly
 AC_CHECK_HEADER(ytnef.h, [have_ytnef=1], [have_ytnef=0])
-if test $have_ytnef -eq 0; then
+AS_IF([test $have_ytnef -eq 0], [
 	AC_CHECK_HEADER(libytnef/ytnef.h,
 									[have_ytnef=1;
 									 YTNEF_CFLAGS="${YTNEF_CFLAGS} -DYTNEF_H_SUBDIR"],
 									[have_ytnef=0])
-fi
-if test $have_ytnef -eq 1; then
+])
+AS_IF([test $have_ytnef -eq 1], [
 	AC_MSG_CHECKING([how libytnef's SwapDDWord() should be called])
 	# Now we have to figure out which libytnef version we're using,
 	# based on whether SwapDDWord takes one argument or two.
-	if test "x${YTNEF_CFLAGS}" = "x"; then
+	AS_IF([test "x${YTNEF_CFLAGS}" = "x"], [
 		ytnef_include="#include <ytnef.h>"
-	else
+	], [
 		ytnef_include="#include <libytnef/ytnef.h>"
-	fi
+	])
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
 									${ytnef_include}]], [[SwapDDWord(0, 0);]])],[have_ytnef=1],[have_ytnef=0])
-	if test $have_ytnef -eq 0; then
+	AS_IF([test $have_ytnef -eq 0], [
 		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
 										${ytnef_include}]], [[SwapDDWord(0);]])],[have_ytnef=1;
 										 YTNEF_CFLAGS="${YTNEF_CFLAGS} -DYTNEF_OLD_SWAPDDWORD"],[have_ytnef=0])
-	fi
-	if test $have_ytnef -eq 1; then
+	])
+	AS_IF([test $have_ytnef -eq 1], [
 		YTNEF_LIBS="-lytnef"
 		AC_MSG_RESULT(ok)
-	else
+	], [
 		AC_MSG_RESULT(no idea, unsupported libytnef version?)
-	fi
-fi
+	])
+])
 AC_SUBST(YTNEF_CFLAGS)
 AC_SUBST(YTNEF_LIBS)
 
@@ -1480,249 +1481,249 @@ dnl If some dependencies are missing and the plugin was explicitely enabled,
 dnl we error out, else we only inform.
 
 AC_MSG_CHECKING([whether to build acpi_notifier plugin])
-if test x"$enable_acpi_notifier_plugin" != xno; then
+AS_IF([test x"$enable_acpi_notifier_plugin" != xno], [
 	PLUGINS="$PLUGINS acpi_notifier"
 	AC_MSG_RESULT(yes)
-else
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS acpi_notifier"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build address_keeper plugin])
-if test x"$enable_address_keeper_plugin" != xno; then
+AS_IF([test x"$enable_address_keeper_plugin" != xno], [
 	PLUGINS="$PLUGINS address_keeper"
 	AC_MSG_RESULT(yes)
-else
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS address_keeper"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build archive plugin])
-if test x"$enable_archive_plugin" != xno; then
+AS_IF([test x"$enable_archive_plugin" != xno], [
 	dependencies_missing=""
 
-	if test x"$HAVE_ARCHIVE" = xno; then
+	AS_IF([test x"$HAVE_ARCHIVE" = xno], [
 		dependencies_missing="libarchive $dependencies_missing"
-	fi
+	])
 
-	if test x"$dependencies_missing" = x; then
+	AS_IF([test x"$dependencies_missing" = x], [
 		PLUGINS="$PLUGINS archive"
 		AC_MSG_RESULT(yes)
-	elif test x"$enable_archive_plugin" = xauto; then
+	], [test x"$enable_archive_plugin" = xauto], [
 		AC_MSG_RESULT(no)
 		AC_MSG_WARN("Plugin archive will not be built; missing $dependencies_missing")
 		enable_archive_plugin=no
 		MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS archive"
-	else
+	], [
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR("Plugin archive cannot be built; missing $dependencies_missing")
-	fi
-else
+	])
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS archive"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build att_remover plugin])
-if test x"$enable_att_remover_plugin" != xno; then
+AS_IF([test x"$enable_att_remover_plugin" != xno], [
 	PLUGINS="$PLUGINS att_remover"
 	AC_MSG_RESULT(yes)
-else
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS att_remover"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build attachwarner plugin])
-if test x"$enable_attachwarner_plugin" != xno; then
+AS_IF([test x"$enable_attachwarner_plugin" != xno], [
 	PLUGINS="$PLUGINS attachwarner"
 	AC_MSG_RESULT(yes)
-else
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS attachwarner"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build bogofilter plugin])
-if test x"$enable_bogofilter_plugin" != xno; then
+AS_IF([test x"$enable_bogofilter_plugin" != xno], [
 	PLUGINS="$PLUGINS bogofilter"
 	AC_MSG_RESULT(yes)
-else
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS bogofilter"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build bsfilter plugin])
-if test x"$enable_bsfilter_plugin" != xno; then
+AS_IF([test x"$enable_bsfilter_plugin" != xno], [
 	PLUGINS="$PLUGINS bsfilter"
 	AC_MSG_RESULT(yes)
-else
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS bsfilter"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build clamd plugin])
-if test x"$enable_clamd_plugin" != xno; then
+AS_IF([test x"$enable_clamd_plugin" != xno], [
 	PLUGINS="$PLUGINS clamd"
 	AC_MSG_RESULT(yes)
-else
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS clamd"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build demo plugin])
-if test x"$enable_demo_plugin" != xno; then
+AS_IF([test x"$enable_demo_plugin" != xno], [
 	PLUGINS="$PLUGINS demo"
 	AC_MSG_RESULT(yes)
-else
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS demo"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build Dillo plugin])
-if test x"$enable_dillo_plugin" != xno; then
+AS_IF([test x"$enable_dillo_plugin" != xno], [
 	PLUGINS="$PLUGINS dillo"
 	AC_MSG_RESULT(yes)
-else
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS dillo"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build fancy plugin])
-if test x"$enable_fancy_plugin" != xno; then
+AS_IF([test x"$enable_fancy_plugin" != xno], [
 	dependencies_missing=""
 
-	if test x"$HAVE_WEBKIT" = xno; then
+	AS_IF([test x"$HAVE_WEBKIT" = xno], [
 		dependencies_missing="libwebkit2gtk-4.0 or greater $dependencies_missing"
-	fi
-	if test x"$HAVE_CURL" = xno; then
+	])
+	AS_IF([test x"$HAVE_CURL" = xno], [
 		dependencies_missing="libcurl $dependencies_missing"
-	fi
+	])
 
-	if test x"$dependencies_missing" = x; then
+	AS_IF([test x"$dependencies_missing" = x], [
 		PLUGINS="$PLUGINS fancy"
 		AC_MSG_RESULT(yes)
-	elif test x"$enable_fancy_plugin" = xauto; then
+	], [test x"$enable_fancy_plugin" = xauto], [
 		AC_MSG_RESULT(no)
 		AC_MSG_WARN("Plugin fancy will not be built; missing $dependencies_missing")
 		enable_fancy_plugin=no
 		MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS fancy"
-	else
+	], [
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR("Plugin fancy cannot be built; missing $dependencies_missing")
-	fi
-else
+	])
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS fancy"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build fetchinfo plugin])
-if test x"$enable_fetchinfo_plugin" != xno; then
+AS_IF([test x"$enable_fetchinfo_plugin" != xno], [
 	PLUGINS="$PLUGINS fetchinfo"
 	AC_MSG_RESULT(yes)
-else
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS fetchinfo"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build keyword_warner plugin])
-if test x"$enable_keyword_warner_plugin" != xno; then
+AS_IF([test x"$enable_keyword_warner_plugin" != xno], [
 	PLUGINS="$PLUGINS keyword_warner"
 	AC_MSG_RESULT(yes)
-else
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS keyword_warner"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build libravatar plugin])
-if test x"$enable_libravatar_plugin" != xno; then
+AS_IF([test x"$enable_libravatar_plugin" != xno], [
 	dependencies_missing=""
 
-	if test x"$HAVE_CURL" = xno; then
+	AS_IF([test x"$HAVE_CURL" = xno], [
 		dependencies_missing="libcurl $dependencies_missing"
-	fi
+	])
 
-	if test x"$dependencies_missing" = x; then
+	AS_IF([test x"$dependencies_missing" = x], [
 		PLUGINS="$PLUGINS libravatar"
 		AC_MSG_RESULT(yes)
-	elif test x"$enable_libravatar_plugin" = xauto; then
+	], [test x"$enable_libravatar_plugin" = xauto], [
 		AC_MSG_RESULT(no)
 		AC_MSG_WARN("Plugin libravatar will not be built; missing $dependencies_missing")
 		enable_libravatar_plugin=no
 		MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS libravatar"
-	else
+	], [
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR("Plugin libravatar cannot be built; missing $dependencies_missing")
-	fi
-else
+	])
+],[
 	DISABLED_PLUGINS="$DISABLED_PLUGINS libravatar"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build litehtml_viewer plugin])
-if test x"$enable_litehtml_viewer_plugin" != xno; then
+AS_IF([test x"$enable_litehtml_viewer_plugin" != xno], [
         dependencies_missing=""
 
-        if test x"$HAVE_CXX" = xno; then
+        AS_IF([test x"$HAVE_CXX" = xno], [
                 dependencies_missing="C++ compiler $dependencies_missing"
-        fi
-        if test x"$HAVE_CAIRO" = xno; then
+        ])
+        AS_IF([test x"$HAVE_CAIRO" = xno], [
                 dependencies_missing="cairo $dependencies_missing"
-        fi
-        if test x"$HAVE_FONTCONFIG" = xno; then
+        ])
+        AS_IF([test x"$HAVE_FONTCONFIG" = xno], [
                 dependencies_missing="fontconfig $dependencies_missing"
-        fi
-	if test x"$HAVE_LIBGUMBO" = xno; then
+        ])
+	AS_IF([test x"$HAVE_LIBGUMBO" = xno], [
 		dependencies_missing="libgumbo $dependencies_missing"
-	fi
-        if test x"$HAVE_CURL" = xno; then
+	])
+        AS_IF([test x"$HAVE_CURL" = xno], [
                 dependencies_missing="libcurl $dependencies_missing"
-        fi
+        ])
 
 
-        if test x"$dependencies_missing" = x; then
+        AS_IF([test x"$dependencies_missing" = x], [
                 PLUGINS="$PLUGINS litehtml_viewer"
                 AC_MSG_RESULT(yes)
-        elif test x"$enable_litehtml_viewer_plugin" = xauto; then
+        ], [test x"$enable_litehtml_viewer_plugin" = xauto], [
                 AC_MSG_RESULT(no)
                 AC_MSG_WARN("Plugin litehtml_viewer will not be built; missing $dependencies_missing")
                 enable_litehtml_viewer_plugin=no
                 MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS litehtml_viewer"
-        else
+        ], [
                 AC_MSG_RESULT(no)
                 AC_MSG_ERROR("Plugin litehtml_viewer cannot be built; missing $dependencies_missing")
-        fi
-else
+        ])
+], [
         DISABLED_PLUGINS="$DISABLED_PLUGINS litehtml_viewer"
         AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build mailmbox plugin])
-if test x"$enable_mailmbox_plugin" != xno; then
+AS_IF([test x"$enable_mailmbox_plugin" != xno], [
 	PLUGINS="$PLUGINS mailmbox"
 	AC_MSG_RESULT(yes)
-else
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS mailmbox"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build managesieve plugin])
-if test x"$enable_managesieve_plugin" != xno; then
+AS_IF([test x"$enable_managesieve_plugin" != xno], [
 	PLUGINS="$PLUGINS managesieve"
 	AC_MSG_RESULT(yes)
-else
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS managesieve"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build newmail plugin])
-if test x"$enable_newmail_plugin" != xno; then
+AS_IF([test x"$enable_newmail_plugin" != xno], [
 	PLUGINS="$PLUGINS newmail"
 	AC_MSG_RESULT(yes)
-else
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS newmail"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build notification plugin])
-if test x"$enable_notification_plugin" != xno; then
+AS_IF([test x"$enable_notification_plugin" != xno], [
 	PLUGINS="$PLUGINS notification"
 	AC_MSG_RESULT(yes)
 
@@ -1730,236 +1731,236 @@ if test x"$enable_notification_plugin" != xno; then
 	AC_DEFINE(NOTIFICATION_BANNER, 1, Activate notification banner)
 	AC_DEFINE(NOTIFICATION_COMMAND, 1, Activate notification shell command)
 	AC_DEFINE(NOTIFICATION_TRAYICON, 1, Activate notification trayicon)
-	if test x"$platform_win32" = xno; then
+	AS_IF([test x"$platform_win32" = xno], [
 		AC_DEFINE(NOTIFICATION_LCDPROC, 1, Activate lcdproc support)
-	fi
+	])
 
 	notification_features="banner command"
 	notification_missing_dependencies=""
-	if test x"$HAVE_HOTKEYS" = xyes; then
+	AS_IF([test x"$HAVE_HOTKEYS" = xyes], [
 		notification_features="$notification_features hotkeys"
-	else
+	], [
 		notification_missing_dependencies="$notification_missing_dependencies hotkeys"
-	fi
+	])
 	notification_features="$notification_features lcdproc"
-	if test x"$HAVE_UNITY" = xyes; then
+	AS_IF([test x"$HAVE_UNITY" = xyes], [
 		notification_features="$notification_features unity/messaging-menu"
-	else
+	], [
 		notification_missing_dependencies="$notification_missing_dependencies unity/messaging-menu"
-	fi
-	if test x"$HAVE_AYATANAAPPINDICATOR" = xyes; then
+	])
+	AS_IF([test x"$HAVE_AYATANAAPPINDICATOR" = xyes], [
 		notification_features="$notification_features libayatana-appindicator3"
-	else
+	], [
 		notification_missing_dependencies="$notification_missing_dependencies libayatana-appindicator3"
-	fi
-	if test x"$HAVE_LIBNOTIFY" = xyes; then
+	])
+	AS_IF([test x"$HAVE_LIBNOTIFY" = xyes], [
 		notification_features="$notification_features libnotify"
-	else
+	], [
 		notification_missing_dependencies="$notification_missing_dependencies libnotify"
-	fi
-	if test x"$HAVE_LIBCANBERRA_GTK" = xyes; then
+	])
+	AS_IF([test x"$HAVE_LIBCANBERRA_GTK" = xyes], [
 		notification_features="$notification_features libcanberra-gtk3"
-	else
+	], [
 		notification_missing_dependencies="$notification_missing_dependencies libcanberra-gtk3"
-	fi
+	])
 	notification_features="$notification_features popup trayicon"
-else
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS notification"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build pdf_viewer plugin])
-if test x"$enable_pdf_viewer_plugin" != xno; then
+AS_IF([test x"$enable_pdf_viewer_plugin" != xno], [
 	dependencies_missing=""
 
-	if test x"$HAVE_POPPLER" = xno; then
+	AS_IF([test x"$HAVE_POPPLER" = xno], [
 		dependencies_missing="libpoppler-glib $dependencies_missing"
-	fi
+	])
 
-	if test x"$dependencies_missing" = x; then
+	AS_IF([test x"$dependencies_missing" = x], [
 		PLUGINS="$PLUGINS pdf_viewer"
 		AC_MSG_RESULT(yes)
-	elif test x"$enable_pdf_viewer_plugin" = xauto; then
+	], [test x"$enable_pdf_viewer_plugin" = xauto], [
 		AC_MSG_RESULT(no)
 		AC_MSG_WARN("Plugin pdf_viewer will not be built; missing $dependencies_missing")
 		enable_pdf_viewer_plugin=no
 		MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS pdf_viewer"
-	else
+	], [
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR("Plugin pdf_viewer cannot be built; missing $dependencies_missing")
-	fi
-else
+	])
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS pdf_viewer"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build perl plugin])
-if test x"$enable_perl_plugin" != xno; then
+AS_IF([test x"$enable_perl_plugin" != xno], [
 	dependencies_missing=""
 
-	if test x"$HAVE_LIBPERL" = xno; then
+	AS_IF([test x"$HAVE_LIBPERL" = xno], [
 		dependencies_missing="libperl $dependencies_missing"
-	fi
-	if test x"$PERL_MOD_EXT_UTILS_EMBED" = xno; then
+	])
+	AS_IF([test x"$PERL_MOD_EXT_UTILS_EMBED" = xno], [
 		dependencies_missing="ExtUtils::Embed $dependencies_missing"
-	fi
+	])
 
-	if test x"$dependencies_missing" = x; then
+	AS_IF([test x"$dependencies_missing" = x], [
 		PLUGINS="$PLUGINS perl"
 		AC_MSG_RESULT(yes)
-	elif test x"$enable_perl_plugin" = xauto; then
+	], [test x"$enable_perl_plugin" = xauto], [
 		AC_MSG_RESULT(no)
 		AC_MSG_WARN("Plugin perl will not be built; missing $dependencies_missing")
 		enable_perl_plugin=no
 		MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS perl"
-	else
+	], [
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR("Plugin perl cannot be built; missing $dependencies_missing")
-	fi
-else
+	])
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS perl"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build python plugin])
-if test x"$enable_python_plugin" != xno; then
+AS_IF([test x"$enable_python_plugin" != xno], [
 	dependencies_missing=""
 
-	if test x"$HAVE_PYTHON" = xno; then
+	AS_IF([test x"$HAVE_PYTHON" = xno], [
 		dependencies_missing="python3 $dependencies_missing"
-	fi
-	if test x"$HAVE_PYGOBJ" = xno; then
+	])
+	AS_IF([test x"$HAVE_PYGOBJ" = xno], [
 		dependencies_missing="pygobject-3.0 $dependencies_missing"
-	fi
+	])
 
-	if test x"$dependencies_missing" = x; then
+	AS_IF([test x"$dependencies_missing" = x], [
 		PLUGINS="$PLUGINS python"
 		AC_MSG_RESULT(yes)
-	elif test x"$enable_python_plugin" = xauto; then
+	], [test x"$enable_python_plugin" = xauto], [
 		AC_MSG_RESULT(no)
 		AC_MSG_WARN("Plugin python will not be built; missing $dependencies_missing")
 		enable_python_plugin=no
 		MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS python"
-	else
+	], [
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR("Plugin python cannot be built; missing $dependencies_missing")
-	fi
-else
+	])
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS python"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build pgpcore plugin])
-if test x"$enable_pgpcore_plugin" != xno; then
+AS_IF([test x"$enable_pgpcore_plugin" != xno], [
 	dependencies_missing=""
 
-	if test x"$HAVE_GPGME" = xno; then
+	AS_IF([test x"$HAVE_GPGME" = xno], [
 		dependencies_missing="libgpgme $dependencies_missing"
-	fi
+	])
 
-	if test x"$dependencies_missing" = x; then
+	AS_IF([test x"$dependencies_missing" = x], [
 		PLUGINS="$PLUGINS pgpcore"
 		AC_MSG_RESULT(yes)
-	elif test x"$enable_pgpcore_plugin" = xauto; then
+	], [test x"$enable_pgpcore_plugin" = xauto], [
 		AC_MSG_RESULT(no)
 		AC_MSG_WARN("Plugin pgpcore will not be built; missing $dependencies_missing")
 		enable_pgpcore_plugin=no
 		MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS pgpcore"
-	else
+	], [
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR("Plugin pgpcore cannot be built; missing $dependencies_missing")
-	fi
-else
+	])
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS pgpcore"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build pgpmime plugin])
-if test x"$enable_pgpmime_plugin" != xno; then
+AS_IF([test x"$enable_pgpmime_plugin" != xno], [
 	dependencies_missing=""
 
-	if test x"$HAVE_GPGME" = xno; then
+	AS_IF([test x"$HAVE_GPGME" = xno], [
 		dependencies_missing="libgpgme $dependencies_missing"
-	fi
-	if test x"$enable_pgpcore_plugin" = xno; then
+	])
+	AS_IF([test x"$enable_pgpcore_plugin" = xno], [
 		dependencies_missing="pgpcore plugin $dependencies_missing"
-	fi
+	])
 
-	if test x"$dependencies_missing" = x; then
+	AS_IF([test x"$dependencies_missing" = x], [
 		PLUGINS="$PLUGINS pgpmime"
 		AC_MSG_RESULT(yes)
-	elif test x"$enable_pgpmime_plugin" = xauto; then
+	], [test x"$enable_pgpmime_plugin" = xauto], [
 		AC_MSG_RESULT(no)
 		AC_MSG_WARN("Plugin pgpmime will not be built; missing $dependencies_missing")
 		enable_pgpmime_plugin=no
 		MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS pgpmime"
-	else
+	], [
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR("Plugin pgpmime cannot be built; missing $dependencies_missing")
-	fi
-else
+	])
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS pgpmime"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build pgpinline plugin])
-if test x"$enable_pgpinline_plugin" != xno; then
+AS_IF([test x"$enable_pgpinline_plugin" != xno], [
 	dependencies_missing=""
 
-	if test x"$HAVE_GPGME" = xno; then
+	AS_IF([test x"$HAVE_GPGME" = xno], [
 		dependencies_missing="libgpgme $dependencies_missing"
-	fi
-	if test x"$enable_pgpcore_plugin" = xno; then
+	])
+	AS_IF([test x"$enable_pgpcore_plugin" = xno], [
 		dependencies_missing="pgpcore plugin $dependencies_missing"
-	fi
+	])
 
-	if test x"$dependencies_missing" = x; then
+	AS_IF([test x"$dependencies_missing" = x], [
 		PLUGINS="$PLUGINS pgpinline"
 		AC_MSG_RESULT(yes)
-	elif test x"$enable_pgpinline_plugin" = xauto; then
+	], [test x"$enable_pgpinline_plugin" = xauto], [
 		AC_MSG_RESULT(no)
 		AC_MSG_WARN("Plugin pgpinline will not be built; missing $dependencies_missing")
 		enable_pgpinline_plugin=no
 		MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS pgpinline"
-	else
+	], [
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR("Plugin pgpinline cannot be built; missing $dependencies_missing")
-	fi
-else
+	])
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS pgpinline"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build rssyl plugin])
-if test x"$enable_rssyl_plugin" != xno; then
+AS_IF([test x"$enable_rssyl_plugin" != xno], [
 	dependencies_missing=""
 
-	if test x"$HAVE_EXPAT" = xno; then
+	AS_IF([test x"$HAVE_EXPAT" = xno], [
 		dependencies_missing="expat $dependencies_missing"
-	fi
-	if test x"$HAVE_CURL" = xno; then
+	])
+	AS_IF([test x"$HAVE_CURL" = xno], [
 		dependencies_missing="libcurl $dependencies_missing"
-	fi
+	])
 
-	if test x"$dependencies_missing" = x; then
+	AS_IF([test x"$dependencies_missing" = x], [
 		PLUGINS="$PLUGINS rssyl"
 		AC_MSG_RESULT(yes)
-	elif test x"$enable_rssyl_plugin" = xauto; then
+	], [test x"$enable_rssyl_plugin" = xauto], [
 		AC_MSG_RESULT(no)
 		AC_MSG_WARN("Plugin rssyl will not be built; missing $dependencies_missing")
 		enable_rssyl_plugin=no
 		MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS rssyl"
-	else
+	], [
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR("Plugin rssyl cannot be built; missing $dependencies_missing")
-	fi
-else
+	])
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS rssyl"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build spamassassin plugin])
-if test x"$enable_spamassassin_plugin" != xno; then
+AS_IF([test x"$enable_spamassassin_plugin" != xno], [
 	PLUGINS="$PLUGINS spamassassin"
 	AC_MSG_RESULT(yes)
 	AC_SPAMASSASSIN
@@ -1972,135 +1973,135 @@ if test x"$enable_spamassassin_plugin" != xno; then
 			[AC_DEFINE(HAVE_ZLIB_H,1,[optional zlib support for spamassassin plugin])]
 			[spamassassin_zlib=1],
 			[spamassassin_zlib=0])
-	if test $spamassassin_zlib -eq 1; then
+	AS_IF([test $spamassassin_zlib -eq 1], [
 		AC_CHECK_LIB(z, deflate, [spamassassin_zlib=1], [spamassassin_zlib=0])
 		AC_MSG_CHECKING([whether to build spamassassin plugin with zlib support])
-		if test $spamassassin_zlib -eq 1; then
+		AS_IF([test $spamassassin_zlib -eq 1], [
 			AC_MSG_RESULT(yes)
 			SPAMASSASSIN_CFLAGS="-DHAVE_LIBZ"
 			SPAMASSASSIN_LIBS="-lz"
-		else
+		], [
 			AC_MSG_RESULT(no)
-		fi
-	fi
+		])
+	])
 	AC_SUBST(SPAMASSASSIN_CFLAGS)
 	AC_SUBST(SPAMASSASSIN_LIBS)
-else
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS spamassassin"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build smime plugin])
-if test x"$enable_smime_plugin" != xno; then
+AS_IF([test x"$enable_smime_plugin" != xno], [
 	dependencies_missing=""
 
-	if test x"$HAVE_GPGME" = xno; then
+	AS_IF([test x"$HAVE_GPGME" = xno], [
 		dependencies_missing="libgpgme $dependencies_missing"
-	fi
-	if test x"$enable_pgpcore_plugin" = xno; then
+	])
+	AS_IF([test x"$enable_pgpcore_plugin" = xno], [
 		dependencies_missing="pgpcore plugin $dependencies_missing"
-	fi
+	])
 
-	if test x"$dependencies_missing" = x; then
+	AS_IF([test x"$dependencies_missing" = x], [
 		PLUGINS="$PLUGINS smime"
 		AC_MSG_RESULT(yes)
-	elif test x"$enable_smime_plugin" = xauto; then
+	], [test x"$enable_smime_plugin" = xauto], [
 		AC_MSG_RESULT(no)
 		AC_MSG_WARN("Plugin smime will not be built; missing $dependencies_missing")
 		enable_smime_plugin=no
 		MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS smime"
-	else
+	], [
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR("Plugin smime cannot be built; missing $dependencies_missing")
-	fi
-else
+	])
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS smime"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build spam_report plugin])
-if test x"$enable_spam_report_plugin" != xno; then
+AS_IF([test x"$enable_spam_report_plugin" != xno], [
 	dependencies_missing=""
 
-	if test x"$HAVE_CURL" = xno; then
+	AS_IF([test x"$HAVE_CURL" = xno], [
 		dependencies_missing="libcurl $dependencies_missing"
-	fi
+	])
 
-	if test x"$dependencies_missing" = x; then
+	AS_IF([test x"$dependencies_missing" = x], [
 		PLUGINS="$PLUGINS spam_report"
 		AC_MSG_RESULT(yes)
-	elif test x"$enable_spam_report_plugin" = xauto; then
+	], [test x"$enable_spam_report_plugin" = xauto], [
 		AC_MSG_RESULT(no)
 		AC_MSG_WARN("Plugin spam_report will not be built; missing $dependencies_missing")
 		enable_spam_report_plugin=no
 		MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS spam_report"
-	else
+	], [
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR("Plugin spam_report cannot be built; missing $dependencies_missing")
-	fi
-else
+	])
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS spam_report"
 	AC_MSG_RESULT(no)
-fi
+])
 
 AC_MSG_CHECKING([whether to build tnef_parse plugin])
-if test x"$enable_tnef_parse_plugin" != xno; then
+AS_IF([test x"$enable_tnef_parse_plugin" != xno], [
 	dependencies_missing=""
 
-	if test $have_ytnef -eq 0; then
+	AS_IF([test $have_ytnef -eq 0], [
 		dependencies_missing="libytnef"
-	fi
+	])
 
-	if test x"$dependencies_missing" = x; then
+	AS_IF([test x"$dependencies_missing" = x], [
 		PLUGINS="$PLUGINS tnef_parse"
 		AC_MSG_RESULT(yes)
-	elif test x"$enable_tnef_parse_plugin" = xauto; then
+	], [test x"$enable_tnef_parse_plugin" = xauto], [
 		AC_MSG_RESULT(no)
 		AC_MSG_WARN(Plugin tnef_parse will not be built; missing $dependencies_missing")
 		enable_tnef_parse_plugin=no
 		MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS tnef_parse"
-	else
+	], [
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR(Plugin tnef_parse will not be built; missing $dependencies_missing")
-	fi
-else
+	])
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS tnef_parse"
 	AC_MSG_RESULT(no)
-fi
+])
 
 
 AC_MSG_CHECKING([whether to build vcalendar plugin])
-if test x"$enable_vcalendar_plugin" != xno; then
+AS_IF([test x"$enable_vcalendar_plugin" != xno], [
 	dependencies_missing=""
 
-	if test x"$HAVE_CURL" = xno; then
+	AS_IF([test x"$HAVE_CURL" = xno], [
 		dependencies_missing="libcurl $dependencies_missing"
-	fi
+	])
 
-  if test x"$HAVE_LIBICAL" = xno; then
-    dependencies_missing="libical $dependencies_missing"
-  fi
+	AS_IF([test x"$HAVE_LIBICAL" = xno], [
+		dependencies_missing="libical $dependencies_missing"
+	])
 
-	if test x"$HAVE_PERL" = xno; then
+	AS_IF([test x"$HAVE_PERL" = xno], [
 		dependencies_missing="perl $dependencies_missing"
-	fi
+	])
 
-	if test x"$dependencies_missing" = x; then
+	AS_IF([test x"$dependencies_missing" = x], [
 		PLUGINS="$PLUGINS vcalendar"
 		AC_MSG_RESULT(yes)
-	elif test x"$enable_vcalendar_plugin" = xauto; then
+	], [test x"$enable_vcalendar_plugin" = xauto], [
 		AC_MSG_RESULT(no)
 		AC_MSG_WARN("Plugin vcalendar will not be built; missing $dependencies_missing")
 		enable_vcalendar_plugin=no
 		MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS vcalendar"
-	else
+	], [
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR("Plugin vcalendar cannot be built; missing $dependencies_missing")
-	fi
-else
+	])
+], [
 	DISABLED_PLUGINS="$DISABLED_PLUGINS vcalendar"
 	AC_MSG_RESULT(no)
-fi
+])
 
 dnl And finally the automake conditionals.
 
@@ -2228,13 +2229,13 @@ dnl Output the configuration summary
 echo ""
 echo "$PACKAGE $VERSION"
 echo ""
-if test x"$enable_alternate_addressbook" = xyes; then
+AS_IF([test x"$enable_alternate_addressbook" = xyes], [
 	echo "Using Address Book : Alternate experimental interface"
-else
+], [
 	echo "Using Address Book : Original stable interface"
 	echo "JPilot             : $enable_jpilot"
 	echo "LDAP               : $enable_ldap"
-fi
+])
 echo "gnuTLS             : $enable_gnutls"
 echo "OAuth2             : $enable_oauth2"
 echo "iconv              : $am_cv_func_iconv"
@@ -2254,43 +2255,43 @@ echo "Config dir         : $ac_cv_with_config_dir"
 echo "Password crypto    : $pwd_crypto"
 echo "Unit tests         : $enable_tests"
 
-if test -n "$more_debug_output_modules"; then
+AS_IF([test -n "$more_debug_output_modules"], [
 	echo "More debug output enabled for:"
 	for module in $more_debug_output_modules; do
 		echo "            - $module"
 	done
-fi
+])
 
 echo "Plugins"
 echo "   Built:"
 for plugin in $PLUGINS; do
 echo "            - $plugin"
-if test x"$plugin" = xnotification; then
+AS_IF([test x"$plugin" = xnotification], [
 	echo "                Features:"
 	for notif_feature in $notification_features; do
 		echo "                    $notif_feature"
 	done;
-	if test "x$notification_missing_dependencies" != x; then
+	AS_IF([test "x$notification_missing_dependencies" != x], [
 		echo "                Disabled due to missing dependencies:"
 		for notif_miss_dep in $notification_missing_dependencies; do
 			echo "                    $notif_miss_dep"
 		done;
-	fi
-fi
+	])
+])
 done;
-if test "x$DISABLED_PLUGINS" != x; then
+AS_IF([test "x$DISABLED_PLUGINS" != x], [
 echo "   Disabled:"
 for plugin in $DISABLED_PLUGINS; do
 echo "            - $plugin"
 done;
-fi
+])
 
-if test "x$MISSING_DEPS_PLUGINS" != x; then
+AS_IF([test "x$MISSING_DEPS_PLUGINS" != x], [
 echo "   Disabled due to missing dependencies:"
 for plugin in $MISSING_DEPS_PLUGINS; do
 echo "            - $plugin"
 done;
-fi
+])
 echo ""
 echo "The binary will be installed in $prefix/bin"
 echo ""
-- 
2.52.0