From 859b5e90c3c99ce5adcc6cb4a296dde3a97000c9 Mon Sep 17 00:00:00 2001
From: defanor <defanor@uberspace.net>
Date: Sun, 19 Sep 2021 22:58:59 +0300
Subject: Allow to build without ICU (and JID checks)

---
 configure.ac | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index f75696b..de90408 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,8 +16,19 @@ AM_PROG_AR
 LT_INIT
 
 # Checks for libraries.
+
+PKG_CHECK_MODULES([UNBOUND], [libunbound])
+
 PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
 
+PKG_CHECK_MODULES([GSASL], [libgsasl])
+
+PKG_CHECK_MODULES([NETTLE], [nettle])
+
+AM_PATH_GPGME
+
+# TLS: GnuTLS, OpenSSL, or none
+
 AC_ARG_ENABLE([tls], AS_HELP_STRING([--disable-tls], [build without TLS support]))
 AC_ARG_WITH([openssl],
         AS_HELP_STRING([--with-openssl], [Use OpenSSL]))
@@ -42,16 +53,13 @@ AS_IF([test "x$with_gnutls" == "xyes"],
           [PKG_CHECK_MODULES([OPENSSL], [openssl],
             [AC_DEFINE([USE_OPENSSL], [1], [Use OpenSSL])])])])])
 
+# ICU, optional
 
-PKG_CHECK_MODULES([GSASL], [libgsasl])
-
-PKG_CHECK_MODULES([UNBOUND], [libunbound])
-
-AM_PATH_GPGME
-
-PKG_CHECK_MODULES([ICU_I18N], [icu-i18n])
-
-PKG_CHECK_MODULES([NETTLE], [nettle])
+AC_ARG_WITH([icu],
+        AS_HELP_STRING([--without-icu], [Don't use ICU for JID checks]))
+AS_IF([test "x$with_icu" != "xno"],
+      [PKG_CHECK_MODULES([ICU_I18N], [icu-i18n],
+        AC_DEFINE([HAVE_ICU], [1], [icu-i18n is available]))])
 
 
 # Checks for header files.
-- 
cgit v1.2.3