[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-NG] [FYI] [ng] diagnostic: don't bother explicitly rejecting a
From: |
Stefano Lattarini |
Subject: |
[Automake-NG] [FYI] [ng] diagnostic: don't bother explicitly rejecting ansi2knr stuff |
Date: |
Sat, 11 Aug 2012 19:27:05 +0200 |
That is, fail through the usual avenues ("possibly undefined macro
'AM_C_PROTOTYPES', "option 'ansi2knr' not recognized") rather than
giving a special error message "automatic de-ANSI-fication support
has been removed". Since the removal has taken place in Automake 1.12
already, people will have got used to it once Automake-NG gets stable
enough.
* lib/Automake/Options.pm (_process_option_list): Remove special
handling of 'ansi2knr' option.
* m4/protos.m4: Remove.
* Makefile.am (dist_automake_ac_DATA): Adjust.
* t/ansi2knr-no-more.sh: Remove.
Signed-off-by: Stefano Lattarini <address@hidden>
---
Makefile.am | 1 -
lib/Automake/Options.pm | 6 ------
m4/protos.m4 | 13 ------------
t/ansi2knr-no-more.sh | 56 -------------------------------------------------
4 files changed, 76 deletions(-)
delete mode 100644 m4/protos.m4
delete mode 100755 t/ansi2knr-no-more.sh
diff --git a/Makefile.am b/Makefile.am
index 899d301..5b3d6ab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -248,7 +248,6 @@ dist_automake_ac_DATA = \
m4/minuso.m4 \
m4/missing.m4 \
m4/options.m4 \
- m4/protos.m4 \
m4/python.m4 \
m4/runlog.m4 \
m4/sanity.m4 \
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index d24fd24..bdb3db9 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -314,12 +314,6 @@ sub _process_option_list (\%@)
{
set_strictness ($_);
}
- elsif (/^(.*\/)?ansi2knr$/)
- {
- # Obsolete (and now removed) de-ANSI-fication support.
- error ($where,
- "automatic de-ANSI-fication support has been removed");
- }
elsif ($_ eq 'cygnus')
{
error $where, "support for Cygnus-style trees has been removed";
diff --git a/m4/protos.m4 b/m4/protos.m4
deleted file mode 100644
index c8c7adc..0000000
--- a/m4/protos.m4
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- Autoconf -*-
-# Obsolete (and now removed) automatic de-ANSI-fiction support.
-#
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([AM_C_PROTOTYPES],
- [AC_FATAL([automatic de-ANSI-fication support has been removed])])
-
-AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
diff --git a/t/ansi2knr-no-more.sh b/t/ansi2knr-no-more.sh
deleted file mode 100755
index 5387d20..0000000
--- a/t/ansi2knr-no-more.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011-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/>.
-
-# Check that any attempt to use the obsolete de-ANSI-fication support
-# is diagnosed.
-
-. ./defs || exit 1
-
-warn_rx='automatic de-ANSI-fication.*removed'
-
-echo AC_PROG_CC >> configure.ac
-$ACLOCAL
-mv aclocal.m4 aclocal.sav
-cp configure.ac configure.sav
-
-echo AM_C_PROTOTYPES >> configure.ac
-
-$ACLOCAL -Wnone 2>stderr && { cat stderr >&2; exit 1; }
-cat stderr >&2
-grep "^configure\\.ac:5:.*$warn_rx" stderr
-
-cat aclocal.sav "$am_automake_acdir"/protos.m4 > aclocal.m4
-$AUTOCONF -Wnone 2>stderr && { cat stderr >&2; exit 1; }
-cat stderr >&2
-grep "^configure\\.ac:5:.*$warn_rx" stderr
-
-for opt in ansi2knr lib/ansi2knr; do
- # ansi2knr option in Makefile.am
- cp configure.sav configure.ac
- echo "AUTOMAKE_OPTIONS = $opt" > Makefile.am
- rm -rf autom4te*.cache
- AUTOMAKE_fails -Wnone
- grep "^Makefile\.am:1:.*$warn_rx" stderr
- # ansi2knr option in configure.ac
- : > Makefile.am
- sed "s|^\\(AM_INIT_AUTOMAKE\\).*|\1([$opt])|" configure.sav >configure.ac
- cat configure.ac # For debugging.
- rm -rf autom4te*.cache
- AUTOMAKE_fails -Wnone
- grep "^configure\\.ac:2:.*$warn_rx" stderr
-done
-
-:
--
1.7.12.rc0
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-NG] [FYI] [ng] diagnostic: don't bother explicitly rejecting ansi2knr stuff,
Stefano Lattarini <=