[vmkit-commits] [vmkit] r52954 - in /vmkit/trunk: autoconf/configure.ac configure lib/JnJVM/Classpath/Classpath.h.in
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Tue Jul 1 02:34:57 PDT 2008
Author: geoffray
Date: Tue Jul 1 04:34:57 2008
New Revision: 52954
URL: http://llvm.org/viewvc/llvm-project?rev=52954&view=rev
Log:
JnJVM is configured by giving the GNU Classpath lib directory
and the glibj.zip path.
Modified:
vmkit/trunk/autoconf/configure.ac
vmkit/trunk/configure
vmkit/trunk/lib/JnJVM/Classpath/Classpath.h.in
Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=52954&r1=52953&r2=52954&view=diff
==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Tue Jul 1 04:34:57 2008
@@ -238,47 +238,45 @@
dnl GNU CLASSPATH installation prefix
dnl **************************************************************************
-gnuclasspathversion=0.93;
+classpathversion=0.97.2;
-AC_ARG_WITH(gnu-classpath-local-prefix,
- [AS_HELP_STRING(--with-gnu-classpath-local-prefix=something,
- [GNU CLASSPATH local prefix (no default)])],
- [[gnuclasspathlocalprefix=$withval]],
- [[ echo Not using GNU CLASSPATH local prefix.
- gnuclasspathlocalprefix=''
- ]]
+AC_ARG_WITH(gnu-classpath-libs,
+ [AS_HELP_STRING(--with-gnu-classpath-libs=something,
+ [GNU CLASSPATH libraries (default is /usr/lib/classpath)])],
+ [[classpathlibs=$withval]],
+ [[classpathlibs=/usr/lib/classpath]]
)
-AC_ARG_WITH(gnu-classpath-installation-prefix,
- [AS_HELP_STRING(--with-gnu-classpath-installation-prefix=something,
- [GNU CLASSPATH installation prefix (default is '/usr/local/classpath')])],
- [[gnuclasspathinstallationprefix=$withval]],
- [[gnuclasspathinstallationprefix=/usr/local/classpath]]
+AC_ARG_WITH(gnu-classpath-glibj,
+ [AS_HELP_STRING(--with-gnu-classpath-glibj,
+ [Build JnJVM with GNU Classpath install (default is '/usr/share/classpath/glibj.zip')])],
+ [[classpathglibj=$withval]],
+ [[classpathglibj=/usr/share/classpath/glibj.zip]]
)
-WITH_JNJVM=0;
-
-if test "x${gnuclasspathinstallationprefix}" != x; then
- echo Using ${gnuclasspathinstallationprefix} as GNU CLASSPATH installation prefix;
- classpathglibj=${gnuclasspathinstallationprefix}/share/classpath/glibj.zip;
- classpathlibs=${gnuclasspathinstallationprefix}/lib/classpath/;
- classpathinclude=${gnuclasspathlocalprefix}/include;
- WITH_JNJVM=1;
-fi
+AC_ARG_WITH(jnjvm,
+ [AS_HELP_STRING(--with-jnjvm=yes|no,
+ [Build JnJVM (default is yes)])],
+ [[WITH_JNJVM=$withval]],
+ [[WITH_JNJVM=yes]]
+)
-if test "x${gnuclasspathlocalprefix}" != x; then
- echo Using ${gnuclasspathlocalprefix} as GNU CLASSPATH local prefix;
- classpathglibj=${gnuclasspathlocalprefix}/lib/;
- classpathlibs=${gnuclasspathlocalprefix}/lib/;
- classpathinclude=${gnuclasspathlocalprefix}/include;
- WITH_JNJVM=1;
+if test "x${classpathlibs}" != "x/usr/lib/classpath"; then
+ classpathinclude=${classpathlibs}/../include:/usr/include/classpath;
+else
+ classpathinclude=/usr/include/classpath;
fi
+if test "x${WITH_JNJVM}" = "xyes"; then
+ WITH_JNJVM=1;
+else
+ WITH_JNJVM=0;
+fi
AC_SUBST([classpathglibj])
AC_SUBST([classpathlibs])
AC_SUBST([classpathinclude])
-AC_SUBST([gnuclasspathversion])
+AC_SUBST([classpathversion])
AC_SUBST([WITH_JNJVM])
dnl **************************************************************************
Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=52954&r1=52953&r2=52954&view=diff
==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Tue Jul 1 04:34:57 2008
@@ -694,7 +694,7 @@
classpathglibj
classpathlibs
classpathinclude
-gnuclasspathversion
+classpathversion
WITH_JNJVM
pnetlocalprefix
WITH_N3
@@ -1318,11 +1318,13 @@
--with-gc=something GC type ('single-mmap' 'multi-mmap' or 'boehm')
--with-vm-type=something
VM type ('single' 'multi' or 'service')
- --with-gnu-classpath-local-prefix=something
- GNU CLASSPATH local prefix (no default)
- --with-gnu-classpath-installation-prefix=something
- GNU CLASSPATH installation prefix (default is
- '/usr/local/classpath')
+ --with-gnu-classpath-libs=something
+ GNU CLASSPATH libraries (default is
+ /usr/lib/classpath)
+ --with-gnu-classpath-glibj
+ Build JnJVM with GNU Classpath install (default is
+ '/usr/share/classpath/glibj.zip')
+ --with-jnjvm=yes|no Build JnJVM (default is yes)
--with-pnet-local-prefix=something
PNET local prefix (no default)
@@ -3964,48 +3966,49 @@
-gnuclasspathversion=0.93;
+classpathversion=0.97.2;
-# Check whether --with-gnu-classpath-local-prefix was given.
-if test "${with_gnu_classpath_local_prefix+set}" = set; then
- withval=$with_gnu_classpath_local_prefix; gnuclasspathlocalprefix=$withval
+# Check whether --with-gnu-classpath-libs was given.
+if test "${with_gnu_classpath_libs+set}" = set; then
+ withval=$with_gnu_classpath_libs; classpathlibs=$withval
else
- echo Not using GNU CLASSPATH local prefix.
- gnuclasspathlocalprefix=''
-
+ classpathlibs=/usr/lib/classpath
fi
-# Check whether --with-gnu-classpath-installation-prefix was given.
-if test "${with_gnu_classpath_installation_prefix+set}" = set; then
- withval=$with_gnu_classpath_installation_prefix; gnuclasspathinstallationprefix=$withval
+# Check whether --with-gnu-classpath-glibj was given.
+if test "${with_gnu_classpath_glibj+set}" = set; then
+ withval=$with_gnu_classpath_glibj; classpathglibj=$withval
else
- gnuclasspathinstallationprefix=/usr/local/classpath
+ classpathglibj=/usr/share/classpath/glibj.zip
fi
-WITH_JNJVM=0;
-if test "x${gnuclasspathinstallationprefix}" != x; then
- echo Using ${gnuclasspathinstallationprefix} as GNU CLASSPATH installation prefix;
- classpathglibj=${gnuclasspathinstallationprefix}/share/classpath/glibj.zip;
- classpathlibs=${gnuclasspathinstallationprefix}/lib/classpath/;
- classpathinclude=${gnuclasspathlocalprefix}/include;
- WITH_JNJVM=1;
+# Check whether --with-jnjvm was given.
+if test "${with_jnjvm+set}" = set; then
+ withval=$with_jnjvm; WITH_JNJVM=$withval
+else
+ WITH_JNJVM=yes
+
fi
-if test "x${gnuclasspathlocalprefix}" != x; then
- echo Using ${gnuclasspathlocalprefix} as GNU CLASSPATH local prefix;
- classpathglibj=${gnuclasspathlocalprefix}/lib/;
- classpathlibs=${gnuclasspathlocalprefix}/lib/;
- classpathinclude=${gnuclasspathlocalprefix}/include;
- WITH_JNJVM=1;
+
+if test "x${classpathlibs}" != "x/usr/lib/classpath"; then
+ classpathinclude=${classpathlibs}/../include:/usr/include/classpath;
+else
+ classpathinclude=/usr/include/classpath;
fi
+if test "x${WITH_JNJVM}" = "xyes"; then
+ WITH_JNJVM=1;
+else
+ WITH_JNJVM=0;
+fi
@@ -7827,7 +7830,7 @@
classpathglibj!$classpathglibj$ac_delim
classpathlibs!$classpathlibs$ac_delim
classpathinclude!$classpathinclude$ac_delim
-gnuclasspathversion!$gnuclasspathversion$ac_delim
+classpathversion!$classpathversion$ac_delim
WITH_JNJVM!$WITH_JNJVM$ac_delim
pnetlocalprefix!$pnetlocalprefix$ac_delim
WITH_N3!$WITH_N3$ac_delim
Modified: vmkit/trunk/lib/JnJVM/Classpath/Classpath.h.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/Classpath.h.in?rev=52954&r1=52953&r2=52954&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/Classpath.h.in (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/Classpath.h.in Tue Jul 1 04:34:57 2008
@@ -10,5 +10,5 @@
const char* GNUClasspathLibs = "@classpathlibs@";
const char* GNUClasspathGlibj = "@classpathglibj@";
-const char* GNUClasspathVersion = "@gnuclasspathversion@";
+const char* GNUClasspathVersion = "@classpathversion@";
More information about the vmkit-commits
mailing list