5b7a26f696
2004-09-22 Kelley Cook <kcook@gcc.gnu.org> * Makefile.am: Run aclocal with -I ../config * acinclude.m4: Delete macros picked up from ../config and tidy. (AM_ICONV,AM_LC_MESSAGES, PKG_CHECK_MODULES): Delete. * aclocal.m4, configure, Makefile.in, gcj/Makefile.in: Regenerate. * include/Makefile.in, testsuite/Makefile.in: Regenerate. From-SVN: r87913
38 lines
1.3 KiB
Plaintext
38 lines
1.3 KiB
Plaintext
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)
|
|
LD_PROG=`$CC --print-prog-name=ld`
|
|
LD_VERSION=`$LD_PROG --version`
|
|
LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
|
|
LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2`
|
|
if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then
|
|
LD_OK="ok"
|
|
else
|
|
if expr "$LD_VERSION_MAJOR" = 2 && expr "$LD_VERSION_MINOR" \>= 13 > /dev/null; then
|
|
LD_OK="ok"
|
|
fi
|
|
fi
|
|
if test "x$LD_OK" != x; then
|
|
AC_MSG_RESULT([yes; major=$LD_VERSION_MAJOR, minor=$LD_VERSION_MINOR])
|
|
else
|
|
AC_MSG_RESULT([no; major=$LD_VERSION_MAJOR, minor=$LD_VERSION_MINOR])
|
|
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
|