Remove use of AC_C_PROTOTYPE.

11 files changed, 14 insertions, 88 deletions

diff --git a/ChangeLog b/ChangeLog
index 47318431..1fa930cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2011-10-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	* configure.ac (AM_C_PROTOTYPES): Remove call to this macro.
+	The comments in configure.ac said that the call to AM_C_PROTOTYPES
+	was needed for dfa.h, synced from GNU grep; but this statement is
+	not true anymore in grep since commit v2.5.4-24-g9b5e7d4 "replace
+	AC_CHECK_* with gnulib modules", dating back to 2009-11-26.  Also,
+	the support for automatic de-ANSI-fication has been deprecated in
+	automake 1.11.2, and will be removed altogether in automake 1.12.
+	* vms/vms-conf.h (PROTOTYPES, __PROTOTYPES): Remove these #define,
+	they are not used anymore.
+	* pc/config.h (PROTOTYPES): Likewise.
+
 2011-10-18         Dave Pitts            <dpitts@cozx.com>
 
 	* dfa.c: Move some decls to the top of their functions for
diff --git a/Makefile.in b/Makefile.in
index 958b4a14..c06dac6f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -240,7 +240,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOCKET_LIBS = @SOCKET_LIBS@
 STRIP = @STRIP@
-U = @U@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
diff --git a/aclocal.m4 b/aclocal.m4
index a71b8dbc..742da619 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -741,32 +741,6 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2006
-# 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
-
-AC_DEFUN([AM_C_PROTOTYPES],
-[AC_REQUIRE([AC_C_PROTOTYPES])
-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
-])
-
-AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
-
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
diff --git a/awklib/Makefile.in b/awklib/Makefile.in
index f61f7de6..01511c36 100644
--- a/awklib/Makefile.in
+++ b/awklib/Makefile.in
@@ -186,7 +186,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOCKET_LIBS = @SOCKET_LIBS@
 STRIP = @STRIP@
-U = @U@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
diff --git a/configh.in b/configh.in
index 05fd4d2f..5ab18321 100644
--- a/configh.in
+++ b/configh.in
@@ -353,9 +353,6 @@
 /* Define to 1 if *printf supports %F format */
 #undef PRINTF_HAS_F_FORMAT
 
-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
-
 /* Define as the return type of signal handlers (`int' or `void'). */
 #undef RETSIGTYPE
 
@@ -426,9 +423,6 @@
 # undef __CHAR_UNSIGNED__
 #endif
 
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
diff --git a/configure b/configure
index 7436b5e7..5adac876 100755
--- a/configure
+++ b/configure
@@ -639,8 +639,6 @@ GMSGFMT
 MSGFMT
 GETTEXT_MACRO_VERSION
 USE_NLS
-ANSI2KNR
-U
 LN_S
 YFLAGS
 YACC
@@ -5823,44 +5821,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for function prototypes" >&5
-$as_echo_n "checking for function prototypes... " >&6; }
-if test "$ac_cv_prog_cc_c89" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define PROTOTYPES 1" >>confdefs.h
-
-
-$as_echo "#define __PROTOTYPES 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test "$ac_cv_prog_cc_stdc" != no; then
-  U= ANSI2KNR=
-else
-  U=_ ANSI2KNR=./ansi2knr
-fi
-# Ensure some checks needed by ansi2knr itself.
-
-for ac_header in string.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default"
-if test "x$ac_cv_header_string_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STRING_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
 case `(uname) 2> /dev/null` in
 *CYGWIN*)
 	with_libiconv_prefix=no
@@ -10817,6 +10777,7 @@ DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
diff --git a/configure.ac b/configure.ac
index ed72522d..56afb9b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,9 +116,6 @@ dnl Set the programming language for checks. Fortunately,
 dnl this only needs to be set once, since everything is in C.
 AC_LANG([C])
 
-dnl check for C compiler for automake. Needed for dfa.h.
-AM_C_PROTOTYPES
-
 dnl Cygwin doesn't like to get libs with full paths
 dnl since that overrides linking against DLLs.
 case `(uname) 2> /dev/null` in
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 7b27836c..2d3dbae2 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -182,7 +182,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOCKET_LIBS = @SOCKET_LIBS@
 STRIP = @STRIP@
-U = @U@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
diff --git a/pc/config.h b/pc/config.h
index 69c511d7..cde81439 100644
--- a/pc/config.h
+++ b/pc/config.h
@@ -445,9 +445,6 @@
 /* Define to 1 if *printf supports %F format */
 /* #undef PRINTF_HAS_F_FORMAT */
 
-/* Define if compiler has function prototypes */
-#define PROTOTYPES 1
-
 /* Define to 1 if you have the stpcpy function. */
 /* #undef HAVE_STPCPY */
 
diff --git a/test/Makefile.in b/test/Makefile.in
index 6ad2cdd0..0d374293 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -150,7 +150,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOCKET_LIBS = @SOCKET_LIBS@
 STRIP = @STRIP@
-U = @U@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
diff --git a/vms/vms-conf.h b/vms/vms-conf.h
index 183b7245..cbdc9508 100644
--- a/vms/vms-conf.h
+++ b/vms/vms-conf.h
@@ -407,9 +407,6 @@
 /* Define to 1 if *printf supports %F format */
 #undef PRINTF_HAS_F_FORMAT
 
-/* Define to 1 if the C compiler supports function prototypes. */
-#define PROTOTYPES 1
-
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
 
@@ -481,9 +478,6 @@
 # undef _TANDEM_SOURCE
 #endif
 
-/* Define like PROTOTYPES; this can be used by system headers. */
-#define __PROTOTYPES 1
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const