@@ -19896,7 +19896,7 @@ fi

 if test "${enable_llvm+set}" = set; then :

   enableval=$enable_llvm; enable_llvm=$enableval

 else

-  enable_llvm="auto"

+  enable_llvm="no"

 fi

@@ -1592,7 +1592,7 @@ fi

 AC_ARG_ENABLE([llvm],AC_HELP_STRING([--enable-llvm],

 				    [Enable 'llvm' JIT/verifier support @<:@default=auto@:>@]),

-				    [enable_llvm=$enableval], [enable_llvm="auto"])

+				    [enable_llvm=$enableval], [enable_llvm="no"])

 if test "$enable_llvm" != "no"; then

     dnl Try to configure subdir, optionally

@@ -387,7 +387,7 @@ int cli_ac_init(struct cli_matcher *root, uint8_t mindepth, uint8_t maxdepth)

     root->ac_maxdepth = maxdepth;

     /* TODO: dconf here ?*/

-    if (cli_mtargets[root->type].enable_prefiltering && 0) {/* Disabled for now */

+    if (cli_mtargets[root->type].enable_prefiltering && 1) {/* Disabled for now */

 	root->filter = mpool_malloc(root->mempool, sizeof(*root->filter));

 	if (!root->filter) {

 	    cli_errmsg("cli_ac_init: Can't allocate memory for ac_root->filter\n");