summaryrefslogtreecommitdiff
path: root/zlib/acinclude.m4
diff options
context:
space:
mode:
authoraoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4>2001-05-13 22:31:24 +0000
committeraoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4>2001-05-13 22:31:24 +0000
commitf4df17480321b55d0ae5780e570b7e88d7f5b515 (patch)
treee0569a4fbadc87ab280258d8d3ea1c4a600713f0 /zlib/acinclude.m4
parentbc488349fab16816e595ba64654e41364c6339cb (diff)
downloadgcc-f4df17480321b55d0ae5780e570b7e88d7f5b515.tar.gz
* acinclude.m4: Use ../libtool.m4.
* configure.in: Use ${zlib_basedir}/.. for AC_CONFIG_AUX_DIR. * acinclude.m4, configure, Makefile.in: Rebuilt. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42052 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'zlib/acinclude.m4')
-rw-r--r--zlib/acinclude.m49
1 files changed, 9 insertions, 0 deletions
diff --git a/zlib/acinclude.m4 b/zlib/acinclude.m4
index c304a53a91d..cbbaa3008fb 100644
--- a/zlib/acinclude.m4
+++ b/zlib/acinclude.m4
@@ -37,3 +37,12 @@ else
test "${CFLAGS+set}" = set || CFLAGS="-g"
fi
])
+
+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_SUBST(LIBTOOL)
+])