[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12-3
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12-330-g04ea4fe |
|
Date: |
Sat, 26 May 2012 12:22:55 +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=04ea4fed10ada232fcd75a16b46e67f214396bf4
The branch, ng/master has been updated
via 04ea4fed10ada232fcd75a16b46e67f214396bf4 (commit)
via bf91aa152e9a9485e487b0d1346ec994458dda83 (commit)
via ee6d72a6c823dc9dad8d7712608ccae1e2e9b6a0 (commit)
via b89258d708b2bb7960834c521a285bb42d4a404b (commit)
via 927d4cb1207afc2e7435053d1b77e682b6d11b60 (commit)
via 20ec9f491e61eddc219d819db5ea5838a93ac8d6 (commit)
from 92d305960d83749239dae4579bfb46fb08ae6c23 (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 04ea4fed10ada232fcd75a16b46e67f214396bf4
Merge: 20ec9f4 bf91aa1
Author: Stefano Lattarini <address@hidden>
Date: Sat May 26 13:51:24 2012 +0200
Merge branch 'ng/drop-configure-in' into ng/master
* ng/drop-configure-in:
maintcheck: obsolete check 'sc_tests_no_configure_in' removed
cleanup: get rid of 'Automake::Configure_ac' module
cleanup: just assume configure input is configure.ac
cleanup: don't support configure.in anymore
commit bf91aa152e9a9485e487b0d1346ec994458dda83
Author: Stefano Lattarini <address@hidden>
Date: Fri May 25 17:51:02 2012 +0200
maintcheck: obsolete check 'sc_tests_no_configure_in' removed
There's no need to verify our tests doesn't use the obsoleted
name 'configure.in' for the Autoconf file anymore: we don't support
it anyway in Automake-NG, so any test trying to use it would fail.
* syntax-checks.mk (sc_tests_no_configure_in): Remove.
* tests/autodist-configure-no-subdir.sh: Remove unneeded occurrences
of 'configure.in'.
Signed-off-by: Stefano Lattarini <address@hidden>
commit ee6d72a6c823dc9dad8d7712608ccae1e2e9b6a0
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.
* automake.in (Automake::Configure_ac): Drop this import.
(Main code): Check the existence of configure.ac directly, instead
of calling the noe-removed 'require_configure_ac' function.
* aclocal.in: Likewise.
Signed-off-by: Stefano Lattarini <address@hidden>
commit b89258d708b2bb7960834c521a285bb42d4a404b
Author: Stefano Lattarini <address@hidden>
Date: Fri May 25 17:51:00 2012 +0200
cleanup: just assume configure input is configure.ac
We have removed support for configure.in in a previous patch anyway.
* automake.in ($configure_ac): Initialize statically to 'configure.ac'.
* aclocal.in: Likewise.
* lib/Automake/Variable.pm: Likewise. Consequently, ...
(Automake::Configure_ac): ... drop this import, that is not required
anymore.
commit 927d4cb1207afc2e7435053d1b77e682b6d11b60
Author: Stefano Lattarini <address@hidden>
Date: Fri May 25 17:50:59 2012 +0200
cleanup: don't support configure.in anymore
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.
* 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.
* NG-NEWS: Update.
* t/help.sh: Adjust.
* t/configure.sh: Adjust as obsolete.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 20ec9f491e61eddc219d819db5ea5838a93ac8d6
Author: Stefano Lattarini <address@hidden>
Date: Fri May 25 20:43:38 2012 +0200
[ng] build: use more GNU make features in our Makefile.am
Mostly to show that we can do so without upsetting Automake-NG.
* Makefile.am (do_subst): Remove some code duplication through the use of
the $(foreach) builtin, and take advantage of GNU make automatic variables
to require less boilerplate in the callers.
* All its callers: Adjusted.
(EXTRA_DIST): Remove some code duplication through the use of and the
$(addprefix) builtin. Since we are at it, remove some erroneously
duplicated entries (probably resulting from a botched merge).
(bin_SCRIPTS): Rewrite in function of $(AUTOMAKESOURCES), using the
$(basename) builtin.
(man1_MANS): Split contents into ...
(versioned_mans, unversioned_mans): ... these two variables.
(doc/aclocal-$(APIVERSION).1, doc/automake-$(APIVERSION).1): Rewrite
common rules using GNU make static pattern rules.
(automake, aclocal): Likewise.
(installcheck-executable-scripts): Take more advantage of GNU make
builtins in the recipe.
(install-data-hook): Likewise.
(doc/aclocal.1, doc/automake.1): Likewise. Consequently ...
(update_mans): ... remove this variable, now unneeded.
($(top_srcdir)/m4/amversion.m4): Renamed ...
($(srcdir)/m4/amversion.m4): ... to this. Since we are in a non-recursive
setup, $(srcdir) and $(top_srcdir) are the same; and according to the
comments, the use of $(top_srcdir) in this target was only needed to avoid
confusing some non-GNU make implementation.
($(srcdir)/autodeps.am): Fix a typo in the target name, renaming it ...
($(srcdir)/testsuite-autodeps.am): ... to this. Use GNU make automatic
variables to avoid some verbosity in the recipe. And fix a typo in
comments while we are at it.
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 138 +++++++++++--------------------------
NG-NEWS | 3 +
aclocal.in | 9 ++-
automake.in | 10 +--
lib/Automake/Configure_ac.pm | 127 ----------------------------------
lib/Automake/Variable.pm | 6 +--
syntax-checks.mk | 16 ----
t/autodist-configure-no-subdir.sh | 10 +--
t/configure.sh | 54 --------------
t/help.sh | 2 -
10 files changed, 55 insertions(+), 320 deletions(-)
delete mode 100644 lib/Automake/Configure_ac.pm
delete mode 100755 t/configure.sh
diff --git a/Makefile.am b/Makefile.am
index 60d5ab7..7b4a8a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,22 +31,16 @@ EXTRA_DIST =
# then use config.status to substitute the remainder where a single
# expansion is sufficient. We use a funny notation here to avoid
# configure substitutions in our text.
-do_subst = ( sed \
- -e "s,address@hidden@],Generated from $$in; do not edit by hand.,g" \
- -e 's,address@hidden@],$(datadir),g' \
- -e 's,address@hidden@],$(amdir),g' \
- -e 's,address@hidden@],$(bindir),g' \
- -e 's,address@hidden@],$(docdir),g' \
- -e 's,address@hidden@],$(pkgvdatadir),g' \
- -e 's,address@hidden@],$(scriptdir),g' \
- -e 's,address@hidden@],$(automake_acdir),g' \
- -e 's,address@hidden@],$(system_acdir),g' \
+do_subst = ( sed $(strip \
+ $(foreach x, data am bin doc pkgvdata script automake_ac system_ac, \
+ -e 's,@$(x)dir@,$($(x)dir),g')) \
+ -e "s,address@hidden@,Generated from $(<F) do not edit by hand.,g" \
## Hack to avoid a spurious substitution in the Automake script (part 1).
-e 's,address@hidden@],address@hidden@!!,g' \
| $(SHELL) ./config.status --file=- \
## Hack to avoid a spurious substitution in the Automake script (part 2).
| sed -e 's,address@hidden@!!,@''am__isrc@,g' \
- )
+) <$< >address@hidden
# Generated files shouldn't contain unexpanded '@substitutions@', and
# should be made read-only, to prevent them from being edited by mistake
@@ -58,13 +52,12 @@ generated_file_finalize = $(AM_V_at) \
fi; \
chmod a-w address@hidden && mv -f address@hidden $@
-bin_SCRIPTS = automake aclocal
-
-CLEANFILES += $(bin_SCRIPTS)
AUTOMAKESOURCES = automake.in aclocal.in
-
TAGS_FILES = $(AUTOMAKESOURCES)
+bin_SCRIPTS = $(basename $(AUTOMAKESOURCES))
+CLEANFILES += $(bin_SCRIPTS)
+
EXTRA_DIST += \
$(AUTOMAKESOURCES) \
bootstrap.sh \
@@ -72,18 +65,7 @@ EXTRA_DIST += \
syntax-checks.mk \
HACKING \
NG-NEWS \
- $(gitlog_to_changelog_fixes) \
- old/ChangeLog-tests \
- old/ChangeLog.96 \
- old/ChangeLog.98 \
- old/ChangeLog.00 \
- old/ChangeLog.01 \
- old/ChangeLog.02 \
- old/ChangeLog.03 \
- old/ChangeLog.04 \
- old/ChangeLog.09 \
- old/ChangeLog.11 \
- old/TODO
+ $(gitlog_to_changelog_fixes)
## Make versioned links. We only run the transform on the root name;
## then we make a versioned link with the transformed base name. This
@@ -107,11 +89,9 @@ uninstall-hook:
## These files depend on Makefile so they are rebuilt if $(VERSION),
## $(datadir) or other do_subst'ituted variables change.
-automake: automake.in
-aclocal: aclocal.in
-automake aclocal: Makefile
+automake aclocal: %: %.in Makefile
$(AM_V_at)rm -f $@ address@hidden
- $(AM_V_GEN)address@hidden; $(do_subst) <$(srcdir)/address@hidden
>address@hidden
+ $(AM_V_GEN)$(do_subst)
## We can't use '$(generated_file_finalize)' here, because currently
## Automake contains occurrences of unexpanded @substitutions@ in
## comments, and that is perfectly legit.
@@ -159,25 +139,14 @@ dist_script_DATA = \
install-data-hook:
@$(POST_INSTALL)
- @for f in $(dist_script_DATA); do echo $$f; done \
- | sed 's,^lib/,,' \
- | ( st=0; \
- while read f; do \
- echo " chmod +x '$(DESTDIR)$(scriptdir)/$$f'"; \
- chmod +x "$(DESTDIR)$(scriptdir)/$$f" || st=1; \
- done; \
- exit $$st )
+ chmod +x $(patsubst
lib/%,'$(DESTDIR)$(scriptdir)/%',$(dist_script_DATA))
installcheck-local: installcheck-executable-scripts
installcheck-executable-scripts:
- @for f in $(dist_script_DATA); do echo $$f; done \
- | sed 's,^lib/,,' \
- | while read f; do \
- path="$(pkgvdatadir)/$$f"; \
- test -x "$$path" || echo $$path; \
- done \
- | sed 's/$$/: not executable/' \
- | grep . 1>&2 && exit 1; exit 0
+ @for f in $(patsubst lib/%,'$(scriptdir)/%',$(dist_script_DATA)); do \
+ test -x $$f || { echo "$@: $$f: not executable" >&2; st=1; }; \
+ done; \
+ exit $$st;
## ---------------------------------------------------- ##
@@ -189,7 +158,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 \
@@ -211,9 +179,8 @@ CLEANFILES += $(nodist_perllib_DATA)
lib/Automake/Config.pm: lib/Automake/Config.in Makefile
$(AM_V_at)rm -f $@ address@hidden
- $(AM_V_at)test -d lib/Automake || $(MKDIR_P) lib/Automake
- $(AM_V_GEN)in=Config.in \
- && $(do_subst) <$(srcdir)/lib/Automake/Config.in >address@hidden
+ $(AM_V_at)$(MKDIR_P) $(@D)
+ $(AM_V_GEN)$(do_subst)
$(generated_file_finalize)
EXTRA_DIST += lib/Automake/Config.in
@@ -306,12 +273,9 @@ dist_system_ac_DATA = m4/acdir/README
# dependencies change and amversion.m4 happens to be a configure
# dependency. configure and amversion.m4 would be rebuilt in
# loop otherwise.
-# Use '$(top_srcdir)/m4' for the benefit of non-GNU makes: this is
-# how amversion.m4 appears in our dependencies.
-$(top_srcdir)/m4/amversion.m4: $(srcdir)/configure.ac $(srcdir)/m4/amversion.in
+$(srcdir)/m4/amversion.m4: $(srcdir)/m4/amversion.in $(srcdir)/configure.ac
$(AM_V_at)rm -f address@hidden $@
- $(AM_V_GEN)in=amversion.in \
- && $(do_subst) <$(srcdir)/m4/amversion.in >address@hidden
+ $(AM_V_GEN)$(do_subst)
$(generated_file_finalize)
EXTRA_DIST += m4/amversion.in
@@ -418,15 +382,13 @@ AM_TESTS_ENVIRONMENT += stderr_fileno_=9; export
stderr_fileno_;
# Automatically-computed dependencies for tests.
include $(srcdir)/testsuite-autodeps.am
-## The dependecies declared here are not truly complete, but such
+## The dependencies declared here are not truly complete, but such
## completeness would cause more issues than it would solve. See
## automake bug#11347.
-$(srcdir)/autodeps.am: $(srcdir)/gen-testsuite-part
- $(AM_V_at)rm -f testsuite-autodeps.tmp $@
- $(AM_V_GEN)$(PERL) $(srcdir)/gen-testsuite-part
- --srcdir $(srcdir) > testsuite-autodeps.tmp
- $(AM_V_at)chmod a-w testsuite-autodeps.tmp
- $(AM_V_at)mv -f testsuite-autodeps.tmp $@
+$(srcdir)/testsuite-autodeps.am: $(srcdir)/gen-testsuite-part
+ $(AM_V_at)rm -f $(@F)-t $@
+ $(AM_V_GEN)$(PERL) $< --srcdir $(srcdir) > $(@F)-t
+ $(AM_V_at)chmod a-w $(@F)-t && mv -f $(@F)-t $@
EXTRA_DIST += gen-testsuite-part
# Static dependencies valid for each test case.
@@ -441,8 +403,7 @@ EXTRA_DIST += t/ax/distcheck-hook-m4.am
defs-static: defs-static.in Makefile
$(AM_V_at)rm -f $@ address@hidden
- $(AM_V_GEN)in=defs-static.in\
- && $(do_subst) <$(srcdir)/defs-static.in >address@hidden
+ $(AM_V_GEN)$(do_subst)
$(generated_file_finalize)
EXTRA_DIST += defs-static.in
CLEANFILES += defs-static
@@ -486,34 +447,24 @@ clean-local-check:
info_TEXINFOS = doc/automake-ng.texi
doc_automake_ng_TEXINFOS = doc/fdl.texi
-man1_MANS = \
- doc/aclocal.1 \
- doc/automake.1 \
- doc/aclocal-$(APIVERSION).1 \
- doc/automake-$(APIVERSION).1
-
-$(man1_MANS): $(srcdir)/configure.ac
-
CLEANFILES += $(man1_MANS)
EXTRA_DIST += doc/help2man
-update_mans = \
- $(AM_V_GEN): \
- && $(MKDIR_P) doc \
- && PATH="$(abs_builddir)/t/wrap$(PATH_SEPARATOR)$$PATH" \
- && export PATH \
- && $(PERL) $(srcdir)/doc/help2man --output=$@
+man1_MANS = $(versioned_mans) $(unversioned_mans)
-doc/aclocal.1 doc/automake.1:
- $(AM_V_GEN): \
- && $(MKDIR_P) doc \
- && f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'` \
+unversioned_mans = doc/aclocal.1 doc/automake.1
+versioned_mans = doc/aclocal-$(APIVERSION).1 doc/automake-$(APIVERSION).1
+
+$(unversioned_mans): Makefile
+ $(AM_V_GEN)$(MKDIR_P) doc \
+ && f=`echo $(@D) | sed 's|.*/||; s|\.1$$||; $(transform)'` \
&& echo ".so man1/$$f-$(APIVERSION).1" > $@
-doc/aclocal-$(APIVERSION).1: aclocal.in aclocal lib/Automake/Config.pm
- $(update_mans) aclocal-$(APIVERSION)
-doc/automake-$(APIVERSION).1: automake.in automake lib/Automake/Config.pm
- $(update_mans) automake-$(APIVERSION)
+$(versioned_mans): doc/%-$(APIVERSION).1: % lib/Automake/Config.pm
+ $(AM_V_GEN)$(MKDIR_P) doc \
+ && PATH="$(abs_builddir)/t/wrap$(PATH_SEPARATOR)$$PATH" \
+ && export PATH \
+ && $(PERL) $(srcdir)/doc/help2man --output=$@ $*
## ---------------------------- ##
@@ -584,17 +535,8 @@ EXTRA_DIST += \
## --------------------------------------------------- ##
EXTRA_DIST += \
- old/ChangeLog-tests \
- old/ChangeLog.96 \
- old/ChangeLog.98 \
- old/ChangeLog.00 \
- old/ChangeLog.01 \
- old/ChangeLog.02 \
- old/ChangeLog.03 \
- old/ChangeLog.04 \
- old/ChangeLog.09 \
- old/ChangeLog.11 \
- old/TODO
+ $(addprefix old/ChangeLog., 96 98 00 01 02 03 04 09 11) \
+ old/ChangeLog-tests old/TODO
##########################################################################
diff --git a/NG-NEWS b/NG-NEWS
index 1bca493..216c95b 100644
--- a/NG-NEWS
+++ b/NG-NEWS
@@ -228,6 +228,9 @@ Distribution
Obsolete Features Removed
=========================
+* Support for the long-deprecated name 'configure.in' for the Autoconf
+ input file (instead of the modern 'configure.ac') has been deprecated.
+
* If the sources for a target library like 'libfoo.a' or 'libbar.la' are
not explicitly specified, mainline Automake looks also (respectively)
for the files 'libfoo_a.c' or 'libbar_la.c' as possible default sources.
diff --git a/aclocal.in b/aclocal.in
index 5af016a..28e2218 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -35,7 +35,6 @@ use strict;
use Automake::Config;
use Automake::General;
-use Automake::Configure_ac;
use Automake::Channels;
use Automake::ChannelDefs;
use Automake::XFile;
@@ -70,8 +69,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';
@@ -1037,7 +1037,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 0c3fe22..eeafd29 100644
--- a/automake.in
+++ b/automake.in
@@ -144,7 +144,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/;
@@ -265,7 +264,6 @@ my @common_sometimes =
aclocal.m4
configure
configure.ac
- configure.in
stamp-vti
);
@@ -339,8 +337,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 = ();
@@ -5034,7 +5033,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 ()
@@ -8008,7 +8006,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 53e62a5..0000000
--- a/lib/Automake/Configure_ac.pm
+++ /dev/null
@@ -1,127 +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_ac)
- {
- if (-f $configure_in)
- {
- msg ('unsupported',
- "'$configure_ac' and '$configure_in' both present.\n"
- . "proceeding with '$configure_ac'");
- }
- return $configure_ac
- }
- elsif (-f $configure_in)
- {
- 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' or 'configure.in' 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 6ed112c..a1ef30f 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);
@@ -194,7 +193,7 @@ my %_ac_macro_for_var =
);
# 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 =
@@ -1027,9 +1026,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/syntax-checks.mk b/syntax-checks.mk
index 957051a..e567c96 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -80,7 +80,6 @@ sc_tests_automake_fails \
sc_tests_required_after_defs \
sc_tests_plain_sleep \
sc_m4_am_plain_egrep_fgrep \
-sc_tests_no_configure_in \
sc_tests_PATH_SEPARATOR \
sc_tests_logs_duplicate_prefixes \
sc_tests_makefile_variable_order \
@@ -505,21 +504,6 @@ sc_m4_am_plain_egrep_fgrep:
exit 1; \
fi
-## Prefer 'configure.ac' over the obsolescent '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).
-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 \
- echo "Use 'configure.ac', not 'configure.in', as the name" >&2; \
- echo "for configure input files in the test cases above." >&2; \
- exit 1; \
- fi
-
## Rule to ensure that the testsuite has been run before. We don't depend
## on 'check' here, because that would be very wasteful in the common case.
## We could run "make check AM_LAZY_CHECK=yes" and avoid toplevel races with
diff --git a/t/autodist-configure-no-subdir.sh
b/t/autodist-configure-no-subdir.sh
index b974748..93e7f5f 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.
. ./defs || Exit 1
@@ -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 $(am__dist_files) $(am__dist_common) \
| grep 'configure' && exit 1; :
END
: > sub/configure.ac
-: > sub/configure.in
: > sub/configure
$ACLOCAL
diff --git a/t/configure.sh b/t/configure.sh
deleted file mode 100755
index cedba55..0000000
--- a/t/configure.sh
+++ /dev/null
@@ -1,54 +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 both configure.in and configure.ac are present, prefer
-# configure.ac.
-
-. ./defs || Exit 1
-
-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
-
-:
diff --git a/t/help.sh b/t/help.sh
index 2f7c2d1..ae91877 100755
--- a/t/help.sh
+++ b/t/help.sh
@@ -38,9 +38,7 @@ $AUTOMAKE --help
$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
cat stderr >&2
$FGREP configure.ac stderr
-$FGREP configure.in stderr
AUTOMAKE_fails
$FGREP configure.ac stderr
-$FGREP configure.in stderr
:
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12-330-g04ea4fe,
Stefano Lattarini <=