Default to argon2 library shipped with UnrealIRCd, the reason

for this is that system argon2 is often much slower (2x slower
on Ubuntu and Debian, for instance), which is not good.
You can still use the system library with the configure option:
--with-system-argon2

diff --git a/configure b/configure
index a4a2f936219fdc02ad09cdcf350f57f21c95dc58..c87148d3aa9311d0b661a99abff7adb6a90b4b77 100755 (executable)
--- a/configure
+++ b/configure
@@ -1498,8 +1498,9 @@ Optional Packages:
                           Require opers to invite themselves to +s/+p channels
   --without-system-pcre2  Use the system pcre2 package instead of bundled,
                           discovered using pkg-config
-  --without-system-argon2 Use bundled version instead of system argon2
-                          library. Normally autodetected via pkg-config
+  --with-system-argon2    Use system argon2 instead of bundled version.
+                          Normally we prefer the one shipped with unrealircd
+                          because it is much faster
   --without-system-sodium Use bundled version instead of system sodium
                           library. Normally autodetected via pkg-config
   --without-system-cares  Use bundled version instead of system c-ares.
@@ -7170,7 +7171,7 @@ if test ${with_system_argon2+y}
 then :
   withval=$with_system_argon2;
 else $as_nop
-  with_system_argon2=yes
+  with_system_argon2=no
 fi
 
 

diff --git a/configure.ac b/configure.ac
index 215b783fb20dd23ab8399cceca87649ff34d9072..d630fb6d5e6d042402f9c0edb42973fae119c8b9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -542,7 +542,7 @@ AC_ARG_WITH(operoverride-verify, [AS_HELP_STRING([--with-operoverride-verify], [
        [AS_IF([test $withval = "yes"],
                [AC_DEFINE([OPEROVERRIDE_VERIFY], [], [Define if you want opers to have to use /invite to join +s/+p channels])])])
 AC_ARG_WITH(system-pcre2, [AS_HELP_STRING([--without-system-pcre2], [Use the system pcre2 package instead of bundled, discovered using pkg-config])], [], [with_system_pcre2=yes])
-AC_ARG_WITH(system-argon2, [AS_HELP_STRING([--without-system-argon2], [Use bundled version instead of system argon2 library. Normally autodetected via pkg-config])], [], [with_system_argon2=yes])
+AC_ARG_WITH(system-argon2, [AS_HELP_STRING([--with-system-argon2], [Use system argon2 instead of bundled version. Normally we prefer the one shipped with unrealircd because it is much faster])], [], [with_system_argon2=no])
 AC_ARG_WITH(system-sodium, [AS_HELP_STRING([--without-system-sodium], [Use bundled version instead of system sodium library. Normally autodetected via pkg-config])], [], [with_system_sodium=yes])
 AC_ARG_WITH(system-cares, [AS_HELP_STRING([--without-system-cares], [Use bundled version instead of system c-ares. Normally autodetected via pkg-config.])], [], [with_system_cares=yes])
 AC_ARG_WITH(system-jansson, [AS_HELP_STRING([--without-system-jansson], [Use bundled version instead of system jansson. Normally autodetected via pkg-config.])], [], [with_system_jansson=yes])