* automake.in (make_condition_string): New function.
(cond_stack_if, cond_stack_else, cond_stack_endif): Use it.
Suggested by Raja R Harinath.

* tests/texinfo13.test: Require texi2dvi-o.
* tests/defs.in: Handle required=texi2dvi-o.

* automake.in (lang_c_finish): Use $@ in the .c -> _.c rule.

* automake.in (handle_single_transform_list): Don't strip the
directory from $full_ansi.  This reverts my patch of 2002-10-16.
(lang_c_finish): Use the full filename, including the directory,
in the .c -> _.c rule.  These two files must reside in the same
directory.
* tests/ansi6.test: Also try to compile without ansi2knr.
Reported by Andreas Schwab

* lib/Automake/Conditional.pm (strip): New function.
* lib/Automake/ConditionalSet.pm (sub_conditions): Use it.
Suggested by Raja R Harinath.

* automake.in (conditional_ambiguous_p, macro_define, rule_define,
require_variables): Use ->human instead of ->string.
* lib/Automake/Conditional.pm (string): Don't sort conditions, they
are already sorted.
(_to_human, human): New functions.
* lib/Automake/ConditionalSet.pm (human): New function.
* tests/cond27.test, tests/library3.test, tests/pluseq5.test,
tests/pluseq9.test: Adjust.

* lib/Automake/Conditional.pm [SYNOPSIS]: Fix not's description.
* lib/Automake/ConditionalSet.pm (sub_conditions): New function.
(multiply): Also accept an Automake::Conditional as argument.
* automake.in (variable_not_always_defined_in_cond): Simplify,
using only Automake::ConditionalSet methods.
Suggested by Raja R Harinath.

* lib/Automake/ConditionalSet.pm (conds): Use value() to simplify.
(invert): Rewrite as a product-of-sums to sum-of-products converter.
(_multiply, multiply): New functions.
* lib/Automake/Conditional.pm (not): New function.
* lib/Automake/tests/ConditionalSet.pl (test_invert): Update.
* automake.in (condition_negate): Move ...
* lib/Automake/Conditional.pm (negate_condition): ... here.
Suggested by Raja R Harinath.

* lib/Automake/ConditionalSet.pm (_simplify, simplify): New methods.
(true): Cache return value, so _simplify can use it.
* lib/Automake/tests/ConditionalSet.pl (test_simplify): New function.
* automake.in (variable_not_always_defined_in_cond): Return
a simplified ConditionalSet.
(macro_define, require_variables): Adjust.
* tests/Makefile.am (TEST): Add library3.test.
* tests/library3.test: New file.
* tests/pluseq9.test: Adjust.
Thanks to Raja R Harinath.

* lib/Automake/tests/Makefile.am, lib/Automake/tests/Conditional.pl,
lib/Automake/tests/ConditionalSet.pl: New files.
* lib/Automake/Makefile.am (SUBDIRS): New variable.
* configure.in: Output lib/Automake/tests/Makefile.
* lib/Automake/ConditionalSet.pm (by_conditions): Delete.
(conds): Don't use by_conditions, sort alphabetically, and
return sorted conds.
(string): Call ->string on each Conditional.
* tests/Makefile.am (TESTS): Remove cond12.test.
* tests/cond12.test: Remove, moved to
lib/Automake/tests/ConditionalSet.pl.
* tests/cond3.test: Adjust conditional ordering.

* lib/Automake/ConditionalSet.pm (_permutations_worker): Ignore TRUE
conditions.
(permutations): Treat empty permutations as TRUE.
(invert): Simplify.
Suggested by Raja R Harinath.

* automake.in (variable_defined): Thinko.
* lib/Automake/ConditionalSet.pm (true): Simplify.
(permutations): Fix documentation.
(new): Don't simplify conditional sets that contain TRUE.
Reported by Raja R Harinath.

2002-11-14  Eric Blake  <ebb9@email.byu.edu>

* lib/am/depend2.am: Add missing fi in c.obj rules.

