@@ -190,6 +190,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/clamdtop.m4 \

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

 	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \

@@ -522,6 +523,7 @@ infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+llvmconfig = @llvmconfig@

 localedir = @localedir@

 localstatedir = @localstatedir@

 ltdl_LIBOBJS = @ltdl_LIBOBJS@

@@ -165,6 +165,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/clamdtop.m4 \

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

 	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \

@@ -476,6 +477,7 @@ infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+llvmconfig = @llvmconfig@

 localedir = @localedir@

 localstatedir = @localstatedir@

 ltdl_LIBOBJS = @ltdl_LIBOBJS@

@@ -146,6 +146,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/clamdtop.m4 \

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

 	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \

@@ -412,6 +413,7 @@ infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+llvmconfig = @llvmconfig@

 localedir = @localedir@

 localstatedir = @localstatedir@

 ltdl_LIBOBJS = @ltdl_LIBOBJS@

@@ -164,6 +164,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/clamdtop.m4 \

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

 	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \

@@ -430,6 +431,7 @@ infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+llvmconfig = @llvmconfig@

 localedir = @localedir@

 localstatedir = @localstatedir@

 ltdl_LIBOBJS = @ltdl_LIBOBJS@

@@ -166,6 +166,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/clamdtop.m4 \

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

 	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \

@@ -479,6 +480,7 @@ infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+llvmconfig = @llvmconfig@

 localedir = @localedir@

 localstatedir = @localstatedir@

 ltdl_LIBOBJS = @ltdl_LIBOBJS@

@@ -164,6 +164,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/clamdtop.m4 \

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

 	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \

@@ -441,6 +442,7 @@ infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+llvmconfig = @llvmconfig@

 localedir = @localedir@

 localstatedir = @localstatedir@

 ltdl_LIBOBJS = @ltdl_LIBOBJS@

@@ -146,6 +146,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/clamdtop.m4 \

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

 	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \

@@ -447,6 +448,7 @@ infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+llvmconfig = @llvmconfig@

 localedir = @localedir@

 localstatedir = @localstatedir@

 ltdl_LIBOBJS = @ltdl_LIBOBJS@

@@ -165,6 +165,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/clamdtop.m4 \

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

 	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \

@@ -432,6 +433,7 @@ infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+llvmconfig = @llvmconfig@

 localedir = @localedir@

 localstatedir = @localstatedir@

 ltdl_LIBOBJS = @ltdl_LIBOBJS@

@@ -164,6 +164,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/clamdtop.m4 \

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

 	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \

@@ -430,6 +431,7 @@ infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+llvmconfig = @llvmconfig@

 localedir = @localedir@

 localstatedir = @localstatedir@

 ltdl_LIBOBJS = @ltdl_LIBOBJS@

@@ -685,6 +685,7 @@ ENABLE_LIBFRESHCLAM_FALSE

 ENABLE_LIBFRESHCLAM_TRUE

 HAVE_YARA

 subdirs

+llvmconfig

 WERR_CFLAGS_MILTER

 WERR_CFLAGS

 HAVE_CURSES_FALSE

@@ -939,9 +940,9 @@ enable_clamdtop

 with_libncurses_prefix

 with_libpdcurses_prefix

 enable_distcheck_werror

+enable_llvm

 with_system_llvm

 with_llvm_linking

-enable_llvm

 enable_sha_collector_for_internal_use

 enable_yara

 enable_libfreshclam

@@ -1680,9 +1681,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-system-llvm      Specify system llvm location or to use old package,

+                          uses full path to llvm-config or bin directory

+                          (default=search PATH environment variable)

   --with-llvm-linking     specifies method to linking llvm [static|dynamic],

                           only valid with --with-system-llvm

   --with-libcurl[=DIR]    path to directory containing libcurl

@@ -23931,67 +23932,168 @@ fi

+# Check whether --enable-llvm was given.

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

+  enableval=$enable_llvm; enable_llvm=$enableval

+else

+  enable_llvm="auto"

+fi

+

+

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

+

+

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

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

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

+  withval=$with_system_llvm; system_llvm=$withval; if test "$enable_llvm" = "auto"; then enable_llvm="yes"; fi

