diff options
| author | Bryce McKinlay <bryce@albatross.co.nz> | 2001-02-22 04:19:58 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2001-02-22 04:19:58 +0000 |
| commit | 5950e01622f4afd94a6e75faf6d25c7ee836c75c (patch) | |
| tree | 0413388df78d2e02ff5c2ed9ec0e41165eca5f72 /libjava/Makefile.in | |
| parent | 810e8b5200c3e59dddb0fb5e43d46290ec400927 (diff) | |
| download | gcc-5950e01622f4afd94a6e75faf6d25c7ee836c75c.tar.gz gcc-5950e01622f4afd94a6e75faf6d25c7ee836c75c.tar.bz2 gcc-5950e01622f4afd94a6e75faf6d25c7ee836c75c.zip | |
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.
From-SVN: r39970
Diffstat (limited to 'libjava/Makefile.in')
| -rw-r--r-- | libjava/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libjava/Makefile.in b/libjava/Makefile.in index be75b67c9d9..bcb5f040400 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -124,8 +124,8 @@ AUTOMAKE_OPTIONS = foreign no-installinfo @USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR) @USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR) @USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) -@NO_X_TRUE@cond_x_ltlibrary = -@NO_X_FALSE@cond_x_ltlibrary = @NO_X_FALSE@libgcjx.la +@XLIB_AWT_TRUE@cond_x_ltlibrary = @XLIB_AWT_TRUE@libgcjx.la +@XLIB_AWT_FALSE@cond_x_ltlibrary = toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary) toolexeclib_DATA = libgcj.spec @@ -1198,7 +1198,7 @@ libgcj-test.spec.in libgcj.spec.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ |