summaryrefslogtreecommitdiff
path: root/libjava/acinclude.m4
diff options
context:
space:
mode:
authoraoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4>2000-09-10 08:12:11 +0000
committeraoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4>2000-09-10 08:12:11 +0000
commit8662f9d087c0e8a9bfe230c90fe4e674747493f2 (patch)
tree0887f81963761d1b7d2fda8c9fee8d9dfe6142b5 /libjava/acinclude.m4
parentc113708118dd8db6555d44027a6b35df675fd730 (diff)
downloadgcc-8662f9d087c0e8a9bfe230c90fe4e674747493f2.tar.gz
* acinclude.m4: Include libtool macros from the source tree.
* aclocal.m4, configure: Rebuilt. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36296 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/acinclude.m4')
-rw-r--r--libjava/acinclude.m411
1 files changed, 11 insertions, 0 deletions
diff --git a/libjava/acinclude.m4 b/libjava/acinclude.m4
index de2f96cdcef..6b249517780 100644
--- 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)
+])