From: Karl Fleischmann <karl.fleischmann@open-xchange.com>
Date: Tue, 14 Jun 2022 08:16:19 +0000 (+0200)
Subject: m4: want_textcat.m4 - Modernize m4 syntax
X-Git-Tag: 2.4.0~3868
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ea728570c7cbafd3373eccd1a9fb663a143fe3a;p=thirdparty%2Fdovecot%2Fcore.git

m4: want_textcat.m4 - Modernize m4 syntax
---

diff --git a/m4/want_textcat.m4 b/m4/want_textcat.m4
index 8bf7774814..fa7fd86ee7 100644
--- a/m4/want_textcat.m4
+++ b/m4/want_textcat.m4
@@ -1,13 +1,14 @@
 AC_DEFUN([DOVECOT_WANT_TEXTCAT], [
-  if test $want_textcat != no; then
-    if test "$PKG_CONFIG" != "" && $PKG_CONFIG --exists libexttextcat 2>/dev/null; then
+  AS_IF([test "$want_textcat" != "no"], [
+    AS_IF([test "$PKG_CONFIG" != "" && $PKG_CONFIG --exists libexttextcat 2>/dev/null], [
       PKG_CHECK_MODULES(LIBEXTTEXTCAT, libexttextcat)
       TEXTCAT_DATADIR=`$PKG_CONFIG --variable=pkgdatadir libexttextcat`
       AC_DEFINE(HAVE_FTS_EXTTEXTCAT,, [Define if you want exttextcat support for FTS])
       have_fts_exttextcat=yes
-      # Debian Wheezy workaround - LIBEXTTEXTCAT_CFLAGS include path is wrong:
+
+      dnl Debian Wheezy workaround - LIBEXTTEXTCAT_CFLAGS include path is wrong:
       AC_CHECK_HEADERS(libexttextcat/textcat.h)
-    else
+    ], [
       AC_CHECK_LIB(exttextcat, special_textcat_Init, [
         have_fts_exttextcat=yes
         AC_CHECK_HEADERS(libexttextcat/textcat.h)
@@ -22,15 +23,15 @@ AC_DEFUN([DOVECOT_WANT_TEXTCAT], [
           AC_CHECK_HEADERS(libtextcat/textcat.h)
         ])
       ])
-      if test $want_textcat = yes && test "$have_fts_exttextcat" != yes && test "$have_fts_textcat" != yes; then
+      AS_IF([test "$want_textcat" = "yes" && test "$have_fts_exttextcat" != "yes" && test "$have_fts_textcat" != "yes"], [
         AC_ERROR([Can't build with textcat support: libtextcat or libexttextcat not found])
-      fi
-    fi
-    if test "$have_fts_exttextcat" = yes || test "$have_fts_textcat" = yes; then
+      ])
+    ])
+    AS_IF([test "$have_fts_exttextcat" = "yes" || test "$have_fts_textcat" = "yes"], [
       AC_DEFINE(HAVE_FTS_TEXTCAT,, [Define if you want textcat support for FTS])
       AC_DEFINE_UNQUOTED(TEXTCAT_DATADIR, "$TEXTCAT_DATADIR", [Points to textcat pkgdatadir containing the language files])
-    fi
-  fi
+    ])
+  ])
   AM_CONDITIONAL(BUILD_FTS_TEXTCAT, test "$have_fts_textcat" = "yes")
   AM_CONDITIONAL(BUILD_FTS_EXTTEXTCAT, test "$have_fts_exttextcat" = "yes")
 ])