Merge basic-improvements-branch to trunk

[thirdparty/gcc.git] / libffi / acinclude.m4

diff --git a/libffi/acinclude.m4 b/libffi/acinclude.m4
index 162f6625d16d8ad4b204ab19a846b58086bf6816..9c2ef36254ba60c81c194bdec3c3e3d2f5c86108 100644 (file)
--- a/libffi/acinclude.m4
+++ b/libffi/acinclude.m4
@@ -4,5 +4,8 @@ dnl AC_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
 dnl to add a definition of LIBTOOL to Makefile.in.
 ifelse(yes,no,[
 AC_DEFUN([AC_PROG_LIBTOOL],)
+AC_DEFUN([AM_PROG_LIBTOOL],)
 AC_SUBST(LIBTOOL)
 ])
+
+sinclude(../config/accross.m4)