Bump to autoconf 2.69 and automake 1.15.1

[deliverable/binutils-gdb.git] / zlib / configure.ac

diff --git a/zlib/configure.ac b/zlib/configure.ac
index fb8d943905e278f92a8552db634979b03016e741..e9ebd64f2e7c37b8fbb7c65d3bb048b146990e8e 100644 (file)
--- a/zlib/configure.ac
+++ b/zlib/configure.ac
@@ -1,10 +1,11 @@
 dnl Process this with autoconf to create configure
 
-AC_PREREQ(2.64)
-AC_INIT
+AC_INIT([zlib], [1.1.4])
 AC_CONFIG_SRCDIR([zlib.h])
 
-AM_ENABLE_MULTILIB(, ..)
+if test -n "${with_target_subdir}"; then
+  AM_ENABLE_MULTILIB(, ..)
+fi
 
 AC_CANONICAL_SYSTEM
 
@@ -12,7 +13,7 @@ AC_CANONICAL_SYSTEM
 mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
 AC_SUBST(mkinstalldirs)
 
-AM_INIT_AUTOMAKE(zlib, 1.1.4)
+AM_INIT_AUTOMAKE
 
 AM_MAINTAINER_MODE