* automake.in (handle_installdirs): Reindent to workaround a
parsing bug in Perl 5.6.0.
Reported by Patrick Welche.

* lib/Automake/Conditional.pm: Add reference to ConditionalSet.pm.
* lib/Automake/ConditionalSet.pm: New file.
* lib/Automake/Makefile.am (dist_perllib_DATA): Add ConditionalSet.pm.
* automake.in: Use ConditionalSet.
(by_condition, invert_conditions, variable_conditions_permutations):
Remove, now defined as Automake::ConditionalSet::by_condition,
Automake::ConditionalSet::invert, and
Automake::ConditionalSet::permutations.
(variable_sorted_conditions): Remove.
(msg_var, msg_target handle_source_transform, handle_lib_objects,
conditional_ambiguous_p, variable_not_always_defined_in_cond,
macro_define, macro_dump, variable_defined,
variable_conditions_recursive, variable_conditions,
target_conditions, variable_conditionally_defined,
variable_conditions_recursive_sub,
check_variable_defined_unconditionally, variable_value_as_list,
variable_value_as_list_recursive_worker, variable_output,
variable_pretty_output, rule_define, append_exeext,
am_install_var, require_variables_for_macro): Adjust to
use ConditionalSet.

* automake.in (variable_conditions): Split into ...
(variable_conditions, variable_sorted_conditions): ... these
functions, where variable_sorted_conditions has the semantic of
the old variable_condition.
(target_conditions): New function.
(msg_var, handle_lib_objects_cond, check_ambiguous_conditional,
variable_not_always_defined_in_cond, macro_define,
variable_defined, check_variable_defined_unconditionally,
variable_conditions_recursive_sub,
variable_conditions_permutations, variable_value_as_list,
variable_value_as_list_recursive_worker, append_exeext,
am_install_var, require_variables_for_macro): Use variable_conditions.
(msg_target, rule_define): Use target_conditions.
(define_objects_from_sources, macro_define, macro_dump,
variable_pretty_output): Use variable_sorted_conditions.

