aboutsummaryrefslogtreecommitdiff
path: root/zlib/acinclude.m4
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2001-05-13 22:31:24 +0000
committerAlexandre Oliva <aoliva@gcc.gnu.org>2001-05-13 22:31:24 +0000
commit0fd91e0afb4dfd01825ba1e9392c9759b86c1a91 (patch)
treee0569a4fbadc87ab280258d8d3ea1c4a600713f0 /zlib/acinclude.m4
parentd0481042042ac24e9361764c72eb5ea081ac2e85 (diff)
downloadgcc-0fd91e0afb4dfd01825ba1e9392c9759b86c1a91.zip
gcc-0fd91e0afb4dfd01825ba1e9392c9759b86c1a91.tar.gz
gcc-0fd91e0afb4dfd01825ba1e9392c9759b86c1a91.tar.bz2
acinclude.m4: Use ../libtool.m4.
* acinclude.m4: Use ../libtool.m4. * configure.in: Use ${zlib_basedir}/.. for AC_CONFIG_AUX_DIR. * acinclude.m4, configure, Makefile.in: Rebuilt. From-SVN: r42052
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 c304a53..cbbaa30 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)
+])