+else

+  system_llvm="yes"

+fi

+

+

+case "$system_llvm" in

   yes)

-    system_llvm="default"

-    ;;

-  no)

-    system_llvm="built-in"

-    ;;

+     # Extract the first word of "llvm-config", so it can be a program name with args.

+set dummy llvm-config; ac_word=$2

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

+$as_echo_n "checking for $ac_word... " >&6; }

+if ${ac_cv_path_llvmconfig+:} false; then :

+  $as_echo_n "(cached) " >&6

+else

+  case $llvmconfig in

+  [\\/]* | ?:[\\/]*)

+  ac_cv_path_llvmconfig="$llvmconfig" # Let the user override the test with a path.

+  ;;

   *)

-    system_llvm=$withval

- esac

+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

+for as_dir in $PATH

+do

+  IFS=$as_save_IFS

+  test -z "$as_dir" && as_dir=.

+    for ac_exec_ext in '' $ac_executable_extensions; do

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

+    ac_cv_path_llvmconfig="$as_dir/$ac_word$ac_exec_ext"

+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

+    break 2

+  fi

+done

+  done

+IFS=$as_save_IFS

+  ;;

+esac

+fi

+llvmconfig=$ac_cv_path_llvmconfig

+if test -n "$llvmconfig"; then

+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $llvmconfig" >&5

+$as_echo "$llvmconfig" >&6; }

 else

-  system_llvm="built-in"

+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

+$as_echo "no" >&6; }

 fi

-

-# Check whether --with-llvm-linking was given.

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

-  withval=$with_llvm_linking;

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

-   as_fn_error $? "Failed to configure LLVM, and LLVM linking was specified without specifying system-llvm" "$LINENO" 5

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

+         llvmoptserrmsg="llvm-config cannot be found within PATH"

+     fi

+     ;;

+  no) ;;

+  *)

+     if test -d "$withval"; then

+         # Extract the first word of "llvm-config", so it can be a program name with args.

+set dummy llvm-config; ac_word=$2

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

+$as_echo_n "checking for $ac_word... " >&6; }

+if ${ac_cv_path_llvmconfig+:} false; then :

+  $as_echo_n "(cached) " >&6

 else

-case "$withval" in

-  static)

-    llvm_linking="static"

-    ;;

-  dynamic)

-    llvm_linking="dynamic"

-    ;;

+  case $llvmconfig in

+  [\\/]* | ?:[\\/]*)

+  ac_cv_path_llvmconfig="$llvmconfig" # Let the user override the test with a path.

+  ;;

   *)

-    as_fn_error $? "Invalid argument to --with-llvm-linking" "$LINENO" 5

+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

+for as_dir in $withval/bin

+do

+  IFS=$as_save_IFS

+  test -z "$as_dir" && as_dir=.

+    for ac_exec_ext in '' $ac_executable_extensions; do

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

+    ac_cv_path_llvmconfig="$as_dir/$ac_word$ac_exec_ext"

+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

+    break 2

+  fi

+done

+  done

+IFS=$as_save_IFS

+

+  ;;

 esac

 fi

-

+llvmconfig=$ac_cv_path_llvmconfig

+if test -n "$llvmconfig"; then

+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $llvmconfig" >&5

+$as_echo "$llvmconfig" >&6; }

 else

+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

+$as_echo "no" >&6; }

+fi

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

-   llvm_linking=""

-else

-   llvm_linking="auto"

+

+     else

+         llvmconfig=$withval

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

+             llvmconfig=""

+         fi

+     fi

+

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

+         llvmoptserrmsg="llvm-config does not exist at $withval"

+     fi

+     ;;

+esac

+

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

+

+

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

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

+  withval=$with_llvm_linking; if test "x$llvmconfig" = "x"; then

+   as_fn_error $? "Failed to configure LLVM, and LLVM linking was specified without valid llvm-config" "$LINENO" 5

+else

+   case "$withval" in

+     static)

+         llvm_linking="static"

+         ;;

+     dynamic)

+         llvm_linking="dynamic"

+         ;;

+     *)

+         as_fn_error $? "Invalid argument to --with-llvm-linking" "$LINENO" 5