* automake.texi (Conditional Sources): Fix the `+=' example.
Reported by Mike Castle.

* automake.in: Don't declare TRUE and FALSE, import them from
Automake::Conditional.
* lib/Automake/Conditional.pm (TRUE, FALSE): New constants.
(new): Simplify using FALSE.
(reduce): New function, moved from ...
* automake.in (variable_conditions_reduce): ... here.
(variable_conditions_recursive_sub, invert_conditions):
Adjust calls to Automake::Conditional::reduce.
* tests/cond12.test: Adjust to use Automake::Conditional.

Make install-sh work even when names contain spaces or
certain (but not all) shell metachars.

* lib/install-sh: Remove lots of unnecessary quoting.
Add double quotes where necessary.
Write diagnostics to stderr, not stdout.
Normalize spacing in diagnostics: use one space (not two,
and not a TAB) after the leading `install:'.
Remove trailing white space.
Remove unnecessary curly braces.
If removing the destination fails, also try to move it aside.
Use `trap' more portably.

regen

(TESTS): Add installsh2.test.

Make install-sh work even when names contain spaces or
certain (but not all) shell metachars.

* lib/install-sh: Remove lots of unnecessary quoting.
Add double quotes where necessary.
Write diagnostics to stderr, not stdout.
Normalize spacing in diagnostics: use one space (not two,
and not a TAB) after the leading `install:'.
Remove trailing white space.
Remove unnecessary curly braces.
If removing the destination fails, also try to move it aside.
Use `trap' more portably.
* tests/installsh2.test: New file, to test for the above fix.
* tests/Makefile.am (TESTS): Add installsh2.test.

.

Fix some typos and a grammar nit.

* automake.in (switch_warning): Subject Perl warnings to -Werror.

* automake.texi (Extending): Complete unterminated sentence.
Reported by Mike Castle.

* automake.in (&conditional_ambiguous_p): Don't forget to ->string
the Conditionals.

* automake.texi (Dist): Fix the distcleancheck_listfiles example.
Reported by Karl Berry.

* tests/location.test (Makefile.am): Strengthen.
* lib/Automake/Channels.pm (_print_message): Be sure to flush
$partial when the message is output.
Thanks to Alexandre Duret-Lutz.

* automake.in (&read_am_file): Use $last_where to register the
_first_ line of a variable definition as location instead of the
last one.
(&conditional_ambiguous_p): Don't forget to ->string the
Conditionals.
(&rule_define): Likewise.
* tests/location.test: Adjust to exercise this.

regen

2002-10-25  Charles Wilson  <cwilson@ece.gatech.edu>

* tests/defs.in: Add explicit stanza for python -V.

Don't rely on which, use an Autoconf-like test instead.
Reported by Frédéric L. W. Meunier" <0@pervalidus.net>

Typo.

* tests/ansi6.test, tests/ansi7.test: Set ac_cv_prog_cc_stdc instead
of am_cv_prog_cc_stdc.  This follows Akim's patch of 2002-10-09,
and reveals a bug in my patch of 2002-10-15.
* automake.in (handle_single_transform_list): Strip directory name
from $full_ansi if subdir-objects is not set.

* lib/texinfo.tex: New version from Texinfo 4.2b.

* automake.in (handle_single_transform_list) <full_ansi>: New variable.
Use this to record correct dependencies about deansifiable files which
are using per-program flags or are in a subdirectory.
* tests/ansi9.test: New file.
* tests/Makefile.am (TESTS): Add ansi9.test.
Reported by Paul D. Smith

* aclocal.in (ac_defun_rx, ac_require_rx): If the macro name is
quoted, accept any character but `]'.  This makes it possible
to define macros such as `AC_LANG_PREPROC(Fortran 90)'.
(scan_m4_files): Quote $key in the regex.  Don't define $expr, it's
not used.
(add_file, scan_file): Adjust to the new definitions of $ac_defun_rx
and $ac_require_rx.
* tests/aclocal2.test: New file.
* tests/Makefile.am (TESTS): Add aclocal2.test.
Reported by Tamara L. Dahlgren and Tom Epperly.

For Debian Bug#153697:
* lib/am/dejagnu.am (distclean-DEJAGNU): Remove $tool.sum and
$tool.log.
Suggested by Andrew Suffield.

For PR automake/369:
* lib/am/python.am: Lookup python files in build directory or
source directory.
From Mathias Doreille.
* tests/python3.test: New file.
* tests/Makefile.am (TESTS): Add python3.test.
* tests/defs: Handle `required=python'.

For PR automake/358:
* lib/am/texi-vers.am (%STAMPVTI%): Depend on configure instead of
configure.ac.
Suggested by Thien-Thi Nguyen.
* lib/am/configure.am ($(srcdir)/configure): Depends on
%CONFIGURE_DEPS%
* automake.in (@configure_deps): New array.
(scan_autoconf_traces): Scan for m4_include and m4_sinclude,
and fill @configure_deps.
(handle_configure): Substitute %CONFIGURE_DEPS%.
Distribute @configure_deps.
* tests/version7.texi: New file.
* tests/vtexi.test: Adjust.
* tests/Makefile.am (TESTS): Add version7.test.
* automake.texi (Dist): Mention that m4_include'd files
are distributed.

* m4/ccstdc.m4 (AM_PROG_CC_STDC): Its definition is now empty:
the content of this macro was merged in AC_PROG_CC.
* m4/protos.m4 (AM_C_PROTOTYPES): Adjust to AC_C_PROTOTYPES.
* tests/depacl.test: Remove, it exercize aclocal in a way that was
exercized by all the other tests since the test suite really uses
aclocal.
* tests/Makefile.am (TESTS): Remove depacl.test.

* lib/am/texibuild.am (%DEST_PREFIX%%DEST_SUFFIX%,
%DEST_PREFIX%.dvi, %DEST_PREFIX%.pdf): Use "makeinfo -o output
input", not "makeinfo input -o output", as the latter fails if
POSIXLY_CORRECT=1.
* lib/am/texinfos.am (.dvi.ps): Likewise for dvips.
* m4/depend.m4 (_AM_DEPENDENCIES): Likewise for $depcc.

(_AM_DEPENDENCIES): Don't put "-o foo" at the end of the $depcc
command line, as this runs afoul of the POSIX rules for command line
arguments.

(.dvi.ps): Don't put "-o foo" at the end of the dvips command line,
as this runs afoul of POSIXLY_CORRECT=1.

(%DEST_PREFIX%%DEST_SUFFIX%, %DEST_PREFIX%.dvi, %DEST_PREFIX%.pdf):
Use "makeinfo -o output input", not "makeinfo input -o
output", as the latter fails if POSIXLY_CORRECT=1.

* automake.in (file_contents_internal): Fix the relationship
regex flags, don't use `m'.

For Debian Bug#162583:
* automake.in (file_contents_internal): Simplify regex to
separate relationship from actions in rules.
Reported by Sam Hocevar.

* lib/Automake/Conditional.pm (has): Simplify.

* lib/Automake/Conditional.pm: New file.
* lib/Automake/Makefile.am (dist_perllib_DATA): Add Conditional.pm.
* automake.in: Use Automake::Conditional.
(TRUE, FALSE): New constants.
(%var_value, %var_location, %var_comment, %var_type, %var_owner,
%targets, %target_source, %target_name, %target_owner): Tie to
Tie::RefHash::Nestable.
(generate_makefile, process_option_list, handle_options,
handle_languages, handle_source_transform, handle_compile,
handle_libtool, handle_texinfo_helper, handle_dist, handle_subdirs,
scan_aclocal_m4, handle_emacs_lisp, handle_python,
scan_autoconf_files, variable_assert, define_variable,
define_pretty_variable, define_configure_variable, am_install_var,
push_dist_common): Use TRUE.
(define_objects_from_sources): Fix return value on
"recursively-defined" errors.
(conditional_string, conditional_true_when, conditional_is_redundant,
conditional_implies_any, make_conditions): Remove these functions,
obsoleted by Conditional.pm.
(cond_stack_if, cond_stack_else, cond_stack_endif): Return
an Automake::Conditional instance.
(by_condition, conditional_ambiguous_p,
variable_not_always_defined_in_cond, macro_define,
variable_conditions_recursive, variable_conditions_recursive_sub,
variable_conditions_reduce, invert_conditions,
variable_conditions_permutations,
check_variable_defined_unconditionally, variable_value_as_list,
variable_output, variable_pretty_output, rule_define,
read_am_file, file_contents_internal, require_variables): Adjust
to use Automake::Conditional objects.
(handle_footer): Get $(SUFFIXES) in 'all' conditions.
* tests/cond12.test: Adjust to use Automake::Conditional objects.

* automake.in (handle_source_transform): If foo_SOURCES is defined
conditionally, create and use am__foo_SOURCES_DIST for distribution.
* tests/condd.test: Extend to check distributed files.
* tests/substref.test: Make sure we don't use such a variable when
it's not needed.
Reported by Marcus Brinkmann.

* tests/defs.in: Run $MAKE --version -v.
* tests/dollar.test: Abort on ./defs failure.
* tests/lex5.test: Require GNUmake, not make.

2002-09-30  Kevin Ryde  <user42@zip.com.au>

* m4/as.m4 (AM_PROG_AS): Let CCAS and CCASFLAGS default to the actual
values of $CC and $CFLAGS (as opposed to $(CC) and $(CFLAGS)), so
configure tests can use them.  Use AC_ARG_VAR instead of AC_SUBST.

* automake.in (require_variables): The fix introduced in 2002-09-19
is imcomplete.  Rewrite the conditional variable definition check
using &variable_not_always_defined_in_cond.
* tests/cond26.test, tests/cond27.test, tests/cond28.test: New file.
* tests/Makefile.am (TESTS): Add cond26.test, cond27.test, and
cond28.test.
Reported by Juergen Keil.

* automake.in (INTERNAL): Redefine as an empty location,
so that internal locations get displayed as `automake:'.

regen

* lib/am/distdir.am (distdir): Create $dc_destdir right before
its use.
Reported by Akim Demaille.

Fix for PR automake/366:
* automake.in (handle_dist): Strip $(srcdir) and replace
$(top_srcdir) when computing DIST_COMMON directories.
* tests/include2.test: Use an obsolute $(srcdir), and check
for spurious directories in $(distdir)/sub.
* lib/am/distdir.am: Rewrite $(top_srcdir) as $(top_builddir).
Reported by Kevin Ryde.

* lib/Automake/Channels.pm (%_default_options): Add 'partial'.
(_format_message): Rename as ...
(_format_sub_message): ... this.
(_format_message): New function, extracted from ...
(_print_message): ... here.  Honor the 'partial' option.
($partial): New variable.
* automake.in (handle_ltlibraries, check_ambiguous_conditional,
rule_define): Mark partial messages.

* automake.in (handle_ltlibraries): Record library locations in
%liblocations, and print the previous declaration on error.
* tests/libtool6.test: Check that the locations of the two
definitions are shown.

For PR automake/360:  Propagate more locations.
* automake.in (handle_programs): Adjust usage of am_install_var's
return value.  Pass on locations as context to file_contents.
(handle_libraries, handle_ltlibraries): Likewise.  Use locations
in the 'not a standard library name' diagnostic.
(handle_emacs_lisp, handle_python): Adjust usage of am_install_var's
return value.  Pass on locations to require_variables and
require_conf_file.
(check_ambiguous_conditional): Strip trailing dot in message.
(value_to_list): Add the $WHERE and $LOC_WANTED arguments.
(variable_value_as_list_recursive_worker): Add the $LOC_WANTED
argument.  Adjust calls to value_to_list.
(variable_value_as_list_recursive): Call
variable_value_as_list_recursive_worker with $LOC_WANTED = 0.
(variable_loc_and_value_as_list_recursive): New function,
variable_value_as_list_recursive_worker with $LOC_WANTED = 1.
(am_install_var): Use variable_loc_and_value_as_list_recursive,
and return a list of [$location, $value] pairs.
(rule_define): Use better locations in EXEEXT diagnostic.
(handle_source_transform, define_objects_from_sources): Add and use
a $WHERE argument.  Adjust callers.
* tests/stdlib.test: Grep the location in error message.
* tests/location.test: New file.
* tests/Makefile.am (TESTS): Add location.test.

* tests/exeext3.test: New file.
* tests/Makefile.am (TESTS): Add exeext3.test.
* automake.in (%target_name): New hash.
(initialize_per_input): Reset %target_name.
(rule_define): Fill %target_name, and use it to detect targets
which have been registered with key X but really are X$(EXEEXT).

For PR automake/360:
* lib/Automake/Location.pm: New file.
* lib/Automake/Channels.pm (_print_message): Display contexts
when given an Automake::Location.
(msg): Clone the location.
* lib/Automake/Makefile.am (dist_perllib_DATA): Add Location.pm.
* tests/comment5.test: Make sure we display `included from' stacks.
* automake.in: Use Automake::Location.
(INTERNAL): New constant.
(file_contents, file_contents_internal, define_variable,
define_pretty_variable, read_am_file): Take $WHERE as argument.
Adjust all callers.
(scan_autoconf_traces) <$where>: Define as a Location, and use
it instead of $here.
(macro_define, rule_define): Make sure $WHERE is a location.
Clone it before updating $var_location or $targets.

* lib/mkinstalldirs: Reindent using `sh-indentation: 2'.
Suggested by Bruno Haible.

* Makefile.am (fetch, FETCHFILES): Don't fetch install-sh from
Autoconf.  Automake now has the master copy of install-sh and
mkinstalldirs.

fix computation of APIVERSION

* configure.in: Bump version to 1.7a.

* NEWS, configure.ac: Version 1.7.

run aclocal with -I aclocal-$APIVERSION

* automake.texi (Optional, Options, Distributing, ANSI,
API versioning): Spelling fixes and Texi tweaks.

* configure.in: Check for 'tex'.
* tests/defs.in: Handle required=tex using configure's result.
Reported by Patrick Welche.

* Makefile.am (mdate-sh): Remove.
* mdate-sh: Delete.
Suggested by Akim Demaille.

regen

* NEWS: Mention distuninstallcheck.
* automake.texi (Dist): Document new macro and target.
* lib/am/distdir.am (distuninstallcheck_listfiles): New macro.
(distuninstallcheck): New target.
(distcheck): Use distuninstallcheck.

* tests/specflags7.test (true_CFLAGS, false_CFLAGS, false.c): Use
AM_TRUE, AM_FALSE to avoid bad interaction with Tru64 UNIX
<sys/types.h>.
* tests/specflags8.test (true_CPPFLAGS, false_CPPFLAGS, false.c):
Likewise.

* automake.in (output_texinfo_build_rules): Define %SOURCE_REAL%.
* lib/am/texibuild.am (%DEST_PREFIX%%DEST_SUFFIX%,
%DEST_PREFIX%.dvi, %DEST_PREFIX%.pdf): Add %SOURCE_REAL% as dependency.

* lib/am/ltlib.am (clean-%DIR%LTLIBRARIES): Use $$dir in make
command.

* automake.in (handle_single_transform_list): Revert the change
from 2002-09-22.  We need to erase .libs/ in the object directory
in addition to the library directory.

* tests/target-cflags.test: Build in `build/', not `obj/' because
`obj/' is special to BSD make.

* automake.in (read_am_file): Prefix included files with
$(top_srcdir) or $(srcdir) in DIST_COMMON.  Fixes
subdircond2.test, and subdircond3.test on OSF1.

* tests/defs.in (SHELL): Set it.

regen

* lib/am/distdir.am (distcleancheck): Mention `in build directory'
in error message.

For PR automake/350:
* automake.in (handle_ltlibraries): Allow a library to be installed
many times in the same directory.
* tests/libtool5.test, tests/libtool6.test: New files.
* tests/Makefile.am (TESTS): Add libtool5.test and libtool6.test.

* automake.in (handle_ltlibraries): Fill $libtool_clean_directories
here, with directories where .la files are built...
(handle_single_transform_list): ... not here with directories
where .lo files are built.
* tests/libtool3.test: Build a library in a subdirectory to
check for this.
Reported by Peter Gavin.

* tests/cond5.test: Give more time to automake.
Reported by Art Haas.

* configure.in: Really check for Autoconf 2.54.

* automake.texi (Yacc and Lex): ylwrap is used only when there is
more than one yacc or lex source file in a directory.

* automake.in (macro_define): Update a variable's location each
time its owner is updated.
* tests/gnuwarn.test: Append to CFLAGS to check for this.
Reported by Harlan Stenn.

New section: `Working with CVS'.

File for bootstrapping Automake from CVS.

* configure.in: Bump version to 1.6g.

* configure.in, NEWS: Bump version to 1.6f.

* Makefile.am (INSTALL): New rules.

For PR automake/363:
* m4/cond.m4: Fix AC_MSG_ERROR quoting.

s/whan/when/

* tests/warnopts.test: Fix random failures by removing Autoconf
cache directory whan configure.in changes.  Use the code and the
comment from tests/asm.test.

* automake.texi (Program and Library Variables) <maude_LIBADD>:
Don't mention _LDADD for Libtool libraries.
Reported by Schleicher Ralph.

For PR automake/361:
* tests/suffix8.test: More explicit dependencies.
Reported by Paul Eggert.

* automake.in (rule_define): Don't diagnose duplicate user rules.
* tests/phony.test, tests/percent2.test: New files.
* tests/Makefile.am (TESTS): Add them.