@@ -1,3 +1,7 @@

+Tue Sep 28 16:25:03 EEST 2010 (edwin)

+-------------------------------------

+ * libclamav/c++: allow building with external LLVM 2.8rc2.

+

 Tue Sep 28 13:05:53 EEST 2010 (edwin)

 -------------------------------------

  * libclamav/bytecode.c: fix memory leak in runlsig (bb #2291)

@@ -14513,17 +14513,25 @@ if test "${with_system_llvm+set}" = set; then :

   *)

     llvmconfig="$withval"

     llvmver=`$llvmconfig --version`

-    if test "$llvmver" != "2.8" -a "$llvmver" != "2.8svn"; then

+    if test "$llvmver" != "2.8" -a "$llvmver" != "2.8svn" -a "$llvmver" != "2.8rc"; then

 	as_fn_error $? "LLVM 2.8 or 2.8svn required, but \"$llvmver\" found" "$LINENO" 5

     fi

     LLVMCONFIG_CXXFLAGS=`$llvmconfig --cxxflags`

     LLVMCONFIG_LDFLAGS=`$llvmconfig --ldflags`

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

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

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

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

+    { $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: 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: 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: LIBS from llvm-config: $LLVMCONFIG_LIBS" >&6;}

     ;;

   esac

@@ -14578,9 +14586,7 @@ if test "$enable_alltargets" = "yes"; then

 else

     new_args="$ac_configure_args --enable-targets=host-only --enable-bindings=none --enable-libffi=no --without-llvmgcc --without-llvmgxx"

 fi

-echo "$new_args"

 ac_configure_args=`echo $new_args | sed -e 's/-Werror //g'`

-echo "$ac_configure_args"

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

                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported C++ compiler version" >&5

@@ -58,13 +58,17 @@ AC_ARG_WITH([system-llvm], AC_HELP_STRING([-with-system-llvm],

   *)

     llvmconfig="$withval"

     llvmver=`$llvmconfig --version`

-    if test "$llvmver" != "2.8" -a "$llvmver" != "2.8svn"; then

+    if test "$llvmver" != "2.8" -a "$llvmver" != "2.8svn" -a "$llvmver" != "2.8rc"; then

 	AC_MSG_ERROR([LLVM 2.8 or 2.8svn required, but "$llvmver" found])

     fi

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

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

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

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

+    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])

     ;;

   esac

 ])

@@ -98,9 +102,7 @@ if test "$enable_alltargets" = "yes"; then

 else

     new_args="$ac_configure_args --enable-targets=host-only --enable-bindings=none --enable-libffi=no --without-llvmgcc --without-llvmgxx"

 fi

-echo "$new_args"

 ac_configure_args=`echo $new_args | sed -e 's/-Werror //g'`

-echo "$ac_configure_args"

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

     dnl Do some sanity checks, and don't automatically build on platforms