@@ -216,7 +216,7 @@ have_jit="no"

 if test "$subdirfailed" = "no"; then

     have_jit="yes"

 fi

-CL_MSG_STATUS([jit         ],[$have_jit],[$enable_llvm])

+CL_MSG_STATUS([llvm        ],[$have_jit, from $system_llvm],[$enable_llvm])

 CL_MSG_STATUS([mempool     ],[$have_mempool],[$enable_mempool])

 AC_MSG_NOTICE([Summary of engine detection features])

@@ -49,27 +49,40 @@ GMAKE="$llvm_cv_gnu_make_command"

 AC_SUBST([GMAKE])

 llvmconfig=

-AC_ARG_WITH([system-llvm], AC_HELP_STRING([-with-system-llvm],

-[Use system llvm instead of built-in, requires full path to llvm-config]),

+AC_ARG_WITH([system-llvm], AC_HELP_STRING([--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)]),

 [case "$withval" in

   yes)

-    AC_MSG_ERROR([--with-system-llvm needs full path to llvm-config])

-    ;;

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

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

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

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

+         AC_MSG_ERROR([llvm-config cannot be found within defaults])

+       fi

+     fi

+     ;;

   no) ;;

   *)

-    llvmconfig="$withval"

-    llvmver=`$llvmconfig --version`

-

-    AC_SUBST(LLVMCONFIG_CXXFLAGS, [`$llvmconfig --cxxflags`])

-    AC_SUBST(LLVMCONFIG_LDFLAGS, [`$llvmconfig --ldflags`])

-    AC_SUBST(LLVMCONFIG_LIBS, [`$llvmconfig --libs jit nativecodegen scalaropts ipo`])

-    AC_SUBST(LLVMCONFIG_LIBFILES, [`$llvmconfig --libfiles jit nativecodegen scalaropts ipo`])

-    AC_MSG_NOTICE([Using external LLVM])

-    AC_MSG_NOTICE([CXXFLAGS from llvm-config: $LLVMCONFIG_CXXFLAGS])

-    AC_MSG_NOTICE([LDFLAGS from llvm-config: $LLVMCONFIG_LDFLAGS])

-    AC_MSG_NOTICE([LIBS from llvm-config: $LLVMCONFIG_LIBS])

-    ;;

+     llvmconfig="$withval"

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

+       AC_MSG_ERROR([llvm-config does not exist at $llvmconfig])

+     fi

+     ;;

   esac

+

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

+     llvmver=`$llvmconfig --version`

+

+     AC_SUBST(LLVMCONFIG_CXXFLAGS, [`$llvmconfig --cxxflags`])

+     AC_SUBST(LLVMCONFIG_LDFLAGS, [`$llvmconfig --ldflags`])

+     AC_SUBST(LLVMCONFIG_LIBS, [`$llvmconfig --libs jit nativecodegen scalaropts ipo`])

+     AC_SUBST(LLVMCONFIG_LIBFILES, [`$llvmconfig --libfiles jit nativecodegen scalaropts ipo`])

+     AC_MSG_NOTICE([Using external LLVM])

+     AC_MSG_NOTICE([CXXFLAGS from llvm-config: $LLVMCONFIG_CXXFLAGS])

+     AC_MSG_NOTICE([LDFLAGS from llvm-config: $LLVMCONFIG_LDFLAGS])

+     AC_MSG_NOTICE([LIBS from llvm-config: $LLVMCONFIG_LIBS])

+ fi

 ])

 AC_MSG_CHECKING([for supported LLVM version])

@@ -1,8 +1,32 @@

+AC_ARG_WITH([system-llvm], AC_HELP_STRING([--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)]),

+[case "$withval" in

+  yes)

+    system_llvm="default"

+    ;;

+  no)

+    system_llvm="built-in"

+    ;;

+  *)

+    system_llvm=$withval

+ esac

+], [system_llvm="built-in"])

+

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

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

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

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

+[enable_llvm=$enableval],

+[

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

+    enable_llvm="yes"

+else

+    enable_llvm="auto"

+fi

+])

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

     dnl Try to configure subdir, optionally

     AC_CONFIG_SUBDIRS_OPTIONAL([libclamav/c++])

+else

+    system_llvm="none"

 fi