[llvm-commits] CVS: llvm-java/configure Makefile.common.in

[Alkis Evlogimenos]

Changes in directory llvm-java:

configure updated: 1.10 -> 1.11
Makefile.common.in updated: 1.7 -> 1.8
---
Log message:

Add configure option to specify the location of an installation of GNU
classpath.


---
Diffs of the changes:  (+39 -1)

 Makefile.common.in |    5 +++++
 configure          |   35 ++++++++++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)


Index: llvm-java/configure
diff -u llvm-java/configure:1.10 llvm-java/configure:1.11
--- llvm-java/configure:1.10	Thu Feb 24 22:20:53 2005
+++ llvm-java/configure	Fri Apr 22 21:25:17 2005
@@ -275,7 +275,7 @@
 
 ac_unique_file="Makefile.common.in"
 ac_unique_file="Makefile.common.in"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_SRC LLVM_OBJ JAVA JAVAC JAVAH LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_SRC LLVM_OBJ JAVA JAVAC JAVAH CLASSPATH_JAVA_LIBRARY_PATH CLASSPATH_NATIVE_LIBRARY_PATH CLASSPATH_NATIVE_LIBS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -802,6 +802,8 @@
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-llvmsrc          Location of LLVM Source Code
   --with-llvmobj          Location of LLVM Object Code
+  --with-classpathdir     location of GNU classpath install dir (default
+                          /usr/local)
 
 Some influential environment variables:
   JAVA        The Java Virtual Machine (used for testing)
@@ -1484,6 +1486,34 @@
 
 
 
+# Check whether --with-classpathdir or --without-classpathdir was given.
+if test "${with_classpathdir+set}" = set; then
+  withval="$with_classpathdir"
+  ac_cv_classpathdir=$withval
+else
+  ac_cv_classpathdir=/usr/local
+fi;
+
+CLASSPATH_JAVA_LIBRARY_PATH=$ac_cv_classpathdir/share/classpath
+
+
+CLASSPATH_NATIVE_LIBRARY_PATH=$ac_cv_classpathdir/lib/classpath
+
+
+CLASSPATH_NATIVE_LIBS="gtkpeer javaawt javaio javalang javalangreflect javanet javanio javautil"
+
+
+echo "$as_me:$LINENO: checking for GNU classpath libraries" >&5
+echo $ECHO_N "checking for GNU classpath libraries... $ECHO_C" >&6
+if test ! -f "$CLASSPATH_JAVA_LIBRARY_PATH/java/lang/Object.class"
+then
+  echo "$CLASSPATH_JAVA_LIBRARY_PATH/java/lang/Object.class"
+  { { echo "$as_me:$LINENO: error: A flat installation of GNU classpath is required" >&5
+echo "$as_me: error: A flat installation of GNU classpath is required" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+echo "$as_me:$LINENO: result: found at $CLASSPATH_JAVA_LIBRARY_PATH" >&5
+echo "${ECHO_T}found at $CLASSPATH_JAVA_LIBRARY_PATH" >&6
 
 
 
@@ -2153,6 +2183,9 @@
 s, at JAVA@,$JAVA,;t t
 s, at JAVAC@,$JAVAC,;t t
 s, at JAVAH@,$JAVAH,;t t
+s, at CLASSPATH_JAVA_LIBRARY_PATH@,$CLASSPATH_JAVA_LIBRARY_PATH,;t t
+s, at CLASSPATH_NATIVE_LIBRARY_PATH@,$CLASSPATH_NATIVE_LIBRARY_PATH,;t t
+s, at CLASSPATH_NATIVE_LIBS@,$CLASSPATH_NATIVE_LIBS,;t t
 s, at LIBOBJS@,$LIBOBJS,;t t
 s, at LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF


Index: llvm-java/Makefile.common.in
diff -u llvm-java/Makefile.common.in:1.7 llvm-java/Makefile.common.in:1.8
--- llvm-java/Makefile.common.in:1.7	Sat Jan 15 20:21:42 2005
+++ llvm-java/Makefile.common.in	Fri Apr 22 21:25:17 2005
@@ -29,6 +29,11 @@
 # Include LLVM's Master Makefile.
 include $(LLVM_OBJ_ROOT)/Makefile.common
 
+# GNU classpath variables
+CLASSPATH_JAVA_LIBRARY_PATH=@CLASSPATH_JAVA_LIBRARY_PATH@
+CLASSPATH_NATIVE_LIBRARY_PATH=@CLASSPATH_NATIVE_LIBRARY_PATH@
+CLASSPATH_NATIVE_LIBS=@CLASSPATH_NATIVE_LIBS@
+
 # Additional utilities
 JAVA=@JAVA@
 JAVAC=@JAVAC@