From: Tom Tromey Date: Tue, 31 Jul 2001 05:45:25 +0000 (+0000) Subject: * configure.in: Released 1.4j. X-Git-Tag: Release-1-4j^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60903702f6440e19c3ca520cd36ea0c278a730c7;p=thirdparty%2Fautomake.git * configure.in: Released 1.4j. --- diff --git a/ChangeLog b/ChangeLog index e58af9447..649b67a30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2001-07-31 Tom Tromey + * configure.in: Released 1.4j. + * lib/config.guess: Updated from master sources. * lib/config.sub: Likewise. diff --git a/Makefile.in b/Makefile.in index 56d17a69f..947b8360f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4g from Makefile.am. +# Makefile.in generated automatically by automake 1.4j from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -58,12 +58,14 @@ POST_UNINSTALL = : AMTAR = @AMTAR@ AWK = @AWK@ DEPDIR = @DEPDIR@ +EXEEXT = @EXEEXT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ VERSION = @VERSION@ -_am_include = @_am_include@ -_am_quote = @_am_quote@ +am__include = @am__include@ +am__quote = @am__quote@ install_sh = @install_sh@ AUTOMAKE_OPTIONS = 1.4 dist-bzip2 @@ -86,8 +88,6 @@ EXTRA_DIST = ChangeLog.1996 ChangeLog.1998 ChangeLog.2000 WGET = wget FETCHFILES = config.guess config.sub ansi2knr.c -EXEEXT = -OBJEXT = o subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs @@ -105,8 +105,8 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ install-exec-recursive installdirs-recursive install-recursive \ uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ - Makefile.in NEWS README-alpha THANKS TODO aclocal.in aclocal.m4 \ - automake.in configure configure.in install-sh mdate-sh missing \ + Makefile.in NEWS THANKS TODO aclocal.in aclocal.m4 automake.in \ + configure configure.in install-sh mdate-sh missing \ mkinstalldirs stamp-vti version.texi DIST_SUBDIRS = $(SUBDIRS) all: all-recursive @@ -115,7 +115,7 @@ all: all-recursive .SUFFIXES: .dvi .info .ps .texi $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnits Makefile + $(AUTOMAKE) --gnu Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -331,10 +331,10 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ GTAGS: here=`CDPATH=: && cd $(top_builddir) && pwd` \ && cd $(top_srcdir) \ - && gtags -i $$here + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -345,11 +345,6 @@ distdir = $(PACKAGE)-$(VERSION) GZIP_ENV = --best distdir: $(DISTFILES) - @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" >/dev/null; \ - then :; else \ - echo "NEWS not updated; not releasing" 1>&2; \ - exit 1; \ - fi -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) mkdir $(distdir) $(mkinstalldirs) $(distdir)/. @@ -416,7 +411,9 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && test `find $$dc_install_base -type f -print | wc -l` -le 1 \ + && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ + || (echo "Error: files left after uninstall" 1>&2; \ + exit 1) ) \ && $(MAKE) $(AM_MAKEFLAGS) dist \ && $(MAKE) $(AM_MAKEFLAGS) distclean \ && rm -f $(distdir).tar.gz \ @@ -521,7 +518,7 @@ uninstall-am: uninstall-binSCRIPTS uninstall-info-am uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) all all-am check check-am clean \ +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ clean-generic clean-recursive dist dist-all dist-bzip2 \ dist-info distcheck distclean distclean-generic \ distclean-recursive distclean-tags distdir dvi dvi-am \ diff --git a/NEWS b/NEWS index 10cbc097a..6c8f8071e 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -New in 1.4h: +New in 1.4j: * Support for `configure.ac'. * Support for `else COND', `endif COND' and negated conditions `!COND'. * `make dist-all' is much faster. diff --git a/aclocal.m4 b/aclocal.m4 index b7b3f3a20..8d467846c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# aclocal.m4 generated automatically by aclocal 1.4g +# aclocal.m4 generated automatically by aclocal 1.4j -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000 +# Copyright 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -65,6 +65,15 @@ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])]) ifdef([m4_pattern_allow], [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl +# Autoconf 2.50 always computes EXEEXT. However we need to be +# compatible with 2.13, for now. So we always define EXEEXT, but we +# don't compute it. +AC_SUBST(EXEEXT) +# Similar for OBJEXT -- only we only use OBJEXT if the user actually +# requests that it be used. This is a bit dumb. +: ${OBJEXT=o} +AC_SUBST(OBJEXT) + # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl @@ -83,13 +92,13 @@ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_DEP_TRACK])dnl AC_REQUIRE([AM_SET_DEPDIR])dnl AC_PROVIDE_IFELSE([AC_PROG_][CC], - [AM_DEPENDENCIES(CC)], + [_AM_DEPENDENCIES(CC)], [define([AC_PROG_][CC], - defn([AC_PROG_][CC])[AM_DEPENDENCIES(CC)])])dnl + defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl AC_PROVIDE_IFELSE([AC_PROG_][CXX], - [AM_DEPENDENCIES(CXX)], + [_AM_DEPENDENCIES(CXX)], [define([AC_PROG_][CXX], - defn([AC_PROG_][CXX])[AM_DEPENDENCIES(CXX)])])dnl + defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl ]) # @@ -186,30 +195,6 @@ else fi ]) -# AM_AUX_DIR_EXPAND - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to ${srcdir}/foo. In other projects, it is set to `.'. -# Of course, Automake must honor this variable whenever it call a tool -# from the auxiliary directory. The problem is that $srcdir (hence -# $ac_aux_dir) can be either an absolute path or a path relative to -# $top_srcdir or absolute, this depends on how configure is run. This -# is pretty anoying since it makes $ac_aux_dir quite unusable in -# subdirectories: on the top source directory, any form will work -# fine, but in subdirectories relative pat needs to be adapted. -# - calling $top_srcidr/$ac_aux_dir/missing would success if $srcdir is -# relative, but fail if $srcdir is absolute -# - conversly, calling $ax_aux_dir/missing would fail if $srcdir is -# absolute, and success on relative paths. -# -# Consequently, we define and use $am_aux_dir, the "always absolute" -# version of $ac_aux_dir. - -AC_DEFUN([AM_AUX_DIR_EXPAND], [ -# expand $ac_aux_dir to an absolute path -am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` -]) - # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -223,7 +208,9 @@ _am_dirpart="`echo $install_sh | sed -e 's,//*[[^/]]*$,,'`" INSTALL_STRIP_PROGRAM="\${SHELL} \`CDPATH=: && cd $_am_dirpart && pwd\`/install-sh -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# serial 3 +# serial 4 -*- Autoconf -*- + + # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -231,36 +218,29 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # C support machinery. Also note that it means that autoscan, seeing # CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# AM_DEPENDENCIES(NAME) + + +# _AM_DEPENDENCIES(NAME) # --------------------- # See how the compiler implements dependency checking. # NAME is "CC", "CXX" or "OBJC". # We try a few techniques and use that to set a single cache variable. -AC_DEFUN([AM_DEPENDENCIES], +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -am_compiler_list= -ifelse([$1], CC, - [AC_REQUIRE([AC_PROG_][CC])dnl -AC_REQUIRE([AC_PROG_][CPP]) -depcc="$CC" -depcpp="$CPP"], - [$1], CXX, [AC_REQUIRE([AC_PROG_][CXX])dnl -AC_REQUIRE([AC_PROG_][CXXCPP]) -depcc="$CXX" -depcpp="$CXXCPP"], - [$1], OBJC, [am_compiler_list='gcc3 gcc' -depcc="$OBJC" -depcpp=""], - [$1], GCJ, [am_compiler_list='gcc3 gcc' -depcc="$GCJ" -depcpp=""], - [AC_REQUIRE([AC_PROG_][$1])dnl -depcc="$$1" -depcpp=""]) - -AC_REQUIRE([AM_MAKE_INCLUDE]) -AC_REQUIRE([AM_DEP_TRACK]) +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'] + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -270,15 +250,15 @@ AC_CACHE_CHECK([dependency style of $depcc], # 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 + mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. - cp "$am_depcomp" confdir - cd confdir + cp "$am_depcomp" conftest.dir + cd conftest.dir am_cv_$1_dependencies_compiler_type=none if test "$am_compiler_list" = ""; then - am_compiler_list="`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`" + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi for depmode in $am_compiler_list; do # We need to recreate these files for each test, as the compiler may @@ -286,8 +266,9 @@ AC_CACHE_CHECK([dependency style of $depcc], # This happens at least with the AIX C compiler. echo '#include "conftest.h"' > conftest.c echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf - case "$depmode" in + case $depmode in nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -302,18 +283,19 @@ AC_CACHE_CHECK([dependency style of $depcc], # We check with `-c' and `-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly # handle `-M -o', and we need to detect this. - if depmode="$depmode" \ + if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ $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" + grep conftest.h conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + am_cv_$1_dependencies_compiler_type=$depmode break fi done cd .. - rm -rf confdir + rm -rf conftest.dir else am_cv_$1_dependencies_compiler_type=none fi @@ -326,16 +308,17 @@ AC_SUBST([$1DEPMODE]) # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES AC_DEFUN([AM_SET_DEPDIR], -[if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then +[rm -f .deps 2>/dev/null +mkdir .deps 2>/dev/null +if test -d .deps; then DEPDIR=.deps - # We redirect because .deps might already exist and be populated. - # In this situation we don't want to see an error. - rmdir .deps > /dev/null 2>&1 else + # MS-DOS does not allow filenames that begin with a dot. DEPDIR=_deps fi +rmdir .deps 2>/dev/null AC_SUBST(DEPDIR) ]) @@ -418,8 +401,8 @@ doit: 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='#' -_am_quote= +am__include='#' +am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf @@ -429,21 +412,21 @@ echo "include confinc" > confmf # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then - _am_include=include - _am_quote= + am__include=include + am__quote= _am_result=GNU fi # Now try BSD make style include. -if test "$_am_include" = "#"; then +if test "$am__include" = "#"; then echo '.include "confinc"' > confmf if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - _am_include=.include - _am_quote='"' + am__include=.include + am__quote='"' _am_result=BSD fi fi -AC_SUBST(_am_include) -AC_SUBST(_am_quote) +AC_SUBST(am__include) +AC_SUBST(am__quote) AC_MSG_RESULT($_am_result) rm -f confinc confmf ]) diff --git a/configure b/configure index 9e837e65a..a34a2dbbb 100755 --- a/configure +++ b/configure @@ -677,7 +677,7 @@ else echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2 fi -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -761,14 +761,15 @@ fi -if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then +rm -f .deps 2>/dev/null +mkdir .deps 2>/dev/null +if test -d .deps; then DEPDIR=.deps - # We redirect because .deps might already exist and be populated. - # In this situation we don't want to see an error. - rmdir .deps > /dev/null 2>&1 else + # MS-DOS does not allow filenames that begin with a dot. DEPDIR=_deps fi +rmdir .deps 2>/dev/null # test to see if srcdir already configured @@ -779,7 +780,7 @@ fi # Define the identity of the package. PACKAGE=automake -VERSION=1.4i +VERSION=1.4j cat >> confdefs.h <&6 -echo "configure:843: checking for $ac_word" >&5 +echo "configure:853: 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 @@ -1035,6 +1045,8 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@PACKAGE@%$PACKAGE%g s%@VERSION@%$VERSION%g +s%@EXEEXT@%$EXEEXT%g +s%@OBJEXT@%$OBJEXT%g s%@ACLOCAL@%$ACLOCAL%g s%@AUTOCONF@%$AUTOCONF%g s%@AUTOMAKE@%$AUTOMAKE%g diff --git a/configure.in b/configure.in index f6fba5985..05a7d8e42 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ AC_INIT(automake.in) AC_CONFIG_AUX_DIR(lib) -AM_INIT_AUTOMAKE(automake, 1.4i) +AM_INIT_AUTOMAKE(automake, 1.4j) ACLOCAL="`pwd`/aclocal --acdir=m4" # $AUTOMAKE is always run after a `cd $top_srcdir', hence `.' is really diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index 79cbdd498..c86b9ffcc 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4i from Makefile.am. +# Makefile.in generated automatically by automake 1.4j from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -58,18 +58,18 @@ POST_UNINSTALL = : AMTAR = @AMTAR@ AWK = @AWK@ DEPDIR = @DEPDIR@ +EXEEXT = @EXEEXT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ VERSION = @VERSION@ -_am_include = @_am_include@ -_am_quote = @_am_quote@ +am__include = @am__include@ +am__quote = @am__quote@ install_sh = @install_sh@ perllibdir = $(pkgdatadir)/Automake dist_perllib_DATA = Struct.pm -EXEEXT = -OBJEXT = o subdir = lib/Automake mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = diff --git a/lib/Makefile.in b/lib/Makefile.in index dc9283d2a..9921c1363 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4i from Makefile.am. +# Makefile.in generated automatically by automake 1.4j from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -58,12 +58,14 @@ POST_UNINSTALL = : AMTAR = @AMTAR@ AWK = @AWK@ DEPDIR = @DEPDIR@ +EXEEXT = @EXEEXT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ VERSION = @VERSION@ -_am_include = @_am_include@ -_am_quote = @_am_quote@ +am__include = @am__include@ +am__quote = @am__quote@ install_sh = @install_sh@ SUBDIRS = Automake am @@ -74,8 +76,6 @@ scriptdir = $(pkgdatadir) dist_script_DATA = config.guess config.sub install-sh mdate-sh missing \ mkinstalldirs elisp-comp ylwrap acinstall depcomp compile py-compile -EXEEXT = -OBJEXT = o subdir = lib mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = @@ -225,10 +225,10 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ GTAGS: here=`CDPATH=: && cd $(top_builddir) && pwd` \ && cd $(top_srcdir) \ - && gtags -i $$here + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -335,7 +335,7 @@ uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_scriptDATA \ uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) all all-am check check-am clean \ +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am 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 \ diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index 470d98295..d44827abb 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4i from Makefile.am. +# Makefile.in generated automatically by automake 1.4j from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -58,12 +58,14 @@ POST_UNINSTALL = : AMTAR = @AMTAR@ AWK = @AWK@ DEPDIR = @DEPDIR@ +EXEEXT = @EXEEXT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ VERSION = @VERSION@ -_am_include = @_am_include@ -_am_quote = @_am_quote@ +am__include = @am__include@ +am__quote = @am__quote@ install_sh = @install_sh@ amdir = $(pkgdatadir)/am @@ -76,8 +78,6 @@ mans-vars.am mans.am multilib.am program.am progs.am python.am \ remake-hdr.am scripts.am subdirs.am tags.am texi-vers.am texibuild.am \ texinfos.am yacc.am -EXEEXT = -OBJEXT = o subdir = lib/am mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = diff --git a/m4/Makefile.in b/m4/Makefile.in index f8edbc9c9..169a13503 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4i from Makefile.am. +# Makefile.in generated automatically by automake 1.4j from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -58,12 +58,14 @@ POST_UNINSTALL = : AMTAR = @AMTAR@ AWK = @AWK@ DEPDIR = @DEPDIR@ +EXEEXT = @EXEEXT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ VERSION = @VERSION@ -_am_include = @_am_include@ -_am_quote = @_am_quote@ +am__include = @am__include@ +am__quote = @am__quote@ install_sh = @install_sh@ m4datadir = $(datadir)/aclocal @@ -75,8 +77,6 @@ winsz.m4 EXTRA_DIST = $(m4data_DATA) -EXEEXT = -OBJEXT = o subdir = m4 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = diff --git a/stamp-vti b/stamp-vti index 94608d459..96bf76ee7 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,4 +1,4 @@ @set UPDATED 30 July 2001 @set UPDATED-MONTH July 2001 -@set EDITION 1.4i -@set VERSION 1.4i +@set EDITION 1.4j +@set VERSION 1.4j diff --git a/tests/Makefile.in b/tests/Makefile.in index d1a8dc002..b9ab42883 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4i from Makefile.am. +# Makefile.in generated automatically by automake 1.4j from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -58,12 +58,14 @@ POST_UNINSTALL = : AMTAR = @AMTAR@ AWK = @AWK@ DEPDIR = @DEPDIR@ +EXEEXT = @EXEEXT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ VERSION = @VERSION@ -_am_include = @_am_include@ -_am_quote = @_am_quote@ +am__include = @am__include@ +am__quote = @am__quote@ install_sh = @install_sh@ XFAIL_TESTS = subdir5.test auxdir2.test diff --git a/version.texi b/version.texi index 94608d459..96bf76ee7 100644 --- a/version.texi +++ b/version.texi @@ -1,4 +1,4 @@ @set UPDATED 30 July 2001 @set UPDATED-MONTH July 2001 -@set EDITION 1.4i -@set VERSION 1.4i +@set EDITION 1.4j +@set VERSION 1.4j