From: Maria Matejka <mq@ucw.cz>
Date: Mon, 23 Jan 2023 18:05:41 +0000 (+0100)
Subject: Merge commit 'd3f50ede127df338f575e188566035b2a46cf6c6' into thread-next
X-Git-Tag: v3.0-alpha1~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5481bcd82f4c9dc2074267fb56858f5bf48910df;p=thirdparty%2Fbird.git

Merge commit 'd3f50ede127df338f575e188566035b2a46cf6c6' into thread-next
---

5481bcd82f4c9dc2074267fb56858f5bf48910df
diff --cc configure.ac
index 2f37f9d0e,f8ab15375..b37351230
--- a/configure.ac
+++ b/configure.ac
@@@ -36,6 -36,18 +36,12 @@@ AC_ARG_ENABLE([memcheck]
    [enable_memcheck=yes]
  )
  
+ AC_ARG_ENABLE([compact-tries],
+   [AS_HELP_STRING([--enable-compact-tries], [use 4-way tries instead of 16-way ones @<:@no@:>@])],
+   [],
+   [enable_compact_tries=no]
+ )
+ 
 -AC_ARG_ENABLE([pthreads],
 -  [AS_HELP_STRING([--enable-pthreads], [enable POSIX threads support @<:@try@:>@])],
 -  [],
 -  [enable_pthreads=try]
 -)
 -
  AC_ARG_ENABLE([libssh],
    [AS_HELP_STRING([--enable-libssh], [enable LibSSH support in RPKI @<:@try@:>@])],
    [],
@@@ -475,6 -479,8 +485,7 @@@ AC_MSG_RESULT([        Object directory
  AC_MSG_RESULT([        Iproute2 directory:	$iproutedir])
  AC_MSG_RESULT([        System configuration:	$sysdesc])
  AC_MSG_RESULT([        Debugging:		$enable_debug])
+ AC_MSG_RESULT([        Compact tries:		$enable_compact_tries])
 -AC_MSG_RESULT([        POSIX threads:		$enable_pthreads])
  AC_MSG_RESULT([        Routing protocols:	$protocols])
  AC_MSG_RESULT([        LibSSH support in RPKI:	$enable_libssh])
  AC_MSG_RESULT([        Kernel MPLS support:	$enable_mpls_kernel])