diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-09-30 20:46:59 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-09-30 20:46:59 +0000 |
| commit | e0f7b2609b4f970bfa7082b0cf3a96a509493c14 (patch) | |
| tree | 6ac7ac7a156fcf9633fef967b394187985e5f56f /libjava/classpath/scripts | |
| parent | 21905d1b4319b962f26f87d57e8fa4f00f0aeedb (diff) | |
| download | gcc-e0f7b2609b4f970bfa7082b0cf3a96a509493c14.zip gcc-e0f7b2609b4f970bfa7082b0cf3a96a509493c14.tar.gz gcc-e0f7b2609b4f970bfa7082b0cf3a96a509493c14.tar.bz2 | |
re PR libgcj/24051 (libjava failed to configure)
libjava:
PR libgcj/24051:
* Makefile.in: Rebuilt.
* Makefile.am (toolexeclib_LTLIBRARIES): Add Qt library if
requested.
(lib_gnu_java_awt_peer_qt_la_SOURCES): New variable.
(lib_gnu_java_awt_peer_qt_la_LIBADD): Likewise.
(lib_gnu_java_awt_peer_qt_la_DEPENDENCIES): Likewise.
(lib_gnu_java_awt_peer_qt_la_LDFLAGS): Likewise.
(lib_gnu_java_awt_peer_qt_la_LINK): Likewise.
* configure: Rebuilt.
* configure.ac: Pass --enable-qt-peers when qt is requested.
libjava/classpath:
PR libgcj/24051:
* Makefile.in: Rebuilt.
* Makefile.am (ACLOCAL_AMFLAGS): Added -I ../../config
* configure: Rebuilt.
* configure.ac: Use GCC_NO_EXECUTABLES
From-SVN: r104833
Diffstat (limited to 'libjava/classpath/scripts')
| -rw-r--r-- | libjava/classpath/scripts/Makefile.in | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libjava/classpath/scripts/Makefile.in b/libjava/classpath/scripts/Makefile.in index c20328b..c49baa5 100644 --- a/libjava/classpath/scripts/Makefile.in +++ b/libjava/classpath/scripts/Makefile.in @@ -40,11 +40,14 @@ subdir = scripts DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/classpath.spec.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../libtool.m4 \ - $(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ + $(top_srcdir)/../../config/no-executables.m4 \ + $(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/accross.m4 \ + $(top_srcdir)/m4/acinclude.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |