/hg/icedtea6: Updated check for shared LLVM library to include svn.

[xranby at icedtea.classpath.org]

changeset b5f6ca242b9f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b5f6ca242b9f
author: Xerxes R?nby <xerxes at zafena.se>
date: Wed Apr 07 14:50:34 2010 +0200

	Updated check for shared LLVM library to include svn.

	2010-04-07 Xerxes R?nby <xerxes at zafena.se>

	 * configure.ac: Updated check for shared LLVM library to
	include svn.


diffstat:

2 files changed, 6 insertions(+), 2 deletions(-)
ChangeLog    |    4 ++++
configure.ac |    4 ++--

diffs (32 lines):

diff -r 601db47e5a01 -r b5f6ca242b9f ChangeLog
--- a/ChangeLog	Tue Apr 06 14:17:02 2010 -0400
+++ b/ChangeLog	Wed Apr 07 14:50:34 2010 +0200
@@ -1,3 +1,7 @@ 2010-04-06  Deepak Bhole <dbhole at redhat.
+2010-04-07  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	* configure.ac: Updated check for shared LLVM library to include svn.
+
 2010-04-06  Deepak Bhole <dbhole at redhat.com>
 
 	* plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
diff -r 601db47e5a01 -r b5f6ca242b9f configure.ac
--- a/configure.ac	Tue Apr 06 14:17:02 2010 -0400
+++ b/configure.ac	Wed Apr 07 14:50:34 2010 +0200
@@ -440,7 +440,7 @@ if test "x${SHARK_BUILD_TRUE}" = x || te
 if test "x${SHARK_BUILD_TRUE}" = x || test "x${ADD_SHARK_BUILD_TRUE}" = x; then
   FIND_TOOL([LLVM_CONFIG], [llvm-config])
   llvm_components="jit engine nativecodegen"
-  LLVM_VERSION="`$LLVM_CONFIG --version | sed 's/svn.*//'`"
+  LLVM_VERSION="`$LLVM_CONFIG --version`"
   dnl LLVM_CFLAGS
   LLVM_CFLAGS=
   for flag in $($LLVM_CONFIG --cxxflags $llvm_components); do
@@ -453,7 +453,7 @@ if test "x${SHARK_BUILD_TRUE}" = x || te
       fi
     fi
   done
-  LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`echo $LLVM_VERSION | sed 's/\.//'`"
+  LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`echo $LLVM_VERSION | sed 's/\.//;s/svn.*//'`"
   dnl LLVM_LDFLAGS
   LLVM_LDFLAGS=
   for flag in $($LLVM_CONFIG --ldflags $llvm_components); do