@@ -913,6 +913,7 @@ enable_clamdtop

 with_libncurses_prefix

 with_libpdcurses_prefix

 enable_distcheck_werror

+with_system_llvm

 enable_llvm

 enable_sha_collector_for_internal_use

 with_libcurl

@@ -1624,6 +1625,9 @@ Optional Packages:

   --without-libncurses-prefix     don't search for libncurses in includedir and libdir

   --with-libpdcurses-prefix[=DIR]  search for libpdcurses in DIR/include and DIR/lib

   --without-libpdcurses-prefix     don't search for libpdcurses in includedir and libdir

+  --with-system-llvm      Use system llvm instead of built-in, uses full path

+                          to llvm-config (default= /usr/local or /usr if not

+                          found in /usr/local)

   --with-libcurl=DIR   path to directory containing libcurl (default=

     /usr/local or /usr if not found in /usr/local)

@@ -22324,11 +22328,36 @@ fi

+

+# Check whether --with-system-llvm was given.

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

+  withval=$with_system_llvm; case "$withval" in

+  yes)

+    system_llvm="default"

+    ;;

+  no)

+    system_llvm="built-in"

+    ;;

+  *)

+    system_llvm=$withval

+ esac

+

+else

+  system_llvm="built-in"

+fi

+

+

 # Check whether --enable-llvm was given.

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

   enableval=$enable_llvm; enable_llvm=$enableval

 else

-  enable_llvm="auto"

+

+if test "x$system_llvm" != "xbuilt-in"; then

+    enable_llvm="yes"

+else

+    enable_llvm="auto"

+fi

+

 fi

@@ -22344,6 +22373,8 @@ subdirs="$subdirs libclamav/c++"

+else

+    system_llvm="none"

 fi

 # Check whether --enable-sha-collector-for-internal-use was given.

@@ -27974,15 +28005,15 @@ if test "$subdirfailed" = "no"; then

 fi

-   $as_echo_n "              jit         : "

+   $as_echo_n "              llvm        : "

    if test "x$enable_llvm" = "xno"; then :

-  $as_echo "$have_jit (disabled)"

+  $as_echo "$have_jit, from $system_llvm (disabled)"

 elif test "x$enable_llvm" = "xyes"; then :

-  $as_echo "$have_jit"

+  $as_echo "$have_jit, from $system_llvm"

 elif test "x$enable_llvm" = "x"; then :

-  $as_echo "$have_jit"

+  $as_echo "$have_jit, from $system_llvm"

 else

-  $as_echo "$have_jit ($enable_llvm)"

+  $as_echo "$have_jit, from $system_llvm ($enable_llvm)"

 fi

@@ -5750,8 +5750,8 @@ maintainer-clean-generic:

 	@echo "This command is intended for maintainers to use"

 	@echo "it deletes files that may require special tools to rebuild."

 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)

-@BUILD_EXTERNAL_LLVM_TRUE@distclean-local:

 @BUILD_EXTERNAL_LLVM_TRUE@clean-local:

+@BUILD_EXTERNAL_LLVM_TRUE@distclean-local:

 clean: clean-am

 clean-am: clean-generic clean-libtool clean-local \

@@ -1463,8 +1463,9 @@ Optional Packages:

   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]

   --with-sysroot=DIR Search for dependent libraries within DIR

                         (or the compiler's sysroot if not specified).

-  -with-system-llvm       Use system llvm instead of built-in, requires full

-                          path to llvm-config

+  --with-system-llvm      Use system llvm instead of built-in, uses full path

+                          to llvm-config (default= search /usr/local or /usr

+                          if not found in /usr/local)

   --with-libjson=DIR   path to directory containing libjson (default=

     /usr/local or /usr if not found in /usr/local)

@@ -15606,31 +15607,43 @@ llvmconfig=

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

   withval=$with_system_llvm; case "$withval" in

   yes)

-    as_fn_error $? "--with-system-llvm needs full path to llvm-config" "$LINENO" 5

-    ;;

+     llvmconfig="/usr/local/bin/llvm-config"

+     if test ! -x "$llvmconfig"; then

+     llvmconfig="/usr/bin/llvm-config"

+       if test ! -x "$llvmconfig"; then

+         as_fn_error $? "llvm-config cannot be found within defaults" "$LINENO" 5

+       fi

+     fi

+     ;;

   no) ;;

   *)

-    llvmconfig="$withval"

-    llvmver=`$llvmconfig --version`

+     llvmconfig="$withval"

+     if test ! -x "$llvmconfig"; then

+       as_fn_error $? "llvm-config does not exist at $llvmconfig" "$LINENO" 5

+     fi

+     ;;

+  esac

+

+ if test "x$llvmconfig" != "x"; then

+     llvmver=`$llvmconfig --version`

-    LLVMCONFIG_CXXFLAGS=`$llvmconfig --cxxflags`

+     LLVMCONFIG_CXXFLAGS=`$llvmconfig --cxxflags`

-    LLVMCONFIG_LDFLAGS=`$llvmconfig --ldflags`

+     LLVMCONFIG_LDFLAGS=`$llvmconfig --ldflags`

-    LLVMCONFIG_LIBS=`$llvmconfig --libs jit nativecodegen scalaropts ipo`

+     LLVMCONFIG_LIBS=`$llvmconfig --libs jit nativecodegen scalaropts ipo`

-    LLVMCONFIG_LIBFILES=`$llvmconfig --libfiles jit nativecodegen scalaropts ipo`

+     LLVMCONFIG_LIBFILES=`$llvmconfig --libfiles jit nativecodegen scalaropts ipo`

-    { $as_echo "$as_me:${as_lineno-$LINENO}: Using external LLVM" >&5

+     { $as_echo "$as_me:${as_lineno-$LINENO}: Using external LLVM" >&5

 $as_echo "$as_me: Using external LLVM" >&6;}

-    { $as_echo "$as_me:${as_lineno-$LINENO}: CXXFLAGS from llvm-config: $LLVMCONFIG_CXXFLAGS" >&5

+     { $as_echo "$as_me:${as_lineno-$LINENO}: CXXFLAGS from llvm-config: $LLVMCONFIG_CXXFLAGS" >&5

 $as_echo "$as_me: CXXFLAGS from llvm-config: $LLVMCONFIG_CXXFLAGS" >&6;}

-    { $as_echo "$as_me:${as_lineno-$LINENO}: LDFLAGS from llvm-config: $LLVMCONFIG_LDFLAGS" >&5

+     { $as_echo "$as_me:${as_lineno-$LINENO}: LDFLAGS from llvm-config: $LLVMCONFIG_LDFLAGS" >&5

 $as_echo "$as_me: LDFLAGS from llvm-config: $LLVMCONFIG_LDFLAGS" >&6;}

-    { $as_echo "$as_me:${as_lineno-$LINENO}: LIBS from llvm-config: $LLVMCONFIG_LIBS" >&5

+     { $as_echo "$as_me:${as_lineno-$LINENO}: LIBS from llvm-config: $LLVMCONFIG_LIBS" >&5

 $as_echo "$as_me: LIBS from llvm-config: $LLVMCONFIG_LIBS" >&6;}

-    ;;

-  esac

+ fi

 fi