Fix Solaris/intel build (bb #1878).

libclamav/c++/configure

@@ -3783,7 +3783,7 @@ if test "$cxxset" != set; then
 fi
 case "$target_os" in
 solaris*)
-  CXXFLAGS="$CXXFLAGS -include llvm/System/Solaris.h"
+  CXXFLAGS="$CXXFLAGS -include llvm/include/llvm/System/Solaris.h"
   { $as_echo "$as_me:${as_lineno-$LINENO}: Building on Solaris" >&5
 $as_echo "$as_me: Building on Solaris" >&6;}
   ;;

libclamav/c++/configure.ac

@@ -32,7 +32,7 @@ if test "$cxxset" != set; then
 fi
 case "$target_os" in
 solaris*)
-  CXXFLAGS="$CXXFLAGS -include llvm/System/Solaris.h"
+  CXXFLAGS="$CXXFLAGS -include llvm/include/llvm/System/Solaris.h"
   AC_MSG_NOTICE([Building on Solaris])
   ;;
 esac

libclamav/c++/llvm/lib/System/Unix/Process.inc

@@ -59,6 +59,8 @@ Process::GetPageSize()
   return static_cast<unsigned>(page_size);
 }
 
+/* ClamAV: we don't link with -lmalloc */
+#undef HAVE_MALLINFO
 size_t Process::GetMallocUsage() {
 #if defined(HAVE_MALLINFO)
   struct mallinfo mi;