From e53585cb65541c1aa0d7daec2bc21cca470730d4 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 13 Feb 2001 06:52:58 +0000 Subject: [PATCH] * configure.in: Updated to 1.4d and released. --- ChangeLog | 2 ++ Makefile.in | 39 ++++++++++++++++---------------- NEWS | 2 +- aclocal.m4 | 66 +++++++++++++++++++++++++++++++++++++++++++++++++------ configure | 16 +++++++++++--- configure.in | 2 +- m4/Makefile.in | 19 ++++++++-------- stamp-vti | 4 ++-- tests/Makefile.in | 19 ++++++++-------- version.texi | 4 ++-- 10 files changed, 117 insertions(+), 56 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09f74d5ee..c295879d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2001-02-12 Tom Tromey + * configure.in: Updated to 1.4d and released. + * m4/init.m4 (AM_INIT_AUTOMAKE): Explicitly allow various AM_* names through autoconf. diff --git a/Makefile.in b/Makefile.in index d3eced805..dc0797734 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4c from Makefile.am +# Makefile.in generated automatically by automake 1.4d from Makefile.am # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -67,6 +67,7 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PERL = @PERL@ VERSION = @VERSION@ +_am_include = @_am_include@ install_sh = @install_sh@ @@ -131,7 +132,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) GZIP_ENV = --best DIST_SUBDIRS = $(SUBDIRS) -all: all-redirect +all: all-recursive .SUFFIXES: .SUFFIXES: .dvi .info .ps .texi .texinfo .txi $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) @@ -547,7 +548,6 @@ uninstall-am: uninstall-binSCRIPTS uninstall-info \ uninstall-dist_pkgdataDATA uninstall-dist_scriptDATA uninstall: uninstall-recursive all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(DATA) -all-redirect: all-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install installdirs: installdirs-recursive @@ -588,23 +588,22 @@ mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-aminfo mostlyclean-generic mostlyclean-vti -.PHONY: all all-am all-recursive all-redirect check check-am \ - check-recursive clean clean-generic clean-recursive distclean \ - distclean-generic distclean-recursive distclean-tags distdir \ - dvi dvi-am dvi-recursive info info-am info-recursive install \ - install-am install-binSCRIPTS install-data install-data-am \ - install-data-recursive install-dist_pkgdataDATA \ - install-dist_scriptDATA install-exec install-exec-am \ - install-exec-recursive install-info-am install-recursive \ - install-strip installcheck installcheck-am installcheck-local \ - installcheck-recursive installdirs installdirs-am \ - installdirs-recursive maintainer-clean maintainer-clean-aminfo \ - maintainer-clean-generic maintainer-clean-recursive \ - maintainer-clean-vti mostlyclean mostlyclean-aminfo \ - mostlyclean-generic mostlyclean-recursive mostlyclean-vti tags \ - tags-recursive uninstall uninstall-am uninstall-binSCRIPTS \ - uninstall-dist_pkgdataDATA uninstall-dist_scriptDATA \ - uninstall-info uninstall-recursive +.PHONY: all-recursive check check-am check-recursive clean clean-generic \ + clean-recursive distclean distclean-generic distclean-recursive \ + distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ + info-recursive install install-am install-binSCRIPTS \ + install-data install-data-am install-data-recursive \ + install-dist_pkgdataDATA install-dist_scriptDATA install-exec \ + install-exec-am install-exec-recursive install-info-am \ + install-recursive install-strip installcheck installcheck-am \ + installcheck-local installcheck-recursive installdirs \ + installdirs-am installdirs-recursive maintainer-clean \ + maintainer-clean-aminfo maintainer-clean-generic \ + maintainer-clean-recursive maintainer-clean-vti mostlyclean \ + mostlyclean-aminfo mostlyclean-generic mostlyclean-recursive \ + mostlyclean-vti tags tags-recursive uninstall uninstall-am \ + uninstall-binSCRIPTS uninstall-dist_pkgdataDATA \ + uninstall-dist_scriptDATA uninstall-info uninstall-recursive install-data-hook: diff --git a/NEWS b/NEWS index e7cf40b87..004087950 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -New in 1.4c: +New in 1.4d: * Support for `configure.ac'. New in 1.4b: diff --git a/aclocal.m4 b/aclocal.m4 index 94db5bf51..f81c06f9f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# aclocal.m4 generated automatically by aclocal 1.4c +# aclocal.m4 generated automatically by aclocal 1.4d # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000 # Free Software Foundation, Inc. @@ -48,7 +48,7 @@ AC_DEFUN([AM_INIT_AUTOMAKE], # test to see if srcdir already configured if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first]) fi # Define the identity of the package. @@ -60,6 +60,16 @@ ifelse([$3],, [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])]) +# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow +# the ones we care about. +ifdef([m4_pattern_allow], [m4_pattern_allow([AM_CFLAGS])]) +ifdef([m4_pattern_allow], [m4_pattern_allow([AM_CPPFLAGS])]) +ifdef([m4_pattern_allow], [m4_pattern_allow([AM_CXXFLAGS])]) +ifdef([m4_pattern_allow], [m4_pattern_allow([AM_OBJCFLAGS])]) +ifdef([m4_pattern_allow], [m4_pattern_allow([AM_FFLAGS])]) +ifdef([m4_pattern_allow], [m4_pattern_allow([AM_RFLAGS])]) +ifdef([m4_pattern_allow], [m4_pattern_allow([AM_GCJFLAGS])]) + # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl @@ -210,14 +220,30 @@ depcpp="$CXXCPP"], depcc="$$1" depcpp=""]) +AC_REQUIRE([AM_MAKE_INCLUDE]) + AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], [if test -z "$AMDEP"; then - echo '#include "conftest.h"' > conftest.c - echo 'int i;' > conftest.h + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir confdir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" confdir + cd confdir am_cv_$1_dependencies_compiler_type=none - for depmode in `sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < "$am_depcomp"`; do + for depmode in `sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < "./depcomp"`; do + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + echo '#include "conftest.h"' > conftest.c + echo 'int i;' > conftest.h + case "$depmode" in nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll @@ -236,14 +262,15 @@ AC_CACHE_CHECK([dependency style of $depcc], if depmode="$depmode" \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL $am_depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && grep conftest.h conftest.Po > /dev/null 2>&1; then am_cv_$1_dependencies_compiler_type="$depmode" break fi done - rm -f conftest.* + cd .. + rm -rf confdir else am_cv_$1_dependencies_compiler_type=none fi @@ -348,3 +375,28 @@ done ], [AMDEP="$AMDEP" ac_aux_dir="$ac_aux_dir"])]) +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +# BSD make uses .include +cat > confinc << 'END' +doit: + @echo done +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +_am_include='#' +for am_inc in include .include; do + echo "$am_inc confinc" > confmf + if test "`$am_make -f confmf 2> /dev/null`" = "done"; then + _am_include=$am_inc + break + fi +done +AC_SUBST(_am_include) +AC_MSG_RESULT($_am_include) +rm -f confinc confmf +]) + diff --git a/configure b/configure index ff3369e20..0dc7e7153 100755 --- a/configure +++ b/configure @@ -776,12 +776,12 @@ fi # test to see if srcdir already configured if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } + { echo "configure: error: source directory already configured; run \"make distclean\" there first" 1>&2; exit 1; } fi # Define the identity of the package. PACKAGE=automake -VERSION=1.4c +VERSION=1.4d cat >> confdefs.h <> confdefs.h <&6 -echo "configure:837: checking for $ac_word" >&5 +echo "configure:847: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/configure.in b/configure.in index 7095df95a..7f71c6060 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(automake.in) -AM_INIT_AUTOMAKE(automake, 1.4c) +AM_INIT_AUTOMAKE(automake, 1.4d) ACLOCAL="`pwd`/aclocal --acdir=m4" AUTOMAKE="`pwd`/automake --amdir=." diff --git a/m4/Makefile.in b/m4/Makefile.in index de6f5eb9d..3ff8ace21 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4c from Makefile.am +# Makefile.in generated automatically by automake 1.4d from Makefile.am # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -67,6 +67,7 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PERL = @PERL@ VERSION = @VERSION@ +_am_include = @_am_include@ install_sh = @install_sh@ @@ -93,7 +94,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) GZIP_ENV = --best -all: all-redirect +all: all-am .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnits m4/Makefile @@ -159,7 +160,6 @@ install: install-am uninstall-am: uninstall-m4dataDATA uninstall: uninstall-am all-am: Makefile $(DATA) -all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install installdirs: @@ -194,13 +194,12 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic -.PHONY: all all-am all-redirect check check-am clean clean-generic \ - distclean distclean-generic distdir dvi dvi-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-m4dataDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - uninstall uninstall-am uninstall-m4dataDATA +.PHONY: check check-am clean clean-generic distclean distclean-generic \ + distdir dvi dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-m4dataDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic uninstall uninstall-am uninstall-m4dataDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/stamp-vti b/stamp-vti index c41134045..10fc7f6ca 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,4 +1,4 @@ @set UPDATED 3 February 2001 @set UPDATED-MONTH February 2001 -@set EDITION 1.4c -@set VERSION 1.4c +@set EDITION 1.4d +@set VERSION 1.4d diff --git a/tests/Makefile.in b/tests/Makefile.in index 7bb2cb493..04eadf4de 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4c from Makefile.am +# Makefile.in generated automatically by automake 1.4d from Makefile.am # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -67,6 +67,7 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PERL = @PERL@ VERSION = @VERSION@ +_am_include = @_am_include@ install_sh = @install_sh@ @@ -355,7 +356,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) GZIP_ENV = --best -all: all-redirect +all: all-am .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/Makefile @@ -459,7 +460,6 @@ install: install-am uninstall-am: uninstall: uninstall-am all-am: Makefile -all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install installdirs: @@ -493,13 +493,12 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic -.PHONY: all all-am all-redirect check check-TESTS check-am clean \ - clean-generic distclean distclean-generic distdir dvi dvi-am \ - info info-am install install-am install-data install-data-am \ - install-exec install-exec-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - uninstall uninstall-am +.PHONY: check check-TESTS check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic uninstall uninstall-am distclean-local: diff --git a/version.texi b/version.texi index c41134045..10fc7f6ca 100644 --- a/version.texi +++ b/version.texi @@ -1,4 +1,4 @@ @set UPDATED 3 February 2001 @set UPDATED-MONTH February 2001 -@set EDITION 1.4c -@set VERSION 1.4c +@set EDITION 1.4d +@set VERSION 1.4d -- 2.11.4.GIT