summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2011-08-28 15:52:11 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2011-08-28 20:25:09 +0200
commit16f67b47492d97cac0866b02304b08fdde4d069e (patch)
tree80119f9e080982f3c3fee69e933d394d51ff4a0b /m4
parent1a1c1339db861cee13ed8b8b05b0c41428214b7a (diff)
downloadautomake-16f67b47492d97cac0866b02304b08fdde4d069e.tar.gz
ansi: reject attempts to use automatic de-ANSI-fication support
* tests/protos.m4 (AM_C_PROTOTYPES): Error out whenever called. * lib/Automake/Options.pm (_process_option_list ): Error out with a proper error message when the `ansi2knr' option is used. Related updates to comments. * tests/depacl2.test: Update. * tests/ansi2knr-no-more.test: New test. * tests/Makefile.am (TESTS): Add it. * NEWS: Update.
Diffstat (limited to 'm4')
-rw-r--r--m4/protos.m427
1 files changed, 6 insertions, 21 deletions
diff --git a/m4/protos.m4 b/m4/protos.m4
index f710293e9..32a5616f4 100644
--- a/m4/protos.m4
+++ b/m4/protos.m4
@@ -1,31 +1,16 @@
-## ------------------------------- ## -*- Autoconf -*-
-## Check for function prototypes. ##
-## From Franc,ois Pinard ##
-## ------------------------------- ##
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2006
+# -*- Autoconf -*-
+# Obsolete (and now removed) automatic de-ANSI-fiction support.
+#
+# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2006, 2011
# 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.
-# serial 5
+# serial 6
AC_DEFUN([AM_C_PROTOTYPES],
-[AC_REQUIRE([AC_C_PROTOTYPES])
-AC_DIAGNOSE([obsolete],
- [$0: automatic de-ANSI-fication support is deprecated])
-if test "$ac_cv_prog_cc_stdc" != no; then
- U= ANSI2KNR=
-else
- U=_ ANSI2KNR=./ansi2knr
-fi
-# Ensure some checks needed by ansi2knr itself.
-AC_REQUIRE([AC_HEADER_STDC])
-AC_CHECK_HEADERS([string.h])
-AC_SUBST([U])dnl
-AC_SUBST([ANSI2KNR])dnl
-_AM_SUBST_NOTMAKE([ANSI2KNR])dnl
-])
+ [AC_FATAL([automatic de-ANSI-fication support has been removed])])
AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])