* acinclude.m4: Include libtool macros from the source tree.

[pf3gnuchains/gcc-fork.git] / libjava / acinclude.m4

diff --git a/libjava/acinclude.m4 b/libjava/acinclude.m4
index de2f96c..6b24951 100644 (file)
--- a/libjava/acinclude.m4
+++ b/libjava/acinclude.m4
@@ -160,3 +160,14 @@ AC_SUBST(LIBGCJ_CFLAGS)
 AC_SUBST(LIBGCJ_CXXFLAGS)
 AC_SUBST(LIBGCJ_JAVAFLAGS)
 ])dnl
+
+sinclude(../libtool.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.
+ifelse(yes,no,[
+AC_DEFUN([AM_PROG_LIBTOOL],)
+AC_DEFUN([AC_LIBTOOL_DLOPEN],)
+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],)
+AC_SUBST(LIBTOOL)
+])