aboutsummaryrefslogtreecommitdiff
path: root/libjava/acinclude.m4
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2000-09-10 08:12:11 +0000
committerAlexandre Oliva <aoliva@gcc.gnu.org>2000-09-10 08:12:11 +0000
commit6d0860ee89b96024fa76dbad08743855318184ce (patch)
tree0887f81963761d1b7d2fda8c9fee8d9dfe6142b5 /libjava/acinclude.m4
parent205f5ac60a175bc1739ef4edba1751c50d2aaa89 (diff)
downloadgcc-6d0860ee89b96024fa76dbad08743855318184ce.zip
gcc-6d0860ee89b96024fa76dbad08743855318184ce.tar.gz
gcc-6d0860ee89b96024fa76dbad08743855318184ce.tar.bz2
acinclude.m4: Include libtool macros from the source tree.
* acinclude.m4: Include libtool macros from the source tree. * aclocal.m4, configure: Rebuilt. From-SVN: r36296
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 de2f96c..6b24951 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)
+])