diff options
| author | Kelley Cook <kcook@gcc.gnu.org> | 2005-08-22 22:36:35 +0000 |
|---|---|---|
| committer | R. Kelley Cook <kcook@gcc.gnu.org> | 2005-08-22 22:36:35 +0000 |
| commit | 029e5fc0c5f8327b30b1d6df283c6b99a7582d1f (patch) | |
| tree | 4e597a4d2c98e0a6e07fc26ed7338770fac2bba4 /libjava/aclocal.m4 | |
| parent | 9c8f164b947b56bb258509419d33368c6d4469b5 (diff) | |
| download | gcc-029e5fc0c5f8327b30b1d6df283c6b99a7582d1f.tar.gz | |
Makefile.am (ACLOCAL_AMFLAGS): Also include "..".
2005-08-22 Kelley Cook <kcook@gcc.gnu.org>
* 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.
From-SVN: r103361
Diffstat (limited to 'libjava/aclocal.m4')
| -rw-r--r-- | libjava/aclocal.m4 | 61 |
1 files changed, 3 insertions, 58 deletions
diff --git a/libjava/aclocal.m4 b/libjava/aclocal.m4 index 70b12cd9d88..af5d7760dd6 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 -]) - - |