[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13-22-g
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13-22-g75e8d5a |
|
Date: |
Fri, 28 Dec 2012 23:47:00 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=75e8d5ae392cf9caad74d42c35e6a1ef74f8dbc7
The branch, master has been updated
via 75e8d5ae392cf9caad74d42c35e6a1ef74f8dbc7 (commit)
via 7626e632ebc2f47a3038b0aaf26b18af81060bfa (commit)
via c1ffbe9e605e3ef5166606c1d28518f33132b644 (commit)
via b4e64211f670b024fceb4e1dee8a1f288001307e (commit)
via 00d2aff2e1a75045b36ca01194d8e29a44c0814b (commit)
via bff57c887dbd57ace4860b8cd83100cfca02f930 (commit)
via 0fa7c9089931e07bb67cafbba47a0bb8c7348b36 (commit)
from f72b86a9cde6adca97dff2094b33599b5ba0bf48 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 75e8d5ae392cf9caad74d42c35e6a1ef74f8dbc7
Author: Stefano Lattarini <address@hidden>
Date: Sat Dec 29 00:45:56 2012 +0100
NEWS: better distinction between obsolete and obsolescent features
Signed-off-by: Stefano Lattarini <address@hidden>
commit 7626e632ebc2f47a3038b0aaf26b18af81060bfa
Author: Stefano Lattarini <address@hidden>
Date: Fri May 25 17:51:01 2012 +0200
cleanup: get rid of 'Automake::Configure_ac' module
Now that we unconditionally assume the Autoconf input is named
"configure.ac", it's easier and clearer to inline the checks on
the existence of such a file directly in the automake and
aclocal scripts.
This change is basically a backport of the 'v1.12-327-gee6d72a'
commit from Automake-NG.
* lib/Automake/Variable.pm (Automake::Configure_ac): Drop this import.
($configure_ac): Define to "configure.ac", unconditionally.
* automake.in: Likewise. Also, in main code, check the existence
of 'configure.ac' directly, instead of calling the now-removed
'require_configure_ac' function.
* aclocal.in: Likewise.
Signed-off-by: Stefano Lattarini <address@hidden>
commit c1ffbe9e605e3ef5166606c1d28518f33132b644
Author: Stefano Lattarini <address@hidden>
Date: Sat Dec 29 00:10:14 2012 +0100
maint: remove last vestiges of 'configure.in' support from the testsuite
* syntax-checks.mk: Don't whitelist any file in the maintainer
check looking against use of 'configure.in' in the testsuite.
* t/autodist-configure-no-subdir.sh: Remove last references to
'configure.in'.
Signed-off-by: Stefano Lattarini <address@hidden>
commit b4e64211f670b024fceb4e1dee8a1f288001307e
Author: Stefano Lattarini <address@hidden>
Date: Sat Dec 29 00:03:44 2012 +0100
tests: remove a botched comment from a test case
* t/backcompat6.sh: Here.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 00d2aff2e1a75045b36ca01194d8e29a44c0814b
Author: Stefano Lattarini <address@hidden>
Date: Fri Dec 28 23:59:00 2012 +0100
maint: reflect removal of 'configure.in' support in comments and messages
* t/help.sh, syntax-checks.mk, aclocal.in, old/TODO: In these files.
Signed-off-by: Stefano Lattarini <address@hidden>
commit bff57c887dbd57ace4860b8cd83100cfca02f930
Author: Stefano Lattarini <address@hidden>
Date: Fri May 25 17:50:59 2012 +0200
Drop support for 'configure.in' as the Autoconf input file
The autoconf input should be named 'configure.ac' instead. The use
of 'configure.in' has been deprecated in Autoconf since at least
the 2.13 -> 2.50 transition, and future Autoconf versions (starting
with 2.70 probably) will start to warn about it at runtime. Automake
has been warning about it since the 1.13 release.
This change is basically a backport of commit 'v1.12-325-g927d4cb',
from Automake-NG.
* lib/Automake/Configure_ac.pm (find_configure_ac): Don't look for
'configure.in' if 'configure.ac' is not found.
(require_configure_ac): On failure, don't tell that "'configure.ac'
or 'configure.in' is required", but just that "'configure.ac' is
required".
* automake.in (@common_sometimes): Don't list 'configure.in'.
(scan_autoconf_files): Adjust heading comments.
* NEWS: Update.
* t/help.sh: Adjust.
* t/configure.sh: Remove as obsolete.
* t/list-of-tests.mk: Adjust.
commit 0fa7c9089931e07bb67cafbba47a0bb8c7348b36
Author: Stefano Lattarini <address@hidden>
Date: Fri Dec 28 23:24:21 2012 +0100
Drop support for $(ACLOCAL_M4_SOURCES), it's obsolete
The $(ACLOCAL_M4_SOURCES) variables has been obsolete by a long time,
and basically unused (since at least commit ab57cf28 of 2003-04-24), so
drop any mention of it.
* automake.in (scan_aclocal_m4): Flatly reject any ACLOCAL_M4_SOURCES
definition with a fatal error, rather than just warning about it.
if any deinifn
$(ACLOCAL_M4_SOURCES). Don't append it to @ac_deps. This makes such
variable always empty, so there's no need to return it. Adjust the
signature of this function accordingly, and ...
(handle_configure): ... update this function accordingly.
* NEWS: Update.
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 1 -
NEWS | 18 ++++-
aclocal.in | 11 ++--
automake.in | 30 +++------
lib/Automake/Configure_ac.pm | 128 -------------------------------------
lib/Automake/Variable.pm | 7 +--
old/TODO | 4 +-
syntax-checks.mk | 12 +--
t/autodist-configure-no-subdir.sh | 10 +--
t/backcompat6.sh | 3 +-
t/configure.sh | 59 -----------------
t/help.sh | 7 +-
t/list-of-tests.mk | 1 -
13 files changed, 43 insertions(+), 248 deletions(-)
delete mode 100644 lib/Automake/Configure_ac.pm
delete mode 100755 t/configure.sh
diff --git a/Makefile.am b/Makefile.am
index 7ad0e1f..1dc5188 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -182,7 +182,6 @@ dist_perllib_DATA = \
lib/Automake/ChannelDefs.pm \
lib/Automake/Channels.pm \
lib/Automake/Condition.pm \
- lib/Automake/Configure_ac.pm \
lib/Automake/DisjConditions.pm \
lib/Automake/FileUtils.pm \
lib/Automake/General.pm \
diff --git a/NEWS b/NEWS
index be3ea37..faf79fd 100644
--- a/NEWS
+++ b/NEWS
@@ -11,10 +11,7 @@ New in 1.14:
over the same-named automake-provided macro, as defined in file
'/usr/local/share/aclocal-1.14/vala.m4'.
-* Obsolete and obsolescent features:
-
- - Support for the long-obsolete $(INCLUDES) variable has been finally
- removed, in favour of the modern equivalent $(AM_CPPFLAGS).
+* Obsolescent features flagged:
- Use of the special makefile variable 'ACLOCAL_AMFLAGS' is deprecated.
To specify locations of extra m4 files, the 'AC_CONFIG_MACRO_DIR' or
@@ -23,6 +20,19 @@ New in 1.14:
'ACLOCAL_AMFLAGS' has proved to be a bad idea anyway -- see automake
bug#9037.
+* Obsolete features removed:
+
+ - Support for the long-deprecated name 'configure.in' for the Autoconf
+ input file has been removed altogether. Just use the modern name
+ 'configure.ac' instead.
+
+ - Support for the long-obsolete variable $(ACLOCAL_M4_SOURCES) has
+ been removed. It should be safe to simply remove any definition
+ of it you have in your Makefiles.
+
+ - Support for the long-obsolete $(INCLUDES) variable has been finally
+ removed, in favour of the modern equivalent $(AM_CPPFLAGS).
+
* Removed support for obsolete platforms:
- Support for the SGI C/C++ compilers has been removed: these compilers
diff --git a/aclocal.in b/aclocal.in
index 39351ad..0352f5e 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -36,7 +36,6 @@ use strict;
use Automake::Config;
use Automake::General;
-use Automake::Configure_ac;
use Automake::Channels;
use Automake::ChannelDefs;
use Automake::XFile;
@@ -81,8 +80,9 @@ my @diff_command;
# --dry-run
my $dry_run = 0;
-# configure.ac or configure.in.
-my $configure_ac;
+# Name of the Autoconf input file. We used to support 'configure.in'
+# as well once, that that is long obsolete now.
+my $configure_ac = 'configure.ac';
# Output file name.
my $output_file = 'aclocal.m4';
@@ -995,7 +995,7 @@ sub usage ($)
print <<'EOF';
Usage: aclocal [OPTION]...
-Generate 'aclocal.m4' by scanning 'configure.ac' or 'configure.in'
+Generate 'aclocal.m4' by scanning 'configure.ac'
Options:
--automake-acdir=DIR directory holding automake-provided m4 files
@@ -1130,7 +1130,8 @@ sub parse_ACLOCAL_PATH ()
parse_WARNINGS; # Parse the WARNINGS environment variable.
parse_arguments;
parse_ACLOCAL_PATH;
-$configure_ac = require_configure_ac;
+
+fatal "$configure_ac is required" unless -f $configure_ac;
# We may have to rerun aclocal if some file have been installed, but
# it should not happen more than once. The reason we must run again
diff --git a/automake.in b/automake.in
index f829ad6..3253f7f 100644
--- a/automake.in
+++ b/automake.in
@@ -136,7 +136,6 @@ use Automake::General;
use Automake::XFile;
use Automake::Channels;
use Automake::ChannelDefs;
-use Automake::Configure_ac;
use Automake::FileUtils;
use Automake::Location;
use Automake::Condition qw/TRUE FALSE/;
@@ -231,7 +230,7 @@ my @common_files =
# is used for the --help output only.
my @common_sometimes =
qw(aclocal.m4 acconfig.h config.h.top config.h.bot configure
- configure.ac configure.in stamp-vti);
+ configure.ac stamp-vti);
# Standard directories from the GNU Coding Standards, and additional
# pkg* directories from Automake. Stored in a hash for fast member check.
@@ -303,8 +302,9 @@ my $force_missing = 0;
## Variables filled during files scanning. ##
## ---------------------------------------- ##
-# Name of the configure.ac file.
-my $configure_ac;
+# Name of the Autoconf input file. We used to support 'configure.in'
+# as well once, that that is long obsolete now.
+my $configure_ac = 'configure.ac';
# Files found by scanning configure.ac for LIBOBJS.
my %libsources = ();
@@ -3877,21 +3877,13 @@ sub scan_aclocal_m4 ()
$regen_aclocal = $line =~ 'generated automatically by aclocal';
}
- my @ac_deps = ();
-
- if (set_seen ('ACLOCAL_M4_SOURCES'))
- {
- push (@ac_deps, '$(ACLOCAL_M4_SOURCES)');
- msg_var ('obsolete', 'ACLOCAL_M4_SOURCES',
- "'ACLOCAL_M4_SOURCES' is obsolete.\n"
- . "It should be safe to simply remove it");
- }
+ reject_var ('ACLOCAL_M4_SOURCES',
+ "'ACLOCAL_M4_SOURCES' is obsolete; just remove it");
# Note that it might be possible that aclocal.m4 doesn't exist but
# should be auto-generated. This case probably isn't very
# important.
-
- return ($regen_aclocal, @ac_deps);
+ return $regen_aclocal;
}
@@ -4007,10 +3999,9 @@ sub handle_configure ($$$@)
my $colon_infile = ':' . join (':', @inputs);
$colon_infile = '' if $colon_infile eq ":$makefile.in";
my @rewritten = rewrite_inputs_into_dependencies ($makefile, @inputs);
- my ($regen_aclocal_m4, @aclocal_m4_deps) = scan_aclocal_m4;
+ my $regen_aclocal_m4 = scan_aclocal_m4;
define_pretty_variable ('am__aclocal_m4_deps', TRUE, INTERNAL,
- @configure_deps, @aclocal_m4_deps,
- '$(top_srcdir)/' . $configure_ac);
+ @configure_deps, "\$(top_srcdir)/$configure_ac");
my @configuredeps = ('$(am__aclocal_m4_deps)', '$(CONFIGURE_DEPENDENCIES)');
push @configuredeps, '$(ACLOCAL_M4)' if -f 'aclocal.m4';
define_pretty_variable ('am__configure_deps', TRUE, INTERNAL,
@@ -5399,7 +5390,6 @@ EOF
# &scan_autoconf_files ()
# -----------------------
-# Check whether we use 'configure.ac' or 'configure.in'.
# Scan it (and possibly 'aclocal.m4') for interesting things.
# We must scan aclocal.m4 because there might be AC_SUBSTs and such there.
sub scan_autoconf_files ()
@@ -8284,7 +8274,7 @@ parse_WARNINGS;
# Parse command line.
parse_arguments;
-$configure_ac = require_configure_ac;
+fatal "$configure_ac is required" unless -f $configure_ac;
# Do configure.ac scan only once.
scan_autoconf_files;
diff --git a/lib/Automake/Configure_ac.pm b/lib/Automake/Configure_ac.pm
deleted file mode 100644
index fcaf0f7..0000000
--- a/lib/Automake/Configure_ac.pm
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-###############################################################
-# The main copy of this file is in Automake's git repository. #
-# Updates should be sent to address@hidden #
-###############################################################
-
-package Automake::Configure_ac;
-
-use 5.006;
-use strict;
-use Exporter;
-use Automake::Channels;
-use Automake::ChannelDefs;
-
-use vars qw (@ISA @EXPORT);
-
address@hidden = qw (Exporter);
address@hidden = qw (&find_configure_ac &require_configure_ac);
-
-=head1 NAME
-
-Automake::Configure_ac - Locate configure.ac or configure.in.
-
-=head1 SYNOPSIS
-
- use Automake::Configure_ac;
-
- # Try to locate configure.in or configure.ac in the current
- # directory. It may be absent. Complain if both files exist.
- my $file_name = find_configure_ac;
-
- # Likewise, but bomb out if the file does not exist.
- my $file_name = require_configure_ac;
-
- # Likewise, but in $dir.
- my $file_name = find_configure_ac ($dir);
- my $file_name = require_configure_ac ($dir);
-
-=over 4
-
-=back
-
-=head2 Functions
-
-=over 4
-
-=item C<$configure_ac = find_configure_ac ([$directory])>
-
-Find a F<configure.ac> or F<configure.in> file in C<$directory>,
-defaulting to the current directory. Complain if both files are present.
-Return the name of the file found, or the former if neither is present.
-
-=cut
-
-sub find_configure_ac (;@)
-{
- my ($directory) = @_;
- $directory ||= '.';
- my $configure_ac =
- File::Spec->canonpath (File::Spec->catfile ($directory, 'configure.ac'));
- my $configure_in =
- File::Spec->canonpath (File::Spec->catfile ($directory, 'configure.in'));
-
- if (-f $configure_in)
- {
- msg ('obsolete', "autoconf input should be named 'configure.ac'," .
- " not 'configure.in'");
- if (-f $configure_ac)
- {
- msg ('unsupported',
- "'$configure_ac' and '$configure_in' both present.\n"
- . "proceeding with '$configure_ac'");
- return $configure_ac
- }
- else
- {
- return $configure_in;
- }
- }
- return $configure_ac;
-}
-
-
-=item C<$configure_ac = require_configure_ac ([$directory])>
-
-Like C<find_configure_ac>, but fail if neither is present.
-
-=cut
-
-sub require_configure_ac (;$)
-{
- my $res = find_configure_ac (@_);
- fatal "'configure.ac' is required" unless -f $res;
- return $res
-}
-
-1;
-
-### Setup "GNU" style for perl-mode and cperl-mode.
-## Local Variables:
-## perl-indent-level: 2
-## perl-continued-statement-offset: 2
-## perl-continued-brace-offset: 0
-## perl-brace-offset: 0
-## perl-brace-imaginary-offset: 0
-## perl-label-offset: -2
-## cperl-indent-level: 2
-## cperl-brace-offset: 0
-## cperl-continued-brace-offset: 0
-## cperl-label-offset: -2
-## cperl-extra-newline-before-brace: t
-## cperl-merge-trailing-else: nil
-## cperl-continued-statement-offset: 2
-## End:
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index d4d230f..43f1cd1 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -21,7 +21,6 @@ use Carp;
use Automake::Channels;
use Automake::ChannelDefs;
-use Automake::Configure_ac;
use Automake::Item;
use Automake::VarDef;
use Automake::Condition qw (TRUE FALSE);
@@ -193,8 +192,7 @@ my %_ac_macro_for_var =
YACC => 'AC_PROG_YACC',
);
-# The name of the configure.ac file.
-my $configure_ac;
+my $configure_ac = 'configure.ac';
# Variables that can be overridden without complaint from -Woverride
my %_silent_variable_override =
@@ -1133,9 +1131,6 @@ sub require_variables ($$$@)
my $res = 0;
$reason .= ' but ' unless $reason eq '';
- $configure_ac = find_configure_ac
- unless defined $configure_ac;
-
VARIABLE:
foreach my $var (@vars)
{
diff --git a/old/TODO b/old/TODO
index f8e4754..fcd8a58 100644
--- a/old/TODO
+++ b/old/TODO
@@ -233,7 +233,7 @@ characters long.
* Make sure that all the files in the distribution are world-readable.
should be able to determine what is built by looking at rules (and
-configure.in). Then built man pages (eg) could automatically be
+configure.ac). Then built man pages (eg) could automatically be
omitted from the distribution.
Right now, targets generated internally (eg "install") are not
@@ -445,7 +445,7 @@ consider auto-including any file that matches "*.in".
must look at mkid to see how it works (for subdir usage)
[ right now, it doesn't. i don't see a simple fix right now ]
-if configure.in not found, move up a directory and try again? This
+if configure.ac not found, move up a directory and try again? This
could eliminate a common source of problems.
[ this is just a bad idea ]
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 1801767..b7fe631 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -438,16 +438,12 @@ sc_m4_am_plain_egrep_fgrep:
exit 1; \
fi
-## Prefer 'configure.ac' over the obsolescent 'configure.in' as the name
+## Use 'configure.ac', not the obsolete 'configure.in', as the name
## for configure input files in our testsuite. The latter has been
-## deprecated for several years (at least since autoconf 2.50).
+## deprecated for several years (at least since autoconf 2.50) and
+## support for it will be removed in Automake 1.14.
sc_tests_no_configure_in:
- @if grep -E '\bconfigure\\*\.in\b' $(xtests) $(xdefs) \
- | grep -Ev '/backcompat.*\.(sh|tap):' \
- | grep -Ev '/autodist-configure-no-subdir\.sh:' \
- | grep -Ev '/(configure|help)\.sh:' \
- | grep .; \
- then \
+ @if grep -E '\bconfigure\\*\.in\b' $(xtests) $(xdefs); then \
echo "Use 'configure.ac', not 'configure.in', as the name" >&2; \
echo "for configure input files in the test cases above." >&2; \
exit 1; \
diff --git a/t/autodist-configure-no-subdir.sh
b/t/autodist-configure-no-subdir.sh
index 8fd325b..24c66fe 100755
--- a/t/autodist-configure-no-subdir.sh
+++ b/t/autodist-configure-no-subdir.sh
@@ -14,8 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Check that 'configure', 'configure.ac' and 'configure.in' are *not*
-# automatically distributed when placed in a subdirectory.
+# Check that 'configure' and 'configure.ac' are *not* automatically
+# distributed when placed in a subdirectory.
# Related to automake bug#7819.
. test-init.sh
@@ -32,12 +32,9 @@ sub/configure:
$(dontbuild)
sub/configure.ac:
$(dontbuild)
-sub/configure.in:
- $(dontbuild)
check-local: distdir
ls -l $(distdir)/sub
test ! -f $(distdir)/sub/configure
- test ! -f $(distdir)/sub/configure.in
test ! -f $(distdir)/sub/configure.ac
END
@@ -49,15 +46,12 @@ configure:
$(dontbuild)
configure.ac:
$(dontbuild)
-configure.in:
- $(dontbuild)
check-local:
echo $(DISTFILES) | grep 'configure' && exit 1; :
echo $(DIST_COMMON) | grep 'configure' && exit 1; :
END
: > sub/configure.ac
-: > sub/configure.in
: > sub/configure
$ACLOCAL
diff --git a/t/backcompat6.sh b/t/backcompat6.sh
index b99321a..508bdab 100755
--- a/t/backcompat6.sh
+++ b/t/backcompat6.sh
@@ -15,8 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Backward-compatibility test: try to build and distribute a package
-# using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT,
-# and 'configure.in' as autconf input file.
+# using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT.
# This script can also serve as mild stress-testing for Automake.
# See also the similar test 'backcompat5.test'.
diff --git a/t/configure.sh b/t/configure.sh
deleted file mode 100755
index 1a1bb94..0000000
--- a/t/configure.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010-2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Diagnose if the autoconf input is named configure.in.
-# Diagnose if both configure.in and configure.ac are present, prefer
-# configure.ac.
-
-. test-init.sh
-
-cat >configure.ac <<EOF
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-EOF
-
-cat >configure.in <<EOF
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE([an-invalid-automake-option])
-AC_CONFIG_FILES([Makefile])
-EOF
-
-: >Makefile.am
-
-$ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
-cat stderr >&2
-grep 'configure\.ac.*configure\.in.*both present' stderr
-
-$ACLOCAL -Wno-error 2>stderr || { cat stderr >&2; exit 1; }
-cat stderr >&2
-grep 'configure\.ac.*configure\.in.*both present' stderr
-grep 'proceeding.*configure\.ac' stderr
-
-# Ensure we really proceed with configure.ac.
-AUTOMAKE_fails -Werror
-grep 'configure\.ac.*configure\.in.*both present' stderr
-grep 'proceeding.*configure\.ac' stderr
-
-AUTOMAKE_run -Wno-error
-grep 'configure\.ac.*configure\.in.*both present' stderr
-grep 'proceeding.*configure\.ac' stderr
-
-mv -f configure.ac configure.in
-AUTOMAKE_fails
-grep "autoconf input.*'configure.ac', not 'configure.in'" stderr
-
-:
diff --git a/t/help.sh b/t/help.sh
index 961fcea..f27d8b1 100755
--- a/t/help.sh
+++ b/t/help.sh
@@ -14,8 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Make sure --help and --version work, even when no configure.ac nor
-# configure.in is in the current directory.
+# Make sure --help and --version work, even when no configure.ac is in
+# the current directory.
. test-init.sh
@@ -33,8 +33,7 @@ $ACLOCAL --help
$AUTOMAKE --version
$AUTOMAKE --help
-# Sanity checks: aclocal and automake cannot work without configure.ac
-# nor configure.in.
+# Sanity checks: aclocal and automake cannot work without configure.ac.
$ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
$FGREP configure.ac stderr
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index c4e5112..827b0c5 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -315,7 +315,6 @@ t/condinc2.sh \
t/condlib.sh \
t/condman2.sh \
t/condman3.sh \
-t/configure.sh \
t/confdeps.sh \
t/conff.sh \
t/conff2.sh \
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13-22-g75e8d5a,
Stefano Lattarini <=