[llvm-commits] CVS: llvm-java/autoconf/configure.ac AutoRegen.sh

[Alkis Evlogimenos]

Changes in directory llvm-java/autoconf:

configure.ac updated: 1.12 -> 1.13
AutoRegen.sh updated: 1.2 -> 1.3
---
Log message:

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


---
Diffs of the changes:  (+28 -8)

 AutoRegen.sh |    8 ++++----
 configure.ac |   28 ++++++++++++++++++++++++----
 2 files changed, 28 insertions(+), 8 deletions(-)


Index: llvm-java/autoconf/configure.ac
diff -u llvm-java/autoconf/configure.ac:1.12 llvm-java/autoconf/configure.ac:1.13
--- llvm-java/autoconf/configure.ac:1.12	Thu Feb 24 22:20:53 2005
+++ llvm-java/autoconf/configure.ac	Fri Apr 22 21:25:17 2005
@@ -66,8 +66,32 @@
 AC_CONFIG_SRCDIR(Makefile.common.in)
 
 dnl **************************************************************************
+dnl * Set the location of various third-party software packages
+dnl **************************************************************************
+AC_ARG_WITH([classpathdir],
+  AS_HELP_STRING([--with-classpathdir],
+                 [location of GNU classpath install dir (default /usr/local)]),
+                 [ac_cv_classpathdir=$withval],
+                 [ac_cv_classpathdir=/usr/local])
+
+CLASSPATH_JAVA_LIBRARY_PATH=$ac_cv_classpathdir/share/classpath
+AC_SUBST(CLASSPATH_JAVA_LIBRARY_PATH)
+
+CLASSPATH_NATIVE_LIBRARY_PATH=$ac_cv_classpathdir/lib/classpath
+AC_SUBST(CLASSPATH_NATIVE_LIBRARY_PATH)
+
+CLASSPATH_NATIVE_LIBS="gtkpeer javaawt javaio javalang javalangreflect javanet javanio javautil"
+AC_SUBST(CLASSPATH_NATIVE_LIBS)
+
+dnl **************************************************************************
 dnl * Check for libraries.
 dnl **************************************************************************
+AC_MSG_CHECKING([for GNU classpath libraries])
+if test ! -f "$CLASSPATH_JAVA_LIBRARY_PATH/java/lang/Object.class"
+then
+  AC_MSG_ERROR([A flat installation of GNU classpath is required])
+fi
+AC_MSG_RESULT([found at $CLASSPATH_JAVA_LIBRARY_PATH])
 
 dnl **************************************************************************
 dnl * Checks for header files.
@@ -86,10 +110,6 @@
 dnl **************************************************************************
 
 dnl **************************************************************************
-dnl * Set the location of various third-party software packages
-dnl **************************************************************************
-
-dnl **************************************************************************
 dnl * Create the output files
 dnl **************************************************************************
 AC_OUTPUT


Index: llvm-java/autoconf/AutoRegen.sh
diff -u llvm-java/autoconf/AutoRegen.sh:1.2 llvm-java/autoconf/AutoRegen.sh:1.3
--- llvm-java/autoconf/AutoRegen.sh:1.2	Tue Dec  7 01:06:12 2004
+++ llvm-java/autoconf/AutoRegen.sh	Fri Apr 22 21:25:17 2005
@@ -9,17 +9,17 @@
 if test $? -ne 0 ; then
   die "Your autoconf was not detected as being 2.59"
 fi
-aclocal --version | egrep '1\.9\.2' > /dev/null
+aclocal-1.9 --version | egrep '1\.9\.4' > /dev/null
 if test $? -ne 0 ; then
-  die "Your aclocal was not detected as being 1.9.1"
+  die "Your aclocal was not detected as being 1.9.4"
 fi
 autoheader --version | egrep '2\.59' > /dev/null
 if test $? -ne 0 ; then
   die "Your autoheader was not detected as being 2.59"
 fi
-libtool --version | grep '1.5.10' > /dev/null
+libtool --version | grep '1.5.14' > /dev/null
 if test $? -ne 0 ; then
-  die "Your libtool was not detected as being 1.5.10"
+  die "Your libtool was not detected as being 1.5.14"
 fi
 echo ""
 echo "### NOTE: ############################################################"