+   esac

 fi

+else

+  llvm_linking=""

 fi

-# Check whether --enable-llvm was given.

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

-  enableval=$enable_llvm; enable_llvm=$enableval

-else

+llvmver=`$llvmconfig --version`

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

-    enable_llvm="yes"

 else

-    enable_llvm="auto"

-fi

+llvmver="2.8"

+system_llvm="internal"

 fi

+fi

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

+    if test "$enable_llvm" = "auto"; then

+        enable_llvm="no"

+    else

+        as_fn_error $? "Failed to configure LLVM, and LLVM was explicitly requested" "$LINENO" 5

+            fi

+fi

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

@@ -29559,18 +29661,32 @@ have_jit="no"

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

     have_jit="yes"

 fi

-if test "x$llvm_linking" = "x"; then

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

+

+

+   $as_echo_n "              llvm        : "

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

+  $as_echo "$have_jit (disabled)"

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

+  $as_echo "$have_jit"

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

+  $as_echo "$have_jit"

+else

+  $as_echo "$have_jit ($enable_llvm)"

+fi

+

+elif test "x$llvm_linking" = "x"; then

    $as_echo_n "              llvm        : "

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

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

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

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

-  $as_echo "$have_jit, from $system_llvm"

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

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

-  $as_echo "$have_jit, from $system_llvm"

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

 else

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

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

 fi

 else

@@ -29578,13 +29694,13 @@ else

    $as_echo_n "              llvm        : "

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

-  $as_echo "$have_jit, from $system_llvm ($llvm_linking) (disabled)"

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

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

-  $as_echo "$have_jit, from $system_llvm ($llvm_linking)"

+  $as_echo "$have_jit($llvmver), from $system_llvm ($llvm_linking)"

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

-  $as_echo "$have_jit, from $system_llvm ($llvm_linking)"

+  $as_echo "$have_jit($llvmver), from $system_llvm ($llvm_linking)"

 else

-  $as_echo "$have_jit, from $system_llvm ($llvm_linking) ($enable_llvm)"

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

 fi

 fi

@@ -162,6 +162,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/clamdtop.m4 \

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

 	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \

@@ -378,6 +379,7 @@ infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+llvmconfig = @llvmconfig@

 localedir = @localedir@

 localstatedir = @localstatedir@

 ltdl_LIBOBJS = @ltdl_LIBOBJS@

@@ -162,6 +162,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/clamdtop.m4 \

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

 	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \

@@ -412,6 +413,7 @@ infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+llvmconfig = @llvmconfig@

 localedir = @localedir@

 localstatedir = @localstatedir@

 ltdl_LIBOBJS = @ltdl_LIBOBJS@

@@ -163,6 +163,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/clamdtop.m4 \

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

 	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \

@@ -408,6 +409,7 @@ infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+llvmconfig = @llvmconfig@

 localedir = @localedir@

 localstatedir = @localstatedir@

 ltdl_LIBOBJS = @ltdl_LIBOBJS@

@@ -167,6 +167,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/clamdtop.m4 \

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

 	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \

@@ -465,6 +466,7 @@ infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+llvmconfig = @llvmconfig@

 localedir = @localedir@

 localstatedir = @localstatedir@

 ltdl_LIBOBJS = @ltdl_LIBOBJS@

@@ -191,6 +191,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/clamdtop.m4 \

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

 	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \

@@ -889,6 +890,7 @@ infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+llvmconfig = @llvmconfig@

 localedir = @localedir@

 localstatedir = @localstatedir@

 ltdl_LIBOBJS = @ltdl_LIBOBJS@

@@ -123,7 +123,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/check_gnu_make.m4 \

 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

 	$(top_srcdir)/../../m4/reorganization/libs/openssl.m4 \

-	$(top_srcdir)/m4/llvm-flags.m4 $(top_srcdir)/configure.ac

+	$(top_srcdir)/m4/llvm-opts.m4 $(top_srcdir)/configure.ac

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \

@@ -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 \

@@ -648,11 +648,11 @@ THREAD_LIBS

 DEBUG_BUILD_FALSE

 DEBUG_BUILD_TRUE

 LLVM_VERSION

