Use specific autoconf/automake versions.

Author: bhaible

ChangeLog

@@ -1,3 +1,8 @@
+2005-07-05  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.devel (ACLOCAL): New variable.
+	(aclocal.m4): Use it.
+
 2005-07-05  Bruno Haible  <bruno@clisp.org>
 
 	* m4/relocatable.m4 (AC_RELOCATABLE): On mingw, simply set

Makefile.devel

@@ -7,6 +7,7 @@ MAKE = make
 AUTOCONF = autoconf-2.59
 AUTOHEADER = autoheader-2.59
 AUTOMAKE = automake-1.9
+ACLOCAL = aclocal-1.9
 GPERF = gperf
 CC = gcc
 CFLAGS = -O
@@ -45,7 +46,7 @@ CONFIGURES_IN = configure.in
 #m4/libtool.m4 : $(CLISP_DIR)/src/m4/libtool.m4 ; cp -p $< $@-t && mv $@-t $@
 
 aclocal.m4 : m4/general.m4 m4/proto.m4 m4/cp.m4 m4/ln.m4 m4/codeset.m4 m4/eilseq.m4 m4/endian.m4 m4/glibc21.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/alloca.m4 m4/allocsa.m4 m4/canonicalize.m4 m4/eealloc.m4 m4/error.m4 m4/extensions.m4 m4/mbstate_t.m4 m4/onceonly.m4 m4/pathmax.m4 m4/readlink.m4 m4/relocatable.m4 m4/setenv.m4 m4/ssize_t.m4 m4/stdbool.m4 m4/stdint.m4 m4/strerror.m4 m4/strerror_r.m4 m4/unlocked-io.m4 m4/xreadlink.m4  m4/libtool.m4  m4/gettext.m4 m4/iconv.m4 m4/intmax.m4 m4/inttypes.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/longdouble.m4 m4/longlong.m4 m4/nls.m4 m4/po.m4 m4/printf-posix.m4 m4/progtest.m4 m4/signed.m4 m4/wchar_t.m4 m4/wint_t.m4
-	aclocal -I m4 --output=$@
+	$(ACLOCAL) -I m4 --output=$@
 
 configures : $(CONFIGURES)
 

libcharset/ChangeLog

@@ -1,3 +1,8 @@
+2005-07-05  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.devel (AUTOHEADER, ACLOCAL): New variables.
+	(autoconf/aclocal.m4, config.h.in): Use them.
+
 2005-03-22  Bruno Haible  <bruno@clisp.org>
 
 	* build-aux: New directory, renamed from autoconf.

libcharset/Makefile.devel

@@ -4,21 +4,23 @@
 SHELL = /bin/sh
 MAKE = make
 AUTOCONF = autoconf-2.59
+AUTOHEADER = autoheader-2.59
+ACLOCAL = aclocal-1.9
 CP = cp
 RM = rm -f
 
 all : configures config.h_vms config.h.msvc include/libcharset.h.msvc-shared include/localcharset.h.msvc-shared
 
 autoconf/aclocal.m4 : $(wildcard m4/*.m4)
-	aclocal -I m4 --output=$@
+	$(ACLOCAL) -I m4 --output=$@
 
 configures : configure config.h.in
 
 configure : configure.in autoconf/aclocal.m4
 	$(AUTOCONF) --include autoconf
 
 config.h.in : configure.in autoconf/aclocal.m4
-	autoheader --include autoconf
+	$(AUTOHEADER) --include autoconf
 	touch config.h.in
 
 config.h_vms : config.h.in