diff options
| author | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-21 18:12:32 +0000 |
|---|---|---|
| committer | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-21 18:12:32 +0000 |
| commit | dbff38f9ca9b48a7462feade10bc000d510206ae (patch) | |
| tree | b529223225cfa13fe07018548450763b2a152593 /libjava/aclocal.m4 | |
| parent | 7d0f7bf8796f6f2af3eb54c527ac5714fe193883 (diff) | |
config:
* gxx-include-dir.m4: In all substitutions, leave $(gcc_version)
to be expanded by the Makefile.
libjava:
* configure.ac: Do not invoke TL_AC_GCC_VERSION. Do not
set tool_include_dir. In all substitutions, leave $(gcc_version)
to be expanded by the Makefile.
* aclocal.m4, configure: Regenerate.
* Makefile.am: Set gcc_version. Replace all uses of
@gcc_version@ with $(gcc_version).
* external/Makefile.am, external/sax/Makefile.am
* external/w3c_dom/Makefile.am, gcj/Makefile.am
* testsuite/Makefile.am: Set gcc_version.
* include/Makefile.am: Set gcc_version and tool_include_dir.
* Makefile.in, external/Makefile.in, external/sax/Makefile.in
* external/w3c_dom/Makefile.in, gcj/Makefile.in, include/Makefile.in
* testsuite/Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96825 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/aclocal.m4')
| -rw-r--r-- | libjava/aclocal.m4 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libjava/aclocal.m4 b/libjava/aclocal.m4 index ce57d9fd4db..286f26a8618 100644 --- a/libjava/aclocal.m4 +++ b/libjava/aclocal.m4 @@ -924,14 +924,13 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([pkg.m4]) m4_include([../config/accross.m4]) m4_include([../config/acx.m4]) -m4_include([../config/gcc-version.m4]) m4_include([../config/gxx-include-dir.m4]) m4_include([../config/iconv.m4]) m4_include([../config/lcmessage.m4]) m4_include([../config/lib-ld.m4]) m4_include([../config/lib-link.m4]) m4_include([../config/lib-prefix.m4]) +m4_include([pkg.m4]) m4_include([acinclude.m4]) |