-subdirs

 LLVMCONFIG_LIBFILES

 LLVMCONFIG_LIBS

 LLVMCONFIG_LDFLAGS

 LLVMCONFIG_CXXFLAGS

+subdirs

 llvmconfig

 GMAKE

 ifGNUmake

@@ -1472,9 +1472,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, uses full path

-                          to llvm-config or bin directory (default=search PATH

-                          environment variable)

+  --with-system-llvm      Specify system llvm location or to use old package,

+                          uses full path to llvm-config or bin directory

+                          (default=search PATH environment variable)

   --with-llvm-linking     specifies method to linking llvm [static|dynamic],

                           only valid with --with-system-llvm

@@ -16412,10 +16412,18 @@ else

 fi

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

+

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

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

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

+  withval=$with_system_llvm; system_llvm=$withval; if test "$enable_llvm" = "auto"; then enable_llvm="yes"; fi

+else

+  system_llvm="yes"

+fi

+

+

+case "$system_llvm" in

   yes)

      # Extract the first word of "llvm-config", so it can be a program name with args.

 set dummy llvm-config; ac_word=$2

@@ -16458,7 +16466,7 @@ fi

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

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

+         llvmoptserrmsg="llvm-config cannot be found within PATH"

      fi

      ;;

   no) ;;

@@ -16512,13 +16520,12 @@ fi

      fi

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

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

+         llvmoptserrmsg="llvm-config does not exist at $withval"

      fi

      ;;

-  esac

-

-fi

+esac

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

 # Check whether --with-llvm-linking was given.

@@ -16543,13 +16550,27 @@ else

 fi

+llvmver=`$llvmconfig --version`

+

+else

+llvmver="2.8"

+system_llvm="internal"

+

+fi

+fi

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

+    as_fn_error $? "$llvmflagerrmsg" "$LINENO" 5

+fi

+

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

-    llvmver=`$llvmconfig --version`

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

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

 else

-    llvmver="2.8"

     packaged_llvm="yes"

+

+

+subdirs="$subdirs llvm"

+

 fi

 llvmver_val=`echo "$llvmver" | sed -e 's/svn//g'`

@@ -16631,15 +16652,6 @@ $as_echo "$as_me: LDFLAGS from llvm-config: $LLVMCONFIG_LDFLAGS" >&6;}

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

 fi

 llvmver_int=${llvmver_major}${llvmver_minor}

-

-

-if test "x$llvmconfig" = "x"; then

-

-

-subdirs="$subdirs llvm"

-

-fi

-

 LLVM_VERSION=$llvmver_int

@@ -163,6 +163,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/clamdtop.m4 \

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

 	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \

@@ -457,6 +458,7 @@ infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+llvmconfig = @llvmconfig@

 localedir = @localedir@

 localstatedir = @localstatedir@

 ltdl_LIBOBJS = @ltdl_LIBOBJS@

@@ -152,6 +152,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/clamdtop.m4 \

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

 	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \

@@ -509,6 +510,7 @@ infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+llvmconfig = @llvmconfig@

 localedir = @localedir@

 localstatedir = @localstatedir@

 ltdl_LIBOBJS = @ltdl_LIBOBJS@

@@ -164,6 +164,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/clamdtop.m4 \

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

 	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \

@@ -431,6 +432,7 @@ infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+llvmconfig = @llvmconfig@

 localedir = @localedir@

 localstatedir = @localstatedir@

 ltdl_LIBOBJS = @ltdl_LIBOBJS@

@@ -145,6 +145,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/clamdtop.m4 \

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

 	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \

@@ -361,6 +362,7 @@ infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+llvmconfig = @llvmconfig@

 localedir = @localedir@

 localstatedir = @localstatedir@

 ltdl_LIBOBJS = @ltdl_LIBOBJS@

@@ -147,6 +147,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/clamdtop.m4 \

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

 	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \

@@ -651,6 +652,7 @@ infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+llvmconfig = @llvmconfig@

 localedir = @localedir@

 localstatedir = @localstatedir@

 ltdl_LIBOBJS = @ltdl_LIBOBJS@