diff --git a/libjava/ChangeLog b/libjava/ChangeLog index bc3d8d8a43e1..342f045fcac0 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2005-08-22 Kelley Cook + + * Makefile.am (ACLOCAL_AMFLAGS): Also include "..". + * acinclude.m4: Delete. Extract CHECK_FOR_BROKEN_MINGW_LD to ... + * mingwld.m4: ... this new file. + * aclocal.m4, Makefile.in, gcj/Makefile.in: Regenerate. + * include/Makefile.in, testsuite/Makfile.in: Regenerate. + 2005-08-21 John David Anglin PR libgcj/23507 diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 046b68189fa0..6874e15a5ce8 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects -ACLOCAL_AMFLAGS = -I . -I ../config +ACLOCAL_AMFLAGS = -I . -I .. -I ../config # May be used by various substitution variables. gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 6994da8ff535..62f51fc85e8e 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -80,10 +80,10 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lib-ld.m4 \ $(top_srcdir)/../config/lib-link.m4 \ - $(top_srcdir)/../config/lib-prefix.m4 $(top_srcdir)/pkg.m4 \ - $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/../config/lib-prefix.m4 \ $(top_srcdir)/../config/no-executables.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/../libtool.m4 $(top_srcdir)/mingwld.m4 \ + $(top_srcdir)/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -610,7 +610,7 @@ toolexecdir = @toolexecdir@ toolexeclibdir = @toolexeclibdir@ toolexecmainlibdir = @toolexecmainlibdir@ AUTOMAKE_OPTIONS = foreign subdir-objects -ACLOCAL_AMFLAGS = -I . -I ../config +ACLOCAL_AMFLAGS = -I . -I .. -I ../config # May be used by various substitution variables. gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) diff --git a/libjava/aclocal.m4 b/libjava/aclocal.m4 index 70b12cd9d887..af5d7760dd6f 100644 --- a/libjava/aclocal.m4 +++ b/libjava/aclocal.m4 @@ -1104,62 +1104,7 @@ m4_include([../config/lead-dot.m4]) m4_include([../config/lib-ld.m4]) m4_include([../config/lib-link.m4]) m4_include([../config/lib-prefix.m4]) +m4_include([../config/no-executables.m4]) +m4_include([../libtool.m4]) +m4_include([mingwld.m4]) m4_include([pkg.m4]) -m4_include([acinclude.m4]) - -dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page -dnl also defines GSTUFF_PKG_ERRORS on error -AC_DEFUN([PKG_CHECK_MODULES], [ - succeeded=no - - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - AC_MSG_CHECKING(for $2) - - if $PKG_CONFIG --exists "$2" ; then - AC_MSG_RESULT(yes) - succeeded=yes - - AC_MSG_CHECKING($1_CFLAGS) - $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` - AC_MSG_RESULT($$1_CFLAGS) - - AC_MSG_CHECKING($1_LIBS) - $1_LIBS=`$PKG_CONFIG --libs "$2"` - AC_MSG_RESULT($$1_LIBS) - else - $1_CFLAGS="" - $1_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - ifelse([$4], ,echo $$1_PKG_ERRORS,) - fi - - AC_SUBST($1_CFLAGS) - AC_SUBST($1_LIBS) - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi - - if test $succeeded = yes; then - ifelse([$3], , :, [$3]) - else - ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) - fi -]) - - diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index caac0ddf25d4..72bda7f2d769 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -50,10 +50,10 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lib-ld.m4 \ $(top_srcdir)/../config/lib-link.m4 \ - $(top_srcdir)/../config/lib-prefix.m4 $(top_srcdir)/pkg.m4 \ - $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/../config/lib-prefix.m4 \ $(top_srcdir)/../config/no-executables.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/../libtool.m4 $(top_srcdir)/mingwld.m4 \ + $(top_srcdir)/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) CONFIG_HEADER = $(top_builddir)/include/config.h libgcj-config.h diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index cdd2a22cb0ce..810f1fc30857 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -49,10 +49,10 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lib-ld.m4 \ $(top_srcdir)/../config/lib-link.m4 \ - $(top_srcdir)/../config/lib-prefix.m4 $(top_srcdir)/pkg.m4 \ - $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/../config/lib-prefix.m4 \ $(top_srcdir)/../config/no-executables.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/../libtool.m4 $(top_srcdir)/mingwld.m4 \ + $(top_srcdir)/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) CONFIG_HEADER = config.h $(top_builddir)/gcj/libgcj-config.h diff --git a/libjava/acinclude.m4 b/libjava/mingwld.m4 similarity index 65% rename from libjava/acinclude.m4 rename to libjava/mingwld.m4 index 8a9677aa7d36..94067988601f 100644 --- a/libjava/acinclude.m4 +++ b/libjava/mingwld.m4 @@ -1,17 +1,3 @@ -m4_include(../config/no-executables.m4) - -dnl The lines below arrange for aclocal not to bring libtool.m4 -dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake -dnl to add a definition of LIBTOOL to Makefile.in. -m4_include(../libtool.m4) -ifelse(yes,no,[ -AC_DEFUN([AM_PROG_LIBTOOL],) -AC_DEFUN([AC_LIBTOOL_DLOPEN],) -AC_DEFUN([AC_LIBLTDL_CONVENIENCE],) -AC_DEFUN([LT_AC_PROG_GCJ],) -AC_SUBST(GCJ) -AC_SUBST(LIBTOOL) -]) AC_DEFUN([CHECK_FOR_BROKEN_MINGW_LD], [ AC_MSG_CHECKING(whether 'ld' is at least 2.13) @@ -33,5 +19,4 @@ else AC_MSG_WARN([ld <2.13 detected; enabling JV_LINKER_CANNOT_8BYTE_ALIGN_STATICS hack...]) AC_DEFINE(JV_LINKER_CANNOT_8BYTE_ALIGN_STATICS, 1, [Indicate that linker is not able to 8-byte align static data]) -fi[]dnl -])# CHECK_FOR_BROKEN_MINGW_LD +fi]) diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in index 970aad609708..074fda1a1dd7 100644 --- a/libjava/testsuite/Makefile.in +++ b/libjava/testsuite/Makefile.in @@ -47,10 +47,10 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lib-ld.m4 \ $(top_srcdir)/../config/lib-link.m4 \ - $(top_srcdir)/../config/lib-prefix.m4 $(top_srcdir)/pkg.m4 \ - $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/../config/lib-prefix.m4 \ $(top_srcdir)/../config/no-executables.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/../libtool.m4 $(top_srcdir)/mingwld.m4 \ + $(top_srcdir)/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) CONFIG_HEADER = $(top_builddir)/include/config.h \