/hg/icedtea: New configure option --with-llvm-config

[mjw at icedtea.classpath.org]

changeset da307731d8d2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=da307731d8d2
author: doko at ubuntu.com
date: Thu Oct 14 13:25:44 2010 +0200

	New configure option --with-llvm-config

	2010-10-14 Matthias Klose <doko at ubuntu.com>

	 * configure.ac: New option --with-llvm-config.
	        * INSTALL: Document it.


diffstat:

3 files changed, 22 insertions(+), 1 deletion(-)
ChangeLog    |    5 +++++
INSTALL      |    1 +
configure.ac |   17 ++++++++++++++++-

diffs (51 lines):

diff -r ee7d7790fcc7 -r da307731d8d2 ChangeLog
--- a/ChangeLog	Fri Jan 21 12:20:56 2011 -0500
+++ b/ChangeLog	Thu Oct 14 13:25:44 2010 +0200
@@ -1,3 +1,8 @@ 2011-01-21  Deepak Bhole <dbhole at redhat.
+2011-11-21  Matthias Klose  <doko at ubuntu.com>
+
+	* configure.ac: New option --with-llvm-config.
+	* INSTALL: Document it.
+
 2011-01-21  Deepak Bhole <dbhole at redhat.com>
 
 	* Makefile.am
diff -r ee7d7790fcc7 -r da307731d8d2 INSTALL
--- a/INSTALL	Fri Jan 21 12:20:56 2011 -0500
+++ b/INSTALL	Thu Oct 14 13:25:44 2010 +0200
@@ -152,6 +152,7 @@ to configure:
 * --with-tzdata-dir: Specify the location of Java timezone data, defaulting to /usr/share/javazi.
 * --with-netbeans: Specify the location of NetBeans for VisualVM, defaulting to the netbeans on the path.
 * --with-abs-install-dir: The final install location of the j2sdk-image, for use in the SystemTap tapset.
+* --with-llvm-config: Specify the location of the llvm-config binary.
 * --with-version-suffix: Appends the given text to the JDK version output.
 * --with-project: Build an OpenJDK project from the following: icedtea, jdk7, closures, cvmi, cacaiocavallo,
   bsd, nio2.  The default is icedtea.  Use of others is at the user's risk and builds may fail.  This setting
diff -r ee7d7790fcc7 -r da307731d8d2 configure.ac
--- a/configure.ac	Fri Jan 21 12:20:56 2011 -0500
+++ b/configure.ac	Thu Oct 14 13:25:44 2010 +0200
@@ -391,8 +391,23 @@ AC_SUBST(LIBFFI_CFLAGS)
 AC_SUBST(LIBFFI_CFLAGS)
 AC_SUBST(LIBFFI_LIBS)
 
+AC_ARG_WITH([llvm-config],
+            [AS_HELP_STRING([--with-llvm-config],
+                            [llvm-config binary (default is llvm-config)])],
+            [
+              if test "x${withval}" != x; then
+	        if which ${withval} >/dev/null 2>&1 && ${withval} --version >/dev/null 2>&1; then
+		  LLVM_CONFIG=${withval}
+		else
+		  AC_MSG_ERROR([invalid argument for --with-llvm-config ($withval)])
+		fi
+              fi
+            ])
+
 if test "x${SHARK_BUILD_TRUE}" = x || test "x${ADD_SHARK_BUILD_TRUE}" = x; then
-  FIND_TOOL([LLVM_CONFIG], [llvm-config])
+  if test "x${LLVM_CONFIG}" = x; then
+    FIND_TOOL([LLVM_CONFIG], [llvm-config])
+  fi
   llvm_components="jit engine nativecodegen"
   LLVM_VERSION="`$LLVM_CONFIG --version`"
   dnl LLVM_CFLAGS