Imported Classpath 0.18.
* sources.am, Makefile.in: Updated. * Makefile.am (nat_source_files): Removed natProxy.cc. * java/lang/reflect/natProxy.cc: Removed. * gnu/classpath/jdwp/VMFrame.java, gnu/classpath/jdwp/VMIdManager.java, gnu/classpath/jdwp/VMVirtualMachine.java, java/lang/reflect/VMProxy.java: New files. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * scripts/makemake.tcl (verbose): Add gnu/java/awt/peer/qt to BC list. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/net/DefaultContentHandlerFactory.java (getContent): Remove ClasspathToolkit references. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/awt/xlib/XCanvasPeer.java: Add new peer methods. * gnu/awt/xlib/XFramePeer.java: Likewise. * gnu/awt/xlib/XGraphicsConfiguration.java: Likewise. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * Makefile.am (libgcjawt_la_SOURCES): Remove jawt.c. Add classpath/native/jawt/jawt.c. * Makefile.in: Regenerate. * jawt.c: Remove file. * include/Makefile.am (tool_include__HEADERS): Remove jawt.h and jawt_md.h. Add ../classpath/include/jawt.h and ../classpath/include/jawt_md.h. * include/Makefile.in: Regenerate. * include/jawt.h: Regenerate. * include/jawt_md.h: Regenerate. From-SVN: r104586
This commit is contained in:
@@ -319,38 +319,39 @@ dnl CLASSPATH_WITH_GLIBJ - specify what to install
|
||||
dnl -----------------------------------------------------------
|
||||
AC_DEFUN([CLASSPATH_WITH_GLIBJ],
|
||||
[
|
||||
AC_PATH_PROG(ZIP, zip)
|
||||
AC_ARG_WITH([glibj],
|
||||
[AS_HELP_STRING([--with-glibj],[define what to install (zip|flat|both|none|build) [default=zip]])],
|
||||
[
|
||||
if test "x${withval}" = xyes || test "x${withval}" = xzip; then
|
||||
AC_PATH_PROG(ZIP, zip)
|
||||
install_class_files=no
|
||||
build_class_files=yes
|
||||
use_zip=yes
|
||||
elif test "x${withval}" = xboth; then
|
||||
AC_PATH_PROG(ZIP, zip)
|
||||
install_class_files=yes
|
||||
build_class_files=yes
|
||||
use_zip=yes
|
||||
elif test "x${withval}" = xflat; then
|
||||
ZIP=
|
||||
install_class_files=yes
|
||||
build_class_files=yes
|
||||
use_zip=no
|
||||
elif test "x${withval}" = xno || test "x${withval}" = xnone; then
|
||||
ZIP=
|
||||
install_class_files=no
|
||||
build_class_files=no
|
||||
use_zip=no
|
||||
elif test "x${withval}" = xbuild; then
|
||||
ZIP=
|
||||
install_class_files=no
|
||||
build_class_files=yes
|
||||
use_zip=no
|
||||
else
|
||||
AC_MSG_ERROR([unknown value given to --with-glibj])
|
||||
fi
|
||||
],
|
||||
[
|
||||
AC_PATH_PROG(ZIP, zip)
|
||||
install_class_files=no
|
||||
use_zip=yes
|
||||
])
|
||||
AM_CONDITIONAL(INSTALL_GLIBJ_ZIP, test "x${ZIP}" != x)
|
||||
AM_CONDITIONAL(INSTALL_GLIBJ_ZIP, test "x${use_zip}" = xyes)
|
||||
AM_CONDITIONAL(INSTALL_CLASS_FILES, test "x${install_class_files}" = xyes)
|
||||
AM_CONDITIONAL(BUILD_CLASS_FILES, test "x${build_class_files}" = xyes)
|
||||
|
||||
@@ -362,7 +363,7 @@ AC_DEFUN([CLASSPATH_WITH_GLIBJ],
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-examples) ;;
|
||||
esac],
|
||||
[EXAMPLESDIR="examples"])
|
||||
if test "x${ZIP}" = x && test "x${install_class_files}" = xno; then
|
||||
if test "x${use_zip}" = xno && test "x${install_class_files}" = xno; then
|
||||
EXAMPLESDIR=""
|
||||
fi
|
||||
AC_SUBST(EXAMPLESDIR)
|
||||
|
||||
Reference in New Issue
Block a user