FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable libgcjx by default.

Browse source 
* configure.in: Add support for --enable-java-awt configure option.
	Use --enable-java-awt=xlib to build the xlib peers (libgcjx).
        * Makefile.am: Make libgcjx conditional on XLIB_AWT, instead of NO_X.
	* Makefile.in: Rebuilt.
	* configure: Rebuilt.

From-SVN: r39970
This commit is contained in:
Bryce McKinlay 2001-02-22 04:19:58 +00:00 • committed by Bryce McKinlay
parent 810e8b5200
commit 5950e01622
5 changed files with 372 additions and 290 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libjava/ChangeLog
View file

@ -5,6 +5,15 @@
loadFactor > 1. Add exception messages. loadFactor > 1. Add exception messages.
* java/util/Hashtable.java (Hashtable): Likewise. * java/util/Hashtable.java (Hashtable): Likewise.
2001-02-21 Bryce McKinlay <bryce@albatross.co.nz>
Disable libgcjx by default.
* configure.in: Add support for --enable-java-awt configure option.
Use --enable-java-awt=xlib to build the xlib peers (libgcjx).
* Makefile.am: Make libgcjx conditional on XLIB_AWT, instead of NO_X.
* Makefile.in: Rebuilt.
* configure: Rebuilt.
2001-02-20 Tom Tromey <tromey@redhat.com> 2001-02-20 Tom Tromey <tromey@redhat.com>
* java/io/PipedWriter.java (flush): Throw exception if stream * java/io/PipedWriter.java (flush): Throw exception if stream

6
libjava/Makefile.am
View file

@ -23,10 +23,10 @@ toolexecdir = $(exec_prefix)/$(target_alias)
toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR) toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
endif endif
if NO_X if XLIB_AWT
cond_x_ltlibrary =
else
cond_x_ltlibrary = libgcjx.la cond_x_ltlibrary = libgcjx.la
else
cond_x_ltlibrary =
endif endif
toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary) toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary)

6
libjava/Makefile.in
View file

@ -124,8 +124,8 @@ AUTOMAKE_OPTIONS = foreign no-installinfo
@USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR) @USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR) @USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) @USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
@NO_X_TRUE@cond_x_ltlibrary = @XLIB_AWT_TRUE@cond_x_ltlibrary = @XLIB_AWT_TRUE@libgcjx.la
@NO_X_FALSE@cond_x_ltlibrary = @NO_X_FALSE@libgcjx.la @XLIB_AWT_FALSE@cond_x_ltlibrary =
toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary) toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary)
toolexeclib_DATA = libgcj.spec toolexeclib_DATA = libgcj.spec
@ -1198,7 +1198,7 @@ libgcj-test.spec.in libgcj.spec.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar TAR = tar
GZIP_ENV = --best GZIP_ENV = --best
DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include
DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \

610
libjava/configure vendored
View file

File diff suppressed because it is too large Load diff

31
libjava/configure.in
View file

@ -745,7 +745,36 @@ fi
AC_PATH_XTRA AC_PATH_XTRA
AM_CONDITIONAL(NO_X, test "$no_x" = yes) dnl Determine which AWT peer libraries to build
AC_ARG_ENABLE(java-awt,
[ --enable-java-awt list of AWT peer implementations to be built])
peerlibs="`echo ${enable_java_awt} | tr ',' ' '`"
use_xlib_awt=""
use_gtk_awt=""
for peer in $peerlibs ; do
case $peer in
xlib)
if [test "$no_x" = yes]; then
echo "*** xlib peers requested but no X library available" 1>&2
exit 1
else
use_xlib_awt="yes"
fi
;;
gtk)
# Nothing, yet...
;;
*)
echo "*** unrecognised argument \"${peer}\" for --enable-java-awt" 1>&2
exit 1
esac
done
AM_CONDITIONAL(XLIB_AWT, test "$use_xlib_awt" = yes)
AM_CONDITIONAL(GTK_AWT, test "$use_gtk_awt" = yes)
here=`pwd` here=`pwd`
AC_SUBST(here) AC_SUBST(here)