diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-09-02 10:45:19 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-09-02 10:45:19 +0200 |
| commit | 1b56fe0cd10a77e329221cad75636588783f1da2 (patch) | |
| tree | 951ffea60a31e429c8b781c65cfa948360492127 /m4 | |
| parent | 52a55e9881f5f37ac7587312b4e8526f90ab3d5a (diff) | |
| parent | 199b9086f51927fb99663cac42934337352cce69 (diff) | |
| download | automake-1b56fe0cd10a77e329221cad75636588783f1da2.tar.gz | |
Merge branch 'remove-deansification' into testsuite-work
* remove-deansification:
automake: fix regression due to de-ansification support removal
automake: cleanups after de-ansification support removal (2)
automake: cleanups after de-ansification support removal (1)
ansi: remove obsolete code/files for de-ANSI-fication support
ansi: reject attempts to use automatic de-ANSI-fication support
tests: remove tests about obsolete de-ANSI-fication support
docs: remove description of de-ANSI-fication support from manual
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/depout.m4 | 4 | ||||
| -rw-r--r-- | m4/protos.m4 | 27 |
2 files changed, 7 insertions, 24 deletions
diff --git a/m4/depout.m4 b/m4/depout.m4 index 80a3926f1..3e046cd22 100644 --- a/m4/depout.m4 +++ b/m4/depout.m4 @@ -44,15 +44,13 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], am__include=`sed -n 's/^am__include = //p' < "$mf"` test -z "am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` 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]) |