+2001-05-13 Tom Tromey <tromey@redhat.com>
+
+ * tests/Makefile.am (TESTS): Added python.test.
+ * tests/python.test: New file.
+ * automake.in (handle_languages): Use
+ config_aux_dir_set_in_configure_in.
+ (handle_python): Correctly mention AM_PATH_PYTHON. Use
+ py-compile, not py_comp. Define py_compile macro.
+
+2001-05-13 Derek Price <dprice@openavenue.com>
+
+ * automake.in (require_file_with_conf_line,
+ require_file_with_line, require_file): Pass a @require_file_path
+ of $relative_dir instead of '.' to require_file_internal so that
+ all the special casing of '.' can be removed elsewhere.
+ (require_config_file, require_conf_file_with_line,
+ require_conf_file_with_conf_line): Remove special casing for '.'
+ and make sure $config_aux_dir is maintained properly.
+ (require_file_internal): Remove special casing of '.' and set
+ @require_file_path when missing files are added.
+ (maybe_push_required_file): Remove special casing of '.'
+ (handle_dependencies): Remove a workaround for a bug now fixed
+ and remove $config_aux_dir special casing.
+ (handle_configure): Remove special casing for $config_aux_dir
+ (handle_python): Ditto.
+ (yacc_lex_finish_helper): Change $config_aux_dir switch to
+ switch on the value of $config_aux_dir_set_in_configure_in.
+ (handle_texinfo): Ditto.
+ (scan_one_configure_file): Set $config_aux_dir and
+ $config_aux_dir_set_in_configure_in properly so special casing
+ on the value of $config_aux_dir can be removed elsewhere.
+ * tests/depcomp.test: New file.
+ * tests/confsub.test: Look for depcomp in $(top_srcdir) instead of the
+ first subdir containing a C file.
+ * tests/libobj2.test: Ditto.
+ * tests/Makefile.am (TESTS): Added 'depcomp.test'.
+
2001-05-12 Tom Tromey <tromey@redhat.com>
* tests/gcj.test: Updated for gcj dependency tracking.
* automake.in (handle_ltlibraries): Allow _LDFLAGS to be
conditionally defined. Fixes PR automake/77 and ldflags.test.
+2000-12-05 Derek Price <dprice@openavenue.com>
+
+ * automake.in (require_file_with_conf_line,
+ require_file_with_line, require_file): Pass a @require_file_path
+ of $relative_dir instead of '.' to require_file_internal so that
+ all the special casing of '.' can be removed elsewhere.
+ (require_config_file, require_conf_file_with_line,
+ require_conf_file_with_conf_line): Remove special casing for '.'
+ and make sure $config_aux_dir is maintained properly.
+ (require_file_internal): Remove special casing of '.' and set
+ @require_file_path when missing files are added.
+ (maybe_push_required_file): Remove special casing of '.'
+ (handle_dependencies): Remove a workaround for a bug now fixed
+ and remove $config_aux_dir special casing.
+ (handle_configure): Remove special casing for $config_aux_dir
+ (handle_python): Ditto.
+ (yacc_lex_finish_helper): Change $config_aux_dir switch to
+ switch on the value of $config_aux_dir_set_in_configure_in.
+ (handle_texinfo): Ditto.
+ (scan_one_configure_file): Set $config_aux_dir and
+ $config_aux_dir_set_in_configure_in properly so special casing
+ on the value of $config_aux_dir can be removed elsewhere.
+
+ * tests/depcomp.test: New file.
+ * tests/confsub.test: Look for depcomp in $(top_srcdir) instead of the
+ first subdir containing a C file.
+ * tests/libobj2.test: Ditto.
+ * tests/Makefile.am (TESTS): Added 'depcomp.test'.
+
2000-11-25 Tom Tromey <tromey@cygnus.com>
* automake.in (file_contents_with_transform): Added file name and
# can be set by AC_CONFIG_AUX_DIR.
my @config_aux_path = ('.', '..', '../..');
my $config_aux_dir = '';
+my $config_aux_dir_set_in_configure_in = 0;
# Whether AM_GNU_GETTEXT has been seen in configure.ac.
my $seen_gettext = 0;
# TRUE if we've seen AM_PATH_LISPDIR.
my $seen_lispdir = 0;
-# TRUE if we've seen AM_CHECK_PYTHON.
+# TRUE if we've seen AM_PATH_PYTHON.
my $seen_pythondir = 0;
# TRUE if we've seen AC_EXEEXT.
# be empty.
if (&saw_sources_p (0) && keys %dep_files)
{
- my $config_aux_dir_specified = ($config_aux_dir ne '.'
- && $config_aux_dir ne '');
-
- # Set $require_file_found{'depcomp'} if the depcomp file exists,
- # before calling require_config_file on `depcomp'. This makes
- # require_file_internal skip its buggy existence test that would
- # make automake fail (with `required file `lib/depcomp' not found')
- # when AC_CONFIG_AUX_DIR is not set. See tests/subdir4.test.
- my $depcomp_dir = ($config_aux_dir_specified ? $config_aux_dir
- : '.');
- $require_file_found{'depcomp'} = 1 if -f "$depcomp_dir/depcomp";
-
# Set location of depcomp.
- my $prefix = ($config_aux_dir_specified ? $config_aux_dir
- : '$(top_srcdir)');
-
- &define_variable ('depcomp', "\$(SHELL) $prefix/depcomp");
+ &define_variable ('depcomp', "\$(SHELL) $config_aux_dir/depcomp");
&require_config_file ($FOREIGN, 'depcomp');
'mdate-sh');
my $conf_dir;
- if ($config_aux_dir eq '.' || $config_aux_dir eq '')
+ if ($config_aux_dir_set_in_configure_in)
{
- $conf_dir = '$(srcdir)/';
+ $conf_dir = $config_aux_dir;
+ $conf_dir .= '/' unless $conf_dir =~ /\/$/;
}
else
{
- $conf_dir = $config_aux_dir;
- $conf_dir .= '/' unless $conf_dir =~ /\/$/;
+ $conf_dir = '$(srcdir)/';
}
$output_rules .= &file_contents ('texi-vers',
('TEXI' => $info_cursor,
&define_variable ('TEXINFO_TEX', "$texinfodir/texinfo.tex");
}
- elsif ($config_aux_dir ne '.' && $config_aux_dir ne '')
+ elsif ($config_aux_dir_set_in_configure_in)
{
$texinfodir = $config_aux_dir;
&define_variable ('TEXINFO_TEX', "$texinfodir/texinfo.tex");
}
# Set location of mkinstalldirs.
- if ($config_aux_dir ne '.' && $config_aux_dir ne '')
- {
- &define_variable ('mkinstalldirs', ('$(SHELL) ' . $config_aux_dir
- . '/mkinstalldirs'));
- }
- else
- {
- &define_variable ('mkinstalldirs',
- '$(SHELL) $(top_srcdir)/mkinstalldirs');
- }
+ &define_variable ('mkinstalldirs',
+ ('$(SHELL) ' . $config_aux_dir . '/mkinstalldirs'));
&am_line_error ('CONFIG_HEADER',
"`CONFIG_HEADER' is an anachronism; now determined from `$configure_ac'")
return if ! @pyfiles;
# Found some python.
- &am_error ("`python_PYTHON' defined but `AM_CHECK_PYTHON' not in `$configure_ac'")
+ &am_error ("`python_PYTHON' defined but `AM_PATH_PYTHON' not in `$configure_ac'")
if ! $seen_pythondir && &variable_defined ('python_PYTHON');
- &require_file_with_conf_line ('AM_CHECK_PYTHON', $FOREIGN, 'py_comp');
+ &require_file_with_conf_line ('AM_PATH_PYTHON', $FOREIGN, 'py-compile');
+ &define_variable ('py_compile', $config_aux_dir . '/py-compile');
}
# Handle Java.
if (/$AC_CONFIG_AUX_DIR_PATTERN/o)
{
@config_aux_path = &unquote_m4_arg ($1);
+ $config_aux_dir_set_in_configure_in = 1;
}
# Check for ansi2knr.
# allow parallel builds to work correctly. FIXME: for now, no
# line number.
&require_config_file ($FOREIGN, 'ylwrap');
- if ($config_aux_dir ne '.' && $config_aux_dir ne '')
+ if ($config_aux_dir_set_in_configure_in)
{
&define_variable ('YLWRAP', $config_aux_dir . "/ylwrap");
}
{
my ($dir, $file, $fullfile) = @_;
- # FIXME: Once again, special-case `.'.
- if ($dir eq $relative_dir || $dir eq '.')
+ if ($dir eq $relative_dir)
{
&push_dist_common ($file);
}
my $dangling_sym = 0;
foreach my $dir (@require_file_paths)
{
- if ($dir eq '.')
- {
- $fullfile = $relative_dir . "/" . $file;
- $errdir = $relative_dir unless $errdir;
- }
- else
- {
- $fullfile = $dir . "/" . $file;
- $errdir = $dir unless $errdir;
- }
+ $fullfile = $dir . "/" . $file;
+ $errdir = $dir unless $errdir;
# Use different name for "error filename". Otherwise on
# an error the bad file will be reported as eg
{
if ($strictness >= $mystrict)
{
- if ($dangling_sym && ($force_missing || $add_missing))
+ if ($dangling_sym && $add_missing)
{
unlink ($fullfile);
}
&maybe_push_required_file (dirname ($errfile),
$file, $errfile);
+
+ # Prune the path list.
+ @require_file_paths = &dirname ($errfile);
}
if ($suppress)
# configure.ac, not the current Makefile.am.
sub require_file_with_conf_line
{
- @require_file_paths = '.';
+ @require_file_paths = $relative_dir;
&require_file_internal (1, @_);
}
sub require_file_with_line
{
- @require_file_paths = '.';
+ @require_file_paths = $relative_dir;
&require_file_internal (0, @_);
}
sub require_file
{
- @require_file_paths = '.';
+ @require_file_paths = $relative_dir;
&require_file_internal (0, '', @_);
}
&require_file_internal (1, '', @_);
my $dir = $require_file_paths[0];
@config_aux_path = @require_file_paths;
- if ($dir eq '.')
- {
- $config_aux_dir = '.';
- }
- else
- {
- $config_aux_dir = '$(top_srcdir)/' . $dir;
- }
+ # Avoid unsightly '/.'s.
+ $config_aux_dir = '$(top_srcdir)' . ($dir eq '.' ? "" : "/$dir");
}
# Assumes that the line number is in Makefile.am.
&require_file_internal (0, @_);
my $dir = $require_file_paths[0];
@config_aux_path = @require_file_paths;
- if ($dir eq '.')
- {
- $config_aux_dir = '.';
- }
- else
- {
- $config_aux_dir = '$(top_srcdir)/' . $dir;
- }
+ # Avoid unsightly '/.'s.
+ $config_aux_dir = '$(top_srcdir)' . ($dir eq '.' ? "" : "/$dir");
}
# Assumes that the line number is in configure.ac.
&require_file_internal (1, @_);
my $dir = $require_file_paths[0];
@config_aux_path = @require_file_paths;
- if ($dir eq '.')
- {
- $config_aux_dir = '.';
- }
- else
- {
- $config_aux_dir = '$(top_srcdir)/' . $dir;
- }
+ # avoid unsightly '/.'s.
+ $config_aux_dir = '$(top_srcdir)' . ($dir eq '.' ? "" : "/$dir");
}
################################################################
git://sourceware.org / automake.git / commitdiff