configure: Detect libsodium presence

diff --git a/configure.ac b/configure.ac
index 51eeb5cc1036b74426006c2568d70a62e127495a..024df601c220fbb6a4ab2f93c983b39331c871c9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -180,6 +180,11 @@ AS_HELP_STRING([--with-solr], [Build with Solr full text search support]),
   TEST_WITH(solr, $withval),
   want_solr=no)
 
+AC_ARG_WITH(sodium,
+AS_HELP_STRING([--with-sodium], [Build with libsodium support (enables argon2 and scrypt, default: auto)]),
+  TEST_WITH(sodium, $withval),
+  want_sodium=auto)
+
 AC_ARG_WITH(zlib,
 AS_HELP_STRING([--with-zlib], [Build with zlib compression support (auto)]),
   TEST_WITH(zlib, $withval),
@@ -549,6 +554,7 @@ DOVECOT_WANT_DB
 DOVECOT_WANT_CDB
 DOVECOT_WANT_PGSQL
 DOVECOT_WANT_MYSQL
+DOVECOT_WANT_SODIUM
 DOVECOT_WANT_SQLITE
 DOVECOT_WANT_CASSANDRA
 DOVECOT_WANT_VPOPMAIL

diff --git a/m4/want_sodium.m4 b/m4/want_sodium.m4
new file mode 100644 (file)
index 0000000..7a331b5
--- /dev/null
+++ b/m4/want_sodium.m4
@@ -0,0 +1,12 @@
+AC_DEFUN([DOVECOT_WANT_SODIUM], [
+  if test "$want_sodium" != "no"; then
+    if test "$PKG_CONFIG" != "" && $PKG_CONFIG --exists libsodium 2>/dev/null; then
+      PKG_CHECK_MODULES(LIBSODIUM, libsodium)
+      have_sodium=yes
+      AC_DEFINE(HAVE_LIBSODIUM,, [Define if you have libsodium])
+    elif test "$want_sodium" = "yes"; then
+      AC_ERROR([Can't build with libsodium: not found])
+    fi
+  fi
+  AM_CONDITIONAL(BUILD_LIBSODIUM, test "$have_sodium" = "yes